summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--experimental/qt5-qtwebkit/APKBUILD94
-rw-r--r--experimental/qt5-qtwebkit/jsc-port-to-musl.patch81
-rw-r--r--experimental/qt5-qtwebkit/musl-thread-stacksize.patch49
-rw-r--r--legacy/corindon-red/APKBUILD (renamed from user/corindon-red/APKBUILD)9
-rw-r--r--legacy/dmenu/APKBUILD (renamed from user/dmenu/APKBUILD)2
-rw-r--r--legacy/lbxproxy/APKBUILD (renamed from user/lbxproxy/APKBUILD)4
-rw-r--r--legacy/libxfont/APKBUILD (renamed from user/libxfont/APKBUILD)0
-rw-r--r--legacy/proxymngr/APKBUILD (renamed from user/proxymngr/APKBUILD)3
-rw-r--r--legacy/which/APKBUILD (renamed from user/which/APKBUILD)7
-rw-r--r--system/abuild/APKBUILD8
-rw-r--r--system/abuild/bang.patch10
-rw-r--r--system/abuild/modernise.patch164
-rw-r--r--system/adelie-base/APKBUILD6
-rw-r--r--system/cmake/APKBUILD4
-rw-r--r--system/curl/APKBUILD4
-rw-r--r--system/cxref/APKBUILD4
-rw-r--r--system/dash/APKBUILD2
-rw-r--r--system/file/APKBUILD2
-rw-r--r--system/gcc/202-ibm-ldbl.patch38
-rw-r--r--system/gcc/APKBUILD6
-rw-r--r--system/gettext-tiny/APKBUILD22
-rw-r--r--system/gettext-tiny/cpp-compat.patch22
-rw-r--r--system/gettext-tiny/double-stack-size.patch20
-rw-r--r--system/gettext-tiny/dynamic.patch18
-rw-r--r--system/gettext-tiny/line-length.patch15
-rw-r--r--system/gettext-tiny/m4-installation.patch149
-rw-r--r--system/gettext-tiny/omg-i-cant-believe-im-doing-ua-crap.patch18
-rw-r--r--system/gettext-tiny/respect-cflags.patch4
-rw-r--r--system/gettext-tiny/stop-doing-macro-crap.patch2
-rw-r--r--system/git/APKBUILD8
-rw-r--r--system/git/dont-test-other-encodings.patch135
-rw-r--r--system/mailx/APKBUILD15
-rw-r--r--system/mailx/openssl-1.1.patch43
-rw-r--r--system/mailx/sendmail.patch24
-rw-r--r--system/ncurses/APKBUILD2
-rw-r--r--system/openssh/APKBUILD2
-rw-r--r--system/openssl/0003-use-termios.patch26
-rw-r--r--system/openssl/0004-fix-default-ca-path-for-apps.patch79
-rw-r--r--system/openssl/0005-fix-parallel-build.patch349
-rw-r--r--system/openssl/0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch68
-rw-r--r--system/openssl/0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch27
-rw-r--r--system/openssl/0009-no-rpath.patch11
-rw-r--r--system/openssl/0010-ssl-env-zlib.patch38
-rw-r--r--system/openssl/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch88
-rw-r--r--system/openssl/1002-backport-changes-from-upstream-padlock-module.patch200
-rw-r--r--system/openssl/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch782
-rw-r--r--system/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch33
-rw-r--r--system/openssl/APKBUILD70
-rw-r--r--system/openssl/CVE-2019-1551.patch757
-rw-r--r--system/openssl/ppc64.patch96
-rw-r--r--system/patch/APKBUILD2
-rw-r--r--system/perl-encode-eucjpascii/APKBUILD2
-rw-r--r--system/perl-encode-hanextra/APKBUILD2
-rw-r--r--system/perl-encode-iso2022/APKBUILD2
-rw-r--r--system/perl-encode-jisx0213/APKBUILD2
-rw-r--r--system/perl-http-message/APKBUILD2
-rw-r--r--system/perl-json/APKBUILD2
-rw-r--r--system/perl-mime-charset/APKBUILD2
-rw-r--r--system/perl-pod2-base/APKBUILD2
-rw-r--r--system/perl-sgmls/APKBUILD2
-rw-r--r--system/perl-test-fatal/APKBUILD2
-rw-r--r--system/perl-test-needs/APKBUILD2
-rw-r--r--system/perl-try-tiny/APKBUILD2
-rw-r--r--system/perl-unicode-linebreak/APKBUILD2
-rw-r--r--system/perl-uri/APKBUILD2
-rw-r--r--system/perl/APKBUILD6
-rw-r--r--system/python3/APKBUILD2
-rw-r--r--system/rsync/APKBUILD2
-rw-r--r--system/sed/APKBUILD2
-rw-r--r--system/uucp/APKBUILD4
-rw-r--r--system/vim/APKBUILD2
-rw-r--r--system/zsh/APKBUILD5
-rw-r--r--system/zsh/zprofile2
-rw-r--r--user/a52dec/APKBUILD7
-rw-r--r--user/abiword/APKBUILD10
-rw-r--r--user/abiword/fix-black-drawing-regression.patch54
-rw-r--r--user/accountsservice/APKBUILD3
-rw-r--r--user/acpi/APKBUILD2
-rw-r--r--user/acpid/APKBUILD1
-rw-r--r--user/adelie-kde-theme/APKBUILD3
-rw-r--r--user/adelie-wallpapers/APKBUILD3
-rw-r--r--user/ae_fonts/APKBUILD6
-rw-r--r--user/akonadi-contacts/APKBUILD13
-rw-r--r--user/akonadi-mime/APKBUILD21
-rw-r--r--user/akonadi/APKBUILD17
-rw-r--r--user/akonadi/attributes.patch153
-rw-r--r--user/alegreya-sans/APKBUILD3
-rw-r--r--user/alegreya/APKBUILD1
-rw-r--r--user/alkimia/APKBUILD9
-rw-r--r--user/alkimia/webkit.patch32
-rw-r--r--user/alpine/APKBUILD15
-rw-r--r--user/alpine/support-musl.patch4
-rw-r--r--user/alsa-plugins/APKBUILD5
-rw-r--r--user/analitza/APKBUILD13
-rw-r--r--user/anonymous-pro/APKBUILD5
-rw-r--r--user/ant/APKBUILD6
-rw-r--r--user/apache-httpd/APKBUILD8
-rw-r--r--user/appres/APKBUILD8
-rw-r--r--user/apr-util/APKBUILD13
-rw-r--r--user/apr/APKBUILD5
-rw-r--r--user/ark/APKBUILD13
-rw-r--r--user/artikulate/APKBUILD11
-rw-r--r--user/artikulate/inappropriate-qt.patch22
-rw-r--r--user/aspell-dict-af/APKBUILD10
-rw-r--r--user/aspell-dict-am/APKBUILD10
-rw-r--r--user/aspell-dict-ar/APKBUILD10
-rw-r--r--user/aspell-dict-ast/APKBUILD10
-rw-r--r--user/aspell-dict-az/APKBUILD10
-rw-r--r--user/aspell-dict-be/APKBUILD10
-rw-r--r--user/aspell-dict-bg/APKBUILD10
-rw-r--r--user/aspell-dict-bn/APKBUILD10
-rw-r--r--user/aspell-dict-br/APKBUILD10
-rw-r--r--user/aspell-dict-ca/APKBUILD10
-rw-r--r--user/aspell-dict-cs/APKBUILD10
-rw-r--r--user/aspell-dict-csb/APKBUILD10
-rw-r--r--user/aspell-dict-cy/APKBUILD16
-rw-r--r--user/aspell-dict-da/APKBUILD16
-rw-r--r--user/aspell-dict-de-alt/APKBUILD16
-rw-r--r--user/aspell-dict-de/APKBUILD24
-rw-r--r--user/aspell-dict-el/APKBUILD16
-rw-r--r--user/aspell-dict-en/APKBUILD14
-rw-r--r--user/aspell-dict-eo/APKBUILD16
-rw-r--r--user/aspell-dict-es/APKBUILD16
-rw-r--r--user/aspell-dict-et/APKBUILD16
-rw-r--r--user/aspell-dict-fa/APKBUILD16
-rw-r--r--user/aspell-dict-fi/APKBUILD16
-rw-r--r--user/aspell-dict-fo/APKBUILD16
-rw-r--r--user/aspell-dict-fr/APKBUILD16
-rw-r--r--user/aspell-dict-fy/APKBUILD16
-rw-r--r--user/aspell-dict-ga/APKBUILD14
-rw-r--r--user/aspell-dict-gd/APKBUILD16
-rw-r--r--user/aspell-dict-gl/APKBUILD16
-rw-r--r--user/aspell-dict-grc/APKBUILD16
-rw-r--r--user/aspell-dict-gu/APKBUILD16
-rw-r--r--user/aspell-dict-gv/APKBUILD16
-rw-r--r--user/aspell-dict-he/APKBUILD16
-rw-r--r--user/aspell-dict-hi/APKBUILD16
-rw-r--r--user/aspell-dict-hil/APKBUILD16
-rw-r--r--user/aspell-dict-hr/APKBUILD16
-rw-r--r--user/aspell-dict-hsb/APKBUILD16
-rw-r--r--user/aspell-dict-hu/APKBUILD16
-rw-r--r--user/aspell-dict-hus/APKBUILD16
-rw-r--r--user/aspell-dict-hy/APKBUILD16
-rw-r--r--user/aspell-dict-ia/APKBUILD16
-rw-r--r--user/aspell-dict-id/APKBUILD16
-rw-r--r--user/aspell-dict-is/APKBUILD16
-rw-r--r--user/aspell-dict-it/APKBUILD14
-rw-r--r--user/aspell-dict-kn/APKBUILD16
-rw-r--r--user/aspell-dict-ku/APKBUILD16
-rw-r--r--user/aspell-dict-ky/APKBUILD16
-rw-r--r--user/aspell-dict-la/APKBUILD16
-rw-r--r--user/aspell-dict-lt/APKBUILD14
-rw-r--r--user/aspell-dict-lv/APKBUILD16
-rw-r--r--user/aspell-dict-mg/APKBUILD16
-rw-r--r--user/aspell-dict-mi/APKBUILD16
-rw-r--r--user/aspell-dict-mk/APKBUILD16
-rw-r--r--user/aspell-dict-ml/APKBUILD14
-rw-r--r--user/aspell-dict-mn/APKBUILD16
-rw-r--r--user/aspell-dict-mr/APKBUILD16
-rw-r--r--user/aspell-dict-ms/APKBUILD16
-rw-r--r--user/aspell-dict-mt/APKBUILD16
-rw-r--r--user/aspell-dict-nb/APKBUILD16
-rw-r--r--user/aspell-dict-nds/APKBUILD16
-rw-r--r--user/aspell-dict-nl/APKBUILD16
-rw-r--r--user/aspell-dict-nn/APKBUILD16
-rw-r--r--user/aspell-dict-ny/APKBUILD16
-rw-r--r--user/aspell-dict-or/APKBUILD16
-rw-r--r--user/aspell-dict-pa/APKBUILD16
-rw-r--r--user/aspell-dict-pl/APKBUILD14
-rw-r--r--user/aspell-dict-pt_BR/APKBUILD16
-rw-r--r--user/aspell-dict-pt_PT/APKBUILD16
-rw-r--r--user/aspell-dict-qu/APKBUILD16
-rw-r--r--user/aspell-dict-ro/APKBUILD14
-rw-r--r--user/aspell-dict-ru/APKBUILD16
-rw-r--r--user/aspell-dict-rw/APKBUILD16
-rw-r--r--user/aspell-dict-sc/APKBUILD16
-rw-r--r--user/aspell-dict-sk/APKBUILD16
-rw-r--r--user/aspell-dict-sl/APKBUILD16
-rw-r--r--user/aspell-dict-sr/APKBUILD16
-rw-r--r--user/aspell-dict-sv/APKBUILD16
-rw-r--r--user/aspell-dict-sw/APKBUILD16
-rw-r--r--user/aspell-dict-ta/APKBUILD16
-rw-r--r--user/aspell-dict-te/APKBUILD16
-rw-r--r--user/aspell-dict-tet/APKBUILD16
-rw-r--r--user/aspell-dict-tk/APKBUILD16
-rw-r--r--user/aspell-dict-tl/APKBUILD14
-rw-r--r--user/aspell-dict-tn/APKBUILD16
-rw-r--r--user/aspell-dict-tr/APKBUILD16
-rw-r--r--user/aspell-dict-uk/APKBUILD16
-rw-r--r--user/aspell-dict-uz/APKBUILD16
-rw-r--r--user/aspell-dict-vi/APKBUILD16
-rw-r--r--user/aspell-dict-wa/APKBUILD16
-rw-r--r--user/aspell-dict-yi/APKBUILD16
-rw-r--r--user/aspell-dict-zu/APKBUILD16
-rw-r--r--user/atkmm/APKBUILD7
-rw-r--r--user/atril/APKBUILD4
-rw-r--r--user/attica/APKBUILD4
-rw-r--r--user/audacious-plugins/APKBUILD4
-rw-r--r--user/audacious/APKBUILD1
-rw-r--r--user/audiofile/APKBUILD6
-rw-r--r--user/awesome/APKBUILD18
-rw-r--r--user/ayatana-ido/APKBUILD19
-rw-r--r--user/ayatana-ido/remove-private.patch2295
-rw-r--r--user/baekmuk-ttf/APKBUILD3
-rw-r--r--user/baloo-widgets/APKBUILD13
-rw-r--r--user/baloo-widgets/frameworks.patch34
-rw-r--r--user/baloo-widgets/revert.patch37
-rw-r--r--user/baloo/APKBUILD14
-rw-r--r--user/baloo/initialise-variable.patch2
-rw-r--r--user/bash-completion/APKBUILD4
-rw-r--r--user/bearssl/APKBUILD30
-rw-r--r--user/beforelight/APKBUILD4
-rw-r--r--user/bengali-fonts/APKBUILD2
-rw-r--r--user/bind/APKBUILD7
-rw-r--r--user/bitlbee/APKBUILD9
-rw-r--r--user/blinken/APKBUILD11
-rw-r--r--user/bomber/APKBUILD11
-rw-r--r--user/bomber/ridiculous-qt.patch11
-rw-r--r--user/bovo/APKBUILD11
-rw-r--r--user/breeze-gtk/APKBUILD12
-rw-r--r--user/breeze-icons/APKBUILD4
-rw-r--r--user/breeze/APKBUILD8
-rw-r--r--user/bsdwhois/APKBUILD3
-rw-r--r--user/btrfs-progs/APKBUILD4
-rw-r--r--user/bugzilla/APKBUILD7
-rw-r--r--user/bzflag/APKBUILD6
-rw-r--r--user/cairomm/APKBUILD7
-rw-r--r--user/caja-dropbox/APKBUILD7
-rw-r--r--user/caja-extensions/APKBUILD7
-rw-r--r--user/caja/APKBUILD8
-rw-r--r--user/calligra/APKBUILD35
-rw-r--r--user/calligra/kcalcore.patch74
-rw-r--r--user/calligra/kf5.patch38
-rw-r--r--user/calligra/plan.patch48
-rw-r--r--user/calligra/poppler-81.patch70
-rw-r--r--user/calligra/poppler-83.patch102
-rw-r--r--user/calligra/qt5.patch293
-rw-r--r--user/cantarell-fonts/APKBUILD3
-rw-r--r--user/cantor/APKBUILD14
-rw-r--r--user/cardo/APKBUILD3
-rw-r--r--user/catcodec/APKBUILD2
-rw-r--r--user/catfish/APKBUILD10
-rw-r--r--user/cbindgen/APKBUILD123
-rw-r--r--user/ccache/APKBUILD7
-rw-r--r--user/certbot/APKBUILD7
-rw-r--r--user/cgit/APKBUILD16
-rw-r--r--user/cgmanager/APKBUILD3
-rw-r--r--user/checkbashisms/APKBUILD9
-rw-r--r--user/chelf/APKBUILD2
-rw-r--r--user/chrony/APKBUILD8
-rw-r--r--user/cifs-utils/APKBUILD20
-rw-r--r--user/cifs-utils/respect-destdir.patch18
-rw-r--r--user/claws-mail/APKBUILD16
-rw-r--r--user/claws-mail/etpan.patch97
-rw-r--r--user/clearsans/APKBUILD3
-rw-r--r--user/cloc/APKBUILD14
-rw-r--r--user/clucene/APKBUILD5
-rw-r--r--user/clutter/APKBUILD10
-rw-r--r--user/cm-unicode/APKBUILD3
-rw-r--r--user/cmocka/APKBUILD41
-rw-r--r--user/cmocka/uintptr_t.patch25
-rw-r--r--user/cmus/APKBUILD7
-rw-r--r--user/cogl/APKBUILD10
-rw-r--r--user/comfortaa/APKBUILD10
-rw-r--r--user/comic-neue/APKBUILD3
-rw-r--r--user/command-not-found/APKBUILD9
-rw-r--r--user/compface/APKBUILD5
-rw-r--r--user/compton-conf/APKBUILD13
-rw-r--r--user/compton/APKBUILD11
-rw-r--r--user/confuse/APKBUILD8
-rw-r--r--user/convertlit/APKBUILD2
-rw-r--r--user/courier-prime/APKBUILD3
-rw-r--r--user/coverage/APKBUILD7
-rw-r--r--user/cppunit/APKBUILD9
-rw-r--r--user/cram/APKBUILD5
-rw-r--r--user/ctags/APKBUILD2
-rw-r--r--user/cups-filters/APKBUILD2
-rw-r--r--user/cve-check-tool/APKBUILD4
-rw-r--r--user/dconf/APKBUILD11
-rw-r--r--user/dconf/meson.patch35
-rw-r--r--user/ddrescue/APKBUILD16
-rw-r--r--user/dhcpcd/APKBUILD9
-rw-r--r--user/dina/APKBUILD6
-rw-r--r--user/diskdev_cmds/APKBUILD5
-rw-r--r--user/dmidecode/APKBUILD7
-rw-r--r--user/docbook2x/APKBUILD5
-rw-r--r--user/dolphin/APKBUILD13
-rw-r--r--user/dolphin/baloo.patch53
-rw-r--r--user/dolphin/frameworks.patch11
-rw-r--r--user/dos2unix/APKBUILD27
-rw-r--r--user/dosbox/APKBUILD5
-rw-r--r--user/dosfstools/APKBUILD5
-rw-r--r--user/doxygen/APKBUILD8
-rw-r--r--user/doxygen/time64.patch19
-rw-r--r--user/dragonplayer/APKBUILD11
-rw-r--r--user/dtach/APKBUILD1
-rw-r--r--user/dumb-init/APKBUILD2
-rw-r--r--user/ebgaramond/APKBUILD3
-rw-r--r--user/ebook-tools/APKBUILD7
-rw-r--r--user/editres/APKBUILD3
-rw-r--r--user/efibootmgr/APKBUILD2
-rw-r--r--user/efivar/APKBUILD2
-rw-r--r--user/eggdbus/APKBUILD5
-rw-r--r--user/emacs/APKBUILD5
-rw-r--r--user/engrampa/APKBUILD7
-rw-r--r--user/eom/APKBUILD4
-rw-r--r--user/erl-rebar/APKBUILD2
-rw-r--r--user/erl-rebar3/APKBUILD2
-rw-r--r--user/erlang/APKBUILD4
-rw-r--r--user/ers-symbols/APKBUILD3
-rw-r--r--user/essays1743/APKBUILD1
-rw-r--r--user/ethtool/APKBUILD1
-rw-r--r--user/evince/APKBUILD4
-rw-r--r--user/exfat-utils/APKBUILD3
-rw-r--r--user/exo/APKBUILD9
-rw-r--r--user/extra-cmake-modules/APKBUILD4
-rw-r--r--user/faad2/APKBUILD2
-rw-r--r--user/fantasque-sans-mono/APKBUILD3
-rw-r--r--user/farstream/APKBUILD3
-rw-r--r--user/fastjar/APKBUILD4
-rw-r--r--user/fdupes/APKBUILD2
-rw-r--r--user/featherpad/APKBUILD4
-rw-r--r--user/feh/APKBUILD6
-rw-r--r--user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch2
-rw-r--r--user/ffmpeg/APKBUILD3
-rw-r--r--user/ffmpegthumbnailer/APKBUILD12
-rw-r--r--user/ffmpegthumbs/APKBUILD11
-rw-r--r--user/fifth-leg/APKBUILD3
-rw-r--r--user/figlet/APKBUILD6
-rw-r--r--user/firefox-esr/APKBUILD39
-rw-r--r--user/firefox-esr/yuv-be.patch48
-rw-r--r--user/fish/APKBUILD4
-rw-r--r--user/flite/APKBUILD6
-rw-r--r--user/fluidsynth/APKBUILD8
-rw-r--r--user/fluxbox/APKBUILD4
-rw-r--r--user/font-adobe-100dpi/APKBUILD6
-rw-r--r--user/font-adobe-75dpi/APKBUILD6
-rw-r--r--user/font-adobe-utopia-100dpi/APKBUILD6
-rw-r--r--user/font-adobe-utopia-75dpi/APKBUILD6
-rw-r--r--user/font-adobe-utopia-type1/APKBUILD6
-rw-r--r--user/font-arabic-misc/APKBUILD6
-rw-r--r--user/font-bh-100dpi/APKBUILD6
-rw-r--r--user/font-bh-75dpi/APKBUILD6
-rw-r--r--user/font-bh-lucidatypewriter-100dpi/APKBUILD6
-rw-r--r--user/font-bh-lucidatypewriter-75dpi/APKBUILD6
-rw-r--r--user/font-bitstream-100dpi/APKBUILD6
-rw-r--r--user/font-bitstream-75dpi/APKBUILD6
-rw-r--r--user/font-bitstream-speedo/APKBUILD6
-rw-r--r--user/font-bitstream-type1/APKBUILD6
-rw-r--r--user/font-cronyx-cyrillic/APKBUILD6
-rw-r--r--user/font-daewoo-misc/APKBUILD6
-rw-r--r--user/font-dec-misc/APKBUILD6
-rw-r--r--user/font-isas-misc/APKBUILD6
-rw-r--r--user/font-jis-misc/APKBUILD6
-rw-r--r--user/font-micro-misc/APKBUILD6
-rw-r--r--user/font-misc-cyrillic/APKBUILD8
-rw-r--r--user/font-misc-ethiopic/APKBUILD6
-rw-r--r--user/font-mutt-misc/APKBUILD6
-rw-r--r--user/font-schumacher-misc/APKBUILD6
-rw-r--r--user/font-screen-cyrillic/APKBUILD6
-rw-r--r--user/font-sony-misc/APKBUILD8
-rw-r--r--user/font-sun-misc/APKBUILD6
-rw-r--r--user/font-winitzki-cyrillic/APKBUILD6
-rw-r--r--user/font-xfree86-type1/APKBUILD4
-rw-r--r--user/fontforge/APKBUILD5
-rw-r--r--user/fonttosfnt/APKBUILD3
-rw-r--r--user/fortune-mod/APKBUILD6
-rw-r--r--user/frameworkintegration/APKBUILD4
-rw-r--r--user/freealut/APKBUILD20
-rw-r--r--user/freecell-solver/APKBUILD9
-rw-r--r--user/freeglut/APKBUILD5
-rw-r--r--user/frei0r-plugins/APKBUILD14
-rw-r--r--user/frei0r-plugins/facebl0r-opencv-3.4.3.patch22
-rw-r--r--user/fslsfonts/APKBUILD3
-rw-r--r--user/fstobdf/APKBUILD3
-rw-r--r--user/ftmenu/APKBUILD14
-rw-r--r--user/fts/APKBUILD5
-rw-r--r--user/fuse-exfat/APKBUILD3
-rw-r--r--user/fuse3/APKBUILD9
-rw-r--r--user/gamin/APKBUILD2
-rw-r--r--user/garcon/APKBUILD5
-rw-r--r--user/gavl/APKBUILD5
-rw-r--r--user/gcompat/APKBUILD2
-rw-r--r--user/gcompris-qt/APKBUILD10
-rw-r--r--user/gdbm/APKBUILD5
-rw-r--r--user/genmenu/APKBUILD5
-rw-r--r--user/giblib/APKBUILD9
-rw-r--r--user/gidole/APKBUILD3
-rw-r--r--user/glass-tty-vt220/APKBUILD4
-rw-r--r--user/gleam/APKBUILD253
-rw-r--r--user/glibmm/APKBUILD4
-rw-r--r--user/gmime/APKBUILD8
-rw-r--r--user/gnu-ghostscript/APKBUILD3
-rw-r--r--user/gnucobol/APKBUILD11
-rw-r--r--user/gnucobol/big-endian.patch28
-rw-r--r--user/gnucobol/dash-compat.patch29
-rw-r--r--user/goffice/APKBUILD1
-rw-r--r--user/gprbuild/APKBUILD8
-rw-r--r--user/gptfdisk/APKBUILD3
-rw-r--r--user/granatier/APKBUILD11
-rw-r--r--user/grantlee/APKBUILD15
-rw-r--r--user/grfcodec/APKBUILD2
-rw-r--r--user/gsettings-desktop-schemas/APKBUILD1
-rw-r--r--user/gsl/APKBUILD3
-rw-r--r--user/gsm/APKBUILD2
-rw-r--r--user/gst-plugins-good/APKBUILD6
-rw-r--r--user/gtk+/APKBUILD23
-rw-r--r--user/gtkmm+3.0/APKBUILD7
-rw-r--r--user/gtksourceview-3.0/APKBUILD10
-rw-r--r--user/gtkspell/APKBUILD7
-rw-r--r--user/gucharmap/APKBUILD16
-rw-r--r--user/gucharmap/unicode-12.1.patch25
-rw-r--r--user/guile20/APKBUILD2
-rw-r--r--user/gutenprint/APKBUILD4
-rw-r--r--user/gvim/APKBUILD2
-rw-r--r--user/gwenview/APKBUILD10
-rw-r--r--user/haveged/APKBUILD10
-rw-r--r--user/hdparm/APKBUILD7
-rw-r--r--user/hermit/APKBUILD4
-rw-r--r--user/heuristica-otf/APKBUILD4
-rw-r--r--user/htop/APKBUILD9
-rw-r--r--user/htop/correctness.patch78
-rw-r--r--user/humor-sans/APKBUILD4
-rw-r--r--user/hunkyfonts/APKBUILD3
-rw-r--r--user/hyphen/APKBUILD6
-rw-r--r--user/i3status/APKBUILD6
-rw-r--r--user/i3wm/APKBUILD7
-rw-r--r--user/iceauth/APKBUILD9
-rw-r--r--user/icewm/APKBUILD24
-rw-r--r--user/ico/APKBUILD3
-rw-r--r--user/icon-naming-utils/APKBUILD3
-rw-r--r--user/id3lib/APKBUILD3
-rw-r--r--user/ido/APKBUILD27
-rw-r--r--user/ido/ubuntu-private.patch70
-rw-r--r--user/imake/APKBUILD11
-rw-r--r--user/imlib2/APKBUILD13
-rw-r--r--user/inconsolata-lgc/APKBUILD3
-rw-r--r--user/intlfonts/APKBUILD2
-rw-r--r--user/ipaexfont/APKBUILD5
-rw-r--r--user/iperf3/APKBUILD7
-rw-r--r--user/ipmiutil/APKBUILD8
-rw-r--r--user/iptables/APKBUILD10
-rw-r--r--user/iputils/APKBUILD2
-rw-r--r--user/irssi/APKBUILD5
-rw-r--r--user/isync/APKBUILD4
-rw-r--r--user/iw/APKBUILD6
-rw-r--r--user/java-cacerts/APKBUILD2
-rw-r--r--user/java-common/APKBUILD2
-rw-r--r--user/jomolhari/APKBUILD4
-rw-r--r--user/jpegoptim/APKBUILD3
-rw-r--r--user/json-glib/APKBUILD9
-rw-r--r--user/juk/APKBUILD11
-rw-r--r--user/kacst_fonts/APKBUILD3
-rw-r--r--user/kactivities-stats/APKBUILD4
-rw-r--r--user/kactivities/APKBUILD4
-rw-r--r--user/kactivitymanagerd/APKBUILD6
-rw-r--r--user/kaffeine/APKBUILD5
-rw-r--r--user/kalgebra/APKBUILD11
-rw-r--r--user/kalzium/APKBUILD11
-rw-r--r--user/kanagram/APKBUILD11
-rw-r--r--user/kanjistrokeorders/APKBUILD6
-rw-r--r--user/kapman/APKBUILD11
-rw-r--r--user/karchive/APKBUILD4
-rw-r--r--user/kate/APKBUILD15
-rw-r--r--user/katomic/APKBUILD11
-rw-r--r--user/kauth/APKBUILD4
-rw-r--r--user/kblackbox/APKBUILD11
-rw-r--r--user/kblocks/APKBUILD11
-rw-r--r--user/kbookmarks/APKBUILD4
-rw-r--r--user/kbounce/APKBUILD11
-rw-r--r--user/kbreakout/APKBUILD11
-rw-r--r--user/kbruch/APKBUILD11
-rw-r--r--user/kcachegrind/APKBUILD11
-rw-r--r--user/kcalc/APKBUILD11
-rw-r--r--user/kcalendarcore/APKBUILD (renamed from user/kcalcore/APKBUILD)23
-rw-r--r--user/kcharselect/APKBUILD11
-rw-r--r--user/kcmutils/APKBUILD4
-rw-r--r--user/kcodecs/APKBUILD6
-rw-r--r--user/kcolorchooser/APKBUILD11
-rw-r--r--user/kcompletion/APKBUILD4
-rw-r--r--user/kconfig/APKBUILD4
-rw-r--r--user/kconfigwidgets/APKBUILD4
-rw-r--r--user/kcontacts/APKBUILD14
-rw-r--r--user/kcoreaddons/APKBUILD9
-rw-r--r--user/kcoreaddons/utf8.patch17
-rw-r--r--user/kcrash/APKBUILD4
-rw-r--r--user/kdbusaddons/APKBUILD4
-rw-r--r--user/kde-cli-tools/APKBUILD13
-rw-r--r--user/kde-education/APKBUILD4
-rw-r--r--user/kde-games/APKBUILD2
-rw-r--r--user/kde-graphics/APKBUILD2
-rw-r--r--user/kde-gtk-config/APKBUILD10
-rw-r--r--user/kde-multimedia/APKBUILD2
-rw-r--r--user/kde-system/APKBUILD2
-rw-r--r--user/kde-utilities/APKBUILD2
-rw-r--r--user/kde/APKBUILD6
-rw-r--r--user/kdeclarative/APKBUILD4
-rw-r--r--user/kdecoration/APKBUILD12
-rw-r--r--user/kded/APKBUILD4
-rw-r--r--user/kdegraphics-thumbnailers/APKBUILD11
-rw-r--r--user/kdelibs4support/APKBUILD4
-rw-r--r--user/kdenlive/APKBUILD11
-rw-r--r--user/kdeplasma-addons/APKBUILD10
-rw-r--r--user/kdesignerplugin/APKBUILD4
-rw-r--r--user/kdesu/APKBUILD4
-rw-r--r--user/kdewebkit/APKBUILD13
-rw-r--r--user/kdf/APKBUILD11
-rw-r--r--user/kdiagram/APKBUILD5
-rw-r--r--user/kdiamond/APKBUILD11
-rw-r--r--user/kdiamond/ridiculous-qt.patch11
-rw-r--r--user/kdnssd/APKBUILD4
-rw-r--r--user/kdoctools/APKBUILD4
-rw-r--r--user/keepassxc/APKBUILD20
-rw-r--r--user/kemoticons/APKBUILD4
-rw-r--r--user/keybinder-3.0/APKBUILD8
-rw-r--r--user/keychain/APKBUILD6
-rw-r--r--user/kfilemetadata/APKBUILD16
-rw-r--r--user/kfilemetadata/add-formatting-fn.patch479
-rw-r--r--user/kfilemetadata/add-mimeutils.patch186
-rw-r--r--user/kfilemetadata/test-mimetype.patch13
-rw-r--r--user/kfind/APKBUILD11
-rw-r--r--user/kfloppy/APKBUILD11
-rw-r--r--user/kfourinline/APKBUILD11
-rw-r--r--user/kgamma5/APKBUILD8
-rw-r--r--user/kgeography/APKBUILD11
-rw-r--r--user/kget/APKBUILD11
-rw-r--r--user/kget/kf5.patch11
-rw-r--r--user/kglobalaccel/APKBUILD4
-rw-r--r--user/kgoldrunner/APKBUILD11
-rw-r--r--user/kgpg/APKBUILD11
-rw-r--r--user/kgraphviewer/APKBUILD5
-rw-r--r--user/kguiaddons/APKBUILD4
-rw-r--r--user/khangman/APKBUILD11
-rw-r--r--user/khelpcenter/APKBUILD8
-rw-r--r--user/khmeros-fonts/APKBUILD3
-rw-r--r--user/kholidays/APKBUILD4
-rw-r--r--user/khotkeys/APKBUILD16
-rw-r--r--user/khotkeys/cmake-fixes.patch49
-rw-r--r--user/khtml/APKBUILD4
-rw-r--r--user/ki18n/APKBUILD4
-rw-r--r--user/kiconthemes/APKBUILD4
-rw-r--r--user/kidletime/APKBUILD4
-rw-r--r--user/kig/APKBUILD13
-rw-r--r--user/kigo/APKBUILD11
-rw-r--r--user/killbots/APKBUILD11
-rw-r--r--user/kinfocenter/APKBUILD10
-rw-r--r--user/kinit/APKBUILD4
-rw-r--r--user/kio-extras/APKBUILD21
-rw-r--r--user/kio-extras/D17205-nfs-tirpc.patch143
-rw-r--r--user/kio/APKBUILD4
-rw-r--r--user/kirigami2/APKBUILD4
-rw-r--r--user/kiriki/APKBUILD11
-rw-r--r--user/kitemmodels/APKBUILD4
-rw-r--r--user/kitemviews/APKBUILD4
-rw-r--r--user/kiten/APKBUILD11
-rw-r--r--user/kjobwidgets/APKBUILD4
-rw-r--r--user/kjs/APKBUILD4
-rw-r--r--user/kjsembed/APKBUILD4
-rw-r--r--user/kjumpingcube/APKBUILD11
-rw-r--r--user/kleopatra/APKBUILD14
-rw-r--r--user/kleopatra/qt5.9.patch87
-rw-r--r--user/klettres/APKBUILD11
-rw-r--r--user/klickety/APKBUILD11
-rw-r--r--user/klines/APKBUILD11
-rw-r--r--user/kmag/APKBUILD11
-rw-r--r--user/kmahjongg/APKBUILD11
-rw-r--r--user/kmediaplayer/APKBUILD4
-rw-r--r--user/kmenuedit/APKBUILD11
-rw-r--r--user/kmime/APKBUILD14
-rw-r--r--user/kmime/egregious-versions.patch24
-rw-r--r--user/kmines/APKBUILD11
-rw-r--r--user/kmix/APKBUILD11
-rw-r--r--user/kmousetool/APKBUILD11
-rw-r--r--user/kmplot/APKBUILD13
-rw-r--r--user/knavalbattle/APKBUILD11
-rw-r--r--user/knetwalk/APKBUILD11
-rw-r--r--user/knewstuff/APKBUILD4
-rw-r--r--user/knotifications/APKBUILD4
-rw-r--r--user/knotifyconfig/APKBUILD4
-rw-r--r--user/kolf/APKBUILD15
-rw-r--r--user/kollision/APKBUILD11
-rw-r--r--user/kolourpaint/APKBUILD11
-rw-r--r--user/konquest/APKBUILD11
-rw-r--r--user/konsole/APKBUILD11
-rw-r--r--user/konversation/APKBUILD12
-rw-r--r--user/konversation/qt5.patch24
-rw-r--r--user/koruri/APKBUILD2
-rw-r--r--user/kpackage/APKBUILD4
-rw-r--r--user/kparts/APKBUILD4
-rw-r--r--user/kpat/APKBUILD11
-rw-r--r--user/kpeople/APKBUILD4
-rw-r--r--user/kphotoalbum/APKBUILD5
-rw-r--r--user/kpimtextedit/APKBUILD14
-rw-r--r--user/kpimtextedit/qt5.9.patch70
-rw-r--r--user/kplotting/APKBUILD4
-rw-r--r--user/kpmcore/APKBUILD20
-rw-r--r--user/kpmcore/fat32.patch26
-rw-r--r--user/kpmcore/nullptr-segfault.patch35
-rw-r--r--user/kpmcore/test.patch140
-rw-r--r--user/kpty/APKBUILD4
-rw-r--r--user/krdc/APKBUILD11
-rw-r--r--user/kreversi/APKBUILD11
-rw-r--r--user/krfb/APKBUILD11
-rw-r--r--user/krita/APKBUILD8
-rw-r--r--user/kronometer/APKBUILD2
-rw-r--r--user/kross/APKBUILD4
-rw-r--r--user/kruler/APKBUILD11
-rw-r--r--user/krunner/APKBUILD4
-rw-r--r--user/krusader/APKBUILD4
-rw-r--r--user/krusader/posix-headers.patch4
-rw-r--r--user/kscreenlocker/APKBUILD16
-rw-r--r--user/kscreenlocker/optional-wayland.patch448
-rw-r--r--user/kservice/APKBUILD4
-rw-r--r--user/kshisen/APKBUILD11
-rw-r--r--user/ksirk/APKBUILD11
-rw-r--r--user/ksnakeduel/APKBUILD11
-rw-r--r--user/ksnakeduel/ridiculous-qt.patch11
-rw-r--r--user/kspaceduel/APKBUILD11
-rw-r--r--user/ksquares/APKBUILD11
-rw-r--r--user/ksshaskpass/APKBUILD8
-rw-r--r--user/kst/APKBUILD12
-rw-r--r--user/kst/qt5.patch47
-rw-r--r--user/ksudoku/APKBUILD11
-rw-r--r--user/ksysguard/0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch31
-rw-r--r--user/ksysguard/APKBUILD12
-rw-r--r--user/ksysguard/ksysguard-5.6.5-rindex-header.patch2
-rw-r--r--user/ksystemlog/APKBUILD11
-rw-r--r--user/kteatime/APKBUILD11
-rw-r--r--user/ktexteditor/APKBUILD11
-rw-r--r--user/ktextwidgets/APKBUILD4
-rw-r--r--user/ktimer/APKBUILD11
-rw-r--r--user/ktorrent/APKBUILD2
-rw-r--r--user/ktouch/APKBUILD8
-rw-r--r--user/ktuberling/APKBUILD14
-rw-r--r--user/ktuberling/frameworks.patch11
-rw-r--r--user/kturtle/APKBUILD11
-rw-r--r--user/kubrick/APKBUILD11
-rw-r--r--user/kunitconversion/APKBUILD4
-rw-r--r--user/kuserfeedback/APKBUILD42
-rw-r--r--user/kwallet/APKBUILD4
-rw-r--r--user/kwalletmanager/APKBUILD11
-rw-r--r--user/kwave/APKBUILD11
-rw-r--r--user/kwayland/APKBUILD11
-rw-r--r--user/kwidgetsaddons/APKBUILD4
-rw-r--r--user/kwin/APKBUILD17
-rw-r--r--user/kwindowsystem/APKBUILD4
-rw-r--r--user/kwordquiz/APKBUILD11
-rw-r--r--user/kxmlgui/APKBUILD4
-rw-r--r--user/kxmlrpcclient/APKBUILD4
-rw-r--r--user/labplot/APKBUILD10
-rw-r--r--user/lesscpy/APKBUILD3
-rw-r--r--user/libaacs/APKBUILD5
-rw-r--r--user/libao/APKBUILD4
-rw-r--r--user/libart-lgpl/APKBUILD6
-rw-r--r--user/libass/APKBUILD10
-rw-r--r--user/libavc1394/APKBUILD12
-rw-r--r--user/libayatana-indicator/APKBUILD14
-rw-r--r--user/libbluray/APKBUILD1
-rw-r--r--user/libburn/APKBUILD8
-rw-r--r--user/libcanberra/APKBUILD5
-rw-r--r--user/libcdr/APKBUILD3
-rw-r--r--user/libcmis/APKBUILD11
-rw-r--r--user/libcmis/icu.patch17
-rw-r--r--user/libconfig/APKBUILD4
-rw-r--r--user/libcue/APKBUILD3
-rw-r--r--user/libdc1394/APKBUILD2
-rw-r--r--user/libdca/APKBUILD4
-rw-r--r--user/libdv/APKBUILD4
-rw-r--r--user/libdvdcss/APKBUILD6
-rw-r--r--user/libdvdnav/APKBUILD3
-rw-r--r--user/libdvdread/APKBUILD4
-rw-r--r--user/libe-book/APKBUILD11
-rw-r--r--user/libebml/APKBUILD9
-rw-r--r--user/libepubgen/APKBUILD5
-rw-r--r--user/libertine-fonts/APKBUILD4
-rw-r--r--user/libetonyek/APKBUILD3
-rw-r--r--user/libexif/APKBUILD5
-rw-r--r--user/libexttextcat/APKBUILD5
-rw-r--r--user/libfakekey/APKBUILD12
-rw-r--r--user/libfm-extra/APKBUILD4
-rw-r--r--user/libfm-qt/APKBUILD17
-rw-r--r--user/libfm/APKBUILD8
-rw-r--r--user/libfreehand/APKBUILD14
-rw-r--r--user/libfreehand/icu.patch11
-rw-r--r--user/libgit2/APKBUILD18
-rw-r--r--user/libgit2/libressl.patch12
-rw-r--r--user/libgit2/pkgconfig-do-not-quote-Libs.patch26
-rw-r--r--user/libgit2/test-32bit.patch59
-rw-r--r--user/libglade/APKBUILD10
-rw-r--r--user/libgnome-keyring/APKBUILD7
-rw-r--r--user/libgphoto2/APKBUILD6
-rw-r--r--user/libgtop/APKBUILD7
-rw-r--r--user/libgxps/APKBUILD3
-rw-r--r--user/libid3tag/APKBUILD6
-rw-r--r--user/libid3tag/gperf.patch12
-rw-r--r--user/libidn2/APKBUILD3
-rw-r--r--user/libiec61883/APKBUILD4
-rw-r--r--user/libieee1284/APKBUILD7
-rw-r--r--user/libindicator/APKBUILD19
-rw-r--r--user/libinput/APKBUILD9
-rw-r--r--user/libinput/time64.patch49
-rw-r--r--user/libisofs/APKBUILD8
-rw-r--r--user/libkdcraw/APKBUILD11
-rw-r--r--user/libkdegames/APKBUILD11
-rw-r--r--user/libkeduvocdocument/APKBUILD11
-rw-r--r--user/libkexiv2/APKBUILD8
-rw-r--r--user/libkipi/APKBUILD10
-rw-r--r--user/libkleo/APKBUILD14
-rw-r--r--user/libkleo/egregious-versions.patch32
-rw-r--r--user/libkmahjongg/APKBUILD11
-rw-r--r--user/libksane/APKBUILD14
-rw-r--r--user/libksane/frameworks.patch11
-rw-r--r--user/libkscreen/APKBUILD13
-rw-r--r--user/libksysguard/APKBUILD11
-rw-r--r--user/libktorrent/APKBUILD4
-rw-r--r--user/libkworkspace/APKBUILD51
-rw-r--r--user/libkworkspace/header-generation.patch17
-rw-r--r--user/libkworkspace/session.patch23
-rw-r--r--user/libkworkspace/standalone.patch111
-rw-r--r--user/liblangtag/APKBUILD2
-rw-r--r--user/liblbxutil/APKBUILD4
-rw-r--r--user/liblxqt/APKBUILD15
-rw-r--r--user/libmad/APKBUILD3
-rw-r--r--user/libmatekbd/APKBUILD7
-rw-r--r--user/libmatemixer/APKBUILD10
-rw-r--r--user/libmateweather/APKBUILD7
-rw-r--r--user/libmatroska/APKBUILD7
-rw-r--r--user/libmbim/APKBUILD4
-rw-r--r--user/libmms/APKBUILD5
-rw-r--r--user/libmowgli/APKBUILD3
-rw-r--r--user/libmpd/APKBUILD9
-rw-r--r--user/libmpeg2/APKBUILD6
-rw-r--r--user/libmspub/APKBUILD7
-rw-r--r--user/libmtp/APKBUILD3
-rw-r--r--user/libmwaw/APKBUILD2
-rw-r--r--user/libnfs/APKBUILD4
-rw-r--r--user/libnftnl/APKBUILD10
-rw-r--r--user/libnftnl/nft-flowtable-test.patch37
-rw-r--r--user/libnl3/APKBUILD11
-rw-r--r--user/libnumbertext/APKBUILD4
-rw-r--r--user/libodfgen/APKBUILD9
-rw-r--r--user/libopenraw/APKBUILD5
-rw-r--r--user/liborcus/APKBUILD1
-rw-r--r--user/libotr/APKBUILD3
-rw-r--r--user/libpagemaker/APKBUILD5
-rw-r--r--user/libpcap/APKBUILD2
-rw-r--r--user/libpeas/APKBUILD4
-rw-r--r--user/libpfm/APKBUILD2
-rw-r--r--user/libproxy/APKBUILD3
-rw-r--r--user/libpsl/APKBUILD11
-rw-r--r--user/libqalculate/APKBUILD10
-rw-r--r--user/libqmi/APKBUILD9
-rw-r--r--user/libqmi/endian.patch69
-rw-r--r--user/libqtxdg/APKBUILD16
-rw-r--r--user/libquotient/APKBUILD2
-rw-r--r--user/libqxp/APKBUILD6
-rw-r--r--user/libraw1394/APKBUILD5
-rw-r--r--user/librdkafka/APKBUILD4
-rw-r--r--user/librevenge/APKBUILD6
-rw-r--r--user/libsamplerate/APKBUILD6
-rw-r--r--user/libsexy/APKBUILD11
-rw-r--r--user/libsigc++/APKBUILD9
-rw-r--r--user/libsoup/APKBUILD5
-rw-r--r--user/libspectre/APKBUILD3
-rw-r--r--user/libstaroffice/APKBUILD5
-rw-r--r--user/libstatgrab/APKBUILD7
-rw-r--r--user/libsysstat/APKBUILD13
-rw-r--r--user/libtap/APKBUILD2
-rw-r--r--user/libtirpc/APKBUILD16
-rw-r--r--user/libtirpc/bsd-types.patch12
-rw-r--r--user/libtirpc/endian-header.patch13
-rw-r--r--user/libtirpc/musl.patch11
-rw-r--r--user/libtommath/APKBUILD10
-rw-r--r--user/libvisio/APKBUILD4
-rw-r--r--user/libvncserver/APKBUILD4
-rw-r--r--user/libwebp/APKBUILD3
-rw-r--r--user/libwnck/APKBUILD20
-rw-r--r--user/libwps/APKBUILD7
-rw-r--r--user/libxaw/APKBUILD3
-rw-r--r--user/libxdg-basedir/APKBUILD15
-rw-r--r--user/libxfce4ui/APKBUILD8
-rw-r--r--user/libxfce4util/APKBUILD5
-rw-r--r--user/libxklavier/APKBUILD9
-rw-r--r--user/libxp/APKBUILD3
-rw-r--r--user/libxres/APKBUILD2
-rw-r--r--user/libzip/APKBUILD3
-rw-r--r--user/libzmf/APKBUILD5
-rw-r--r--user/lighttpd/APKBUILD7
-rw-r--r--user/listres/APKBUILD3
-rw-r--r--user/live-media/APKBUILD7
-rw-r--r--user/lksctp-tools/APKBUILD2
-rw-r--r--user/lm_sensors/APKBUILD16
-rw-r--r--user/lohit-ttf/APKBUILD3
-rw-r--r--user/lskat/APKBUILD13
-rw-r--r--user/lsof/APKBUILD40
-rw-r--r--user/lsof/test-disable-nfs-test.patch4
-rw-r--r--user/lsof/test-enable-suite.patch4
-rw-r--r--user/lsof/test-linux-sysmacros.patch4
-rw-r--r--user/lsof/utmps.patch4
-rw-r--r--user/lua-expat/32bit.patch11
-rw-r--r--user/lua-expat/APKBUILD22
-rw-r--r--user/lua-filesystem/APKBUILD7
-rw-r--r--user/lua-lgi/APKBUILD5
-rw-r--r--user/lua-sec/APKBUILD2
-rw-r--r--user/lua-socket/APKBUILD5
-rw-r--r--user/luarocks/APKBUILD4
-rw-r--r--user/luit/APKBUILD4
-rw-r--r--user/lximage-qt/APKBUILD16
-rw-r--r--user/lxmenu-data/APKBUILD8
-rw-r--r--user/lxqt-about/APKBUILD13
-rw-r--r--user/lxqt-admin/APKBUILD13
-rw-r--r--user/lxqt-build-tools/APKBUILD16
-rw-r--r--user/lxqt-config/APKBUILD16
-rw-r--r--user/lxqt-desktop/APKBUILD11
-rw-r--r--user/lxqt-globalkeys/APKBUILD16
-rw-r--r--user/lxqt-l10n/APKBUILD13
-rw-r--r--user/lxqt-notificationd/APKBUILD17
-rw-r--r--user/lxqt-openssh-askpass/APKBUILD16
-rw-r--r--user/lxqt-panel/APKBUILD17
-rw-r--r--user/lxqt-policykit/APKBUILD16
-rw-r--r--user/lxqt-powermanagement/APKBUILD17
-rw-r--r--user/lxqt-qtplugin/APKBUILD17
-rw-r--r--user/lxqt-runner/APKBUILD17
-rw-r--r--user/lxqt-session/APKBUILD17
-rw-r--r--user/lxqt-sudo/APKBUILD16
-rw-r--r--user/lxqt-themes/APKBUILD13
-rw-r--r--user/lynx/APKBUILD7
-rw-r--r--user/mac-fdisk/APKBUILD7
-rw-r--r--user/mactel-boot/APKBUILD1
-rw-r--r--user/marble/APKBUILD10
-rw-r--r--user/marco/APKBUILD12
-rw-r--r--user/mariadb/APKBUILD8
-rw-r--r--user/mariadb/libedit.patch57
-rw-r--r--user/mariadb/ppchax.patch4
-rw-r--r--user/mate-applets/APKBUILD7
-rw-r--r--user/mate-backgrounds/APKBUILD7
-rw-r--r--user/mate-calc/APKBUILD7
-rw-r--r--user/mate-common/APKBUILD7
-rw-r--r--user/mate-complete/APKBUILD26
-rw-r--r--user/mate-control-center/APKBUILD7
-rw-r--r--user/mate-desktop/APKBUILD7
-rw-r--r--user/mate-icon-theme/APKBUILD8
-rw-r--r--user/mate-indicator-applet/APKBUILD11
-rw-r--r--user/mate-media/APKBUILD7
-rw-r--r--user/mate-menus/APKBUILD7
-rw-r--r--user/mate-netbook/APKBUILD7
-rw-r--r--user/mate-notification-daemon/APKBUILD7
-rw-r--r--user/mate-panel/APKBUILD7
-rw-r--r--user/mate-polkit/APKBUILD7
-rw-r--r--user/mate-power-manager/APKBUILD7
-rw-r--r--user/mate-screensaver/APKBUILD7
-rw-r--r--user/mate-sensors-applet/APKBUILD7
-rw-r--r--user/mate-session-manager/APKBUILD7
-rw-r--r--user/mate-settings-daemon/APKBUILD10
-rw-r--r--user/mate-system-monitor/APKBUILD7
-rw-r--r--user/mate-terminal/APKBUILD7
-rw-r--r--user/mate-user-guide/APKBUILD7
-rw-r--r--user/mate-user-share/APKBUILD4
-rw-r--r--user/mate-utils/APKBUILD7
-rw-r--r--user/mdadm/APKBUILD15
-rw-r--r--user/mdadm/sysmacros.patch31
-rw-r--r--user/mdadm/time64.patch19
-rw-r--r--user/mdds/APKBUILD4
-rw-r--r--user/mednafen/APKBUILD4
-rw-r--r--user/menu-cache/APKBUILD3
-rw-r--r--user/mesa-demos/APKBUILD9
-rw-r--r--user/mesa/APKBUILD15
-rw-r--r--user/mesa/intel-vulkan.patch26
-rw-r--r--user/mesa/no-tls.patch14
-rw-r--r--user/milou/APKBUILD10
-rw-r--r--user/mimetic/APKBUILD8
-rw-r--r--user/minicom/APKBUILD8
-rw-r--r--user/minivmac/APKBUILD11
-rw-r--r--user/minizip/APKBUILD36
-rw-r--r--user/minuet/APKBUILD11
-rw-r--r--user/mksh/APKBUILD8
-rw-r--r--user/mlt/APKBUILD8
-rw-r--r--user/modemmanager/APKBUILD4
-rw-r--r--user/monoid/APKBUILD3
-rw-r--r--user/montecarlo/APKBUILD2
-rw-r--r--user/mosh/APKBUILD4
-rw-r--r--user/mosquitto/APKBUILD12
-rw-r--r--user/mosquitto/python3.patch48
-rw-r--r--user/mousepad/APKBUILD5
-rw-r--r--user/mozo/APKBUILD7
-rw-r--r--user/mpg123/APKBUILD2
-rw-r--r--user/mplayer/APKBUILD4
-rw-r--r--user/mpv/APKBUILD17
-rw-r--r--user/mtdev/APKBUILD11
-rw-r--r--user/mtdev/printf-format.patch19
-rw-r--r--user/mtr/APKBUILD6
-rw-r--r--user/muparser/APKBUILD4
-rw-r--r--user/musl-obstack/APKBUILD2
-rw-r--r--user/mutt/APKBUILD5
-rw-r--r--user/mythes/APKBUILD7
-rw-r--r--user/nano/APKBUILD10
-rw-r--r--user/nasm/APKBUILD5
-rw-r--r--user/ncftp/APKBUILD17
-rw-r--r--user/ncompress/APKBUILD2
-rw-r--r--user/neon/APKBUILD5
-rw-r--r--user/net-snmp/APKBUILD8
-rw-r--r--user/netifrc/APKBUILD2
-rw-r--r--user/netqmail/APKBUILD6
-rw-r--r--user/netsurf/APKBUILD4
-rw-r--r--user/networkmanager/APKBUILD20
-rw-r--r--user/networkmanager/editline.patch24
-rw-r--r--user/networkmanager/errno.patch4
-rw-r--r--user/networkmanager/musl.patch38
-rw-r--r--user/networkmanager/random.patch2
-rw-r--r--user/networkmanager/tests.patch4
-rw-r--r--user/newt/APKBUILD2
-rw-r--r--user/nextcloud-client/APKBUILD2
-rw-r--r--user/nextcloud/APKBUILD4
-rw-r--r--user/nfs-utils/APKBUILD18
-rw-r--r--user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch2
-rw-r--r--user/nfs-utils/nfsdcld.patch12
-rw-r--r--user/nfs-utils/posixish.patch4
-rw-r--r--user/nfs-utils/ssize_t.patch84
-rw-r--r--user/nfs-utils/time64.patch123
-rw-r--r--user/nfs-utils/undef-def.patch11
-rw-r--r--user/nftables/APKBUILD15
-rw-r--r--user/nghttp2/APKBUILD1
-rw-r--r--user/nmap/APKBUILD7
-rw-r--r--user/nml/APKBUILD12
-rw-r--r--user/nml/pillow.patch14
-rw-r--r--user/node/APKBUILD7
-rw-r--r--user/nsd/APKBUILD9
-rw-r--r--user/ntfs-3g/APKBUILD6
-rw-r--r--user/numactl/APKBUILD6
-rw-r--r--user/obconf-qt/APKBUILD17
-rw-r--r--user/oclock/APKBUILD3
-rw-r--r--user/ode/APKBUILD8
-rw-r--r--user/ode/stdint.patch44
-rw-r--r--user/okteta/APKBUILD2
-rw-r--r--user/okular/APKBUILD14
-rw-r--r--user/okular/es-doc-fix.patch2
-rw-r--r--user/okular/pt-doc-fix.patch2
-rw-r--r--user/oniguruma/APKBUILD6
-rw-r--r--user/opal-utils/APKBUILD4
-rw-r--r--user/openal-soft/APKBUILD19
-rw-r--r--user/openbox/APKBUILD6
-rw-r--r--user/opencv/APKBUILD19
-rw-r--r--user/opencv/CVE-2019-16249.patch57
-rw-r--r--user/opengfx/APKBUILD3
-rw-r--r--user/openjdk8/APKBUILD28
-rw-r--r--user/openmsx/APKBUILD2
-rw-r--r--user/opensfx/APKBUILD7
-rw-r--r--user/openvpn/APKBUILD6
-rw-r--r--user/oprofile/APKBUILD3
-rw-r--r--user/optipng/APKBUILD3
-rw-r--r--user/opusfile/APKBUILD4
-rw-r--r--user/orage/APKBUILD5
-rw-r--r--user/otf-culmus/APKBUILD7
-rw-r--r--user/otf-exo/APKBUILD8
-rw-r--r--user/otf-office-code-pro/APKBUILD6
-rw-r--r--user/otf-proggy-vector/APKBUILD6
-rw-r--r--user/otf-source-code-pro/APKBUILD6
-rw-r--r--user/otf-source-sans-pro/APKBUILD6
-rw-r--r--user/otf-source-serif-pro/APKBUILD6
-rw-r--r--user/oxygen-fonts/APKBUILD7
-rw-r--r--user/oxygen-icons5/APKBUILD4
-rw-r--r--user/oxygen/APKBUILD10
-rw-r--r--user/palapeli/APKBUILD11
-rw-r--r--user/pangomm/APKBUILD7
-rw-r--r--user/papirus-icons/APKBUILD2
-rw-r--r--user/parole/APKBUILD5
-rw-r--r--user/partitionmanager/APKBUILD9
-rw-r--r--user/password-store/APKBUILD4
-rw-r--r--user/patchutils/APKBUILD4
-rw-r--r--user/pavucontrol-qt/APKBUILD13
-rw-r--r--user/pavucontrol/APKBUILD9
-rw-r--r--user/pcmanfm-qt/APKBUILD16
-rw-r--r--user/pcmanfm/APKBUILD8
-rw-r--r--user/pcmciautils/APKBUILD2
-rw-r--r--user/pcsc-lite/APKBUILD3
-rw-r--r--user/perl-algorithm-diff/APKBUILD1
-rw-r--r--user/perl-any-moose/APKBUILD1
-rw-r--r--user/perl-apache-logformat-compiler/APKBUILD2
-rw-r--r--user/perl-app-licensecheck/APKBUILD4
-rw-r--r--user/perl-b-hooks-endofscope/APKBUILD2
-rw-r--r--user/perl-b-hooks-op-check/APKBUILD2
-rw-r--r--user/perl-bareword-filehandles/APKBUILD4
-rw-r--r--user/perl-cgi/APKBUILD2
-rw-r--r--user/perl-chart/APKBUILD2
-rw-r--r--user/perl-class-accessor/APKBUILD2
-rw-r--r--user/perl-class-load-xs/APKBUILD2
-rw-r--r--user/perl-class-load/APKBUILD2
-rw-r--r--user/perl-class-method-modifiers/APKBUILD2
-rw-r--r--user/perl-class-singleton/APKBUILD2
-rw-r--r--user/perl-code-tidyall/APKBUILD6
-rw-r--r--user/perl-common-sense/APKBUILD1
-rw-r--r--user/perl-cookie-baker/APKBUILD2
-rw-r--r--user/perl-cpan-changes/APKBUILD4
-rw-r--r--user/perl-cpan-meta-check/APKBUILD2
-rw-r--r--user/perl-crypt-rijndael/APKBUILD2
-rw-r--r--user/perl-cwd-guard/APKBUILD3
-rw-r--r--user/perl-data-dump/APKBUILD4
-rw-r--r--user/perl-data-optlist/APKBUILD1
-rw-r--r--user/perl-data-section/APKBUILD4
-rw-r--r--user/perl-datetime-locale/APKBUILD2
-rw-r--r--user/perl-datetime-timezone/APKBUILD4
-rw-r--r--user/perl-datetime/APKBUILD2
-rw-r--r--user/perl-dbd-pg/APKBUILD4
-rw-r--r--user/perl-devel-checkcompiler/APKBUILD1
-rw-r--r--user/perl-devel-globaldestruction/APKBUILD1
-rw-r--r--user/perl-devel-hide/APKBUILD4
-rw-r--r--user/perl-devel-nytprof/APKBUILD2
-rw-r--r--user/perl-devel-overloadinfo/APKBUILD4
-rw-r--r--user/perl-devel-stacktrace-ashtml/APKBUILD2
-rw-r--r--user/perl-devel-symdump/APKBUILD1
-rw-r--r--user/perl-dist-checkconflicts/APKBUILD4
-rw-r--r--user/perl-email-abstract/APKBUILD2
-rw-r--r--user/perl-email-mime-encodings/APKBUILD2
-rw-r--r--user/perl-email-mime/APKBUILD2
-rw-r--r--user/perl-email-reply/APKBUILD2
-rw-r--r--user/perl-email-sender/APKBUILD6
-rw-r--r--user/perl-email-simple/APKBUILD2
-rw-r--r--user/perl-eval-closure/APKBUILD2
-rw-r--r--user/perl-exception-class/APKBUILD2
-rw-r--r--user/perl-extutils-depends/APKBUILD1
-rw-r--r--user/perl-file-basedir/APKBUILD2
-rw-r--r--user/perl-file-copy-recursive-reduced/APKBUILD2
-rw-r--r--user/perl-file-copy-recursive/APKBUILD2
-rw-r--r--user/perl-file-desktopentry/APKBUILD2
-rw-r--r--user/perl-file-find-object-rule/APKBUILD2
-rw-r--r--user/perl-file-find-object/APKBUILD2
-rw-r--r--user/perl-file-finder/APKBUILD2
-rw-r--r--user/perl-file-mimeinfo/APKBUILD2
-rw-r--r--user/perl-file-sharedir/APKBUILD3
-rw-r--r--user/perl-file-slurp/APKBUILD4
-rw-r--r--user/perl-games-solitaire-verify/APKBUILD2
-rw-r--r--user/perl-gd/APKBUILD3
-rw-r--r--user/perl-gdgraph/APKBUILD2
-rw-r--r--user/perl-gdtextutil/APKBUILD2
-rw-r--r--user/perl-getopt-long-descriptive/APKBUILD4
-rw-r--r--user/perl-hash-multivalue/APKBUILD2
-rw-r--r--user/perl-html-formatter/APKBUILD5
-rw-r--r--user/perl-html-formattext-withlinks/APKBUILD2
-rw-r--r--user/perl-html-scrubber/APKBUILD2
-rw-r--r--user/perl-html-tree/APKBUILD2
-rw-r--r--user/perl-http-entity-parser/APKBUILD2
-rw-r--r--user/perl-http-headers-fast/APKBUILD2
-rw-r--r--user/perl-importer/APKBUILD4
-rw-r--r--user/perl-indirect/APKBUILD2
-rw-r--r--user/perl-inline-c/APKBUILD2
-rw-r--r--user/perl-inline/APKBUILD2
-rw-r--r--user/perl-io-stringy/APKBUILD10
-rw-r--r--user/perl-io-tty/APKBUILD2
-rw-r--r--user/perl-json-rpc/APKBUILD4
-rw-r--r--user/perl-list-moreutils-xs/APKBUILD2
-rw-r--r--user/perl-list-moreutils/APKBUILD2
-rw-r--r--user/perl-list-someutils-xs/APKBUILD2
-rw-r--r--user/perl-list-someutils/APKBUILD2
-rw-r--r--user/perl-lwp-protocol-https/APKBUILD2
-rw-r--r--user/perl-module-build-xsutil/APKBUILD2
-rw-r--r--user/perl-module-implementation/APKBUILD4
-rw-r--r--user/perl-module-runtime/APKBUILD2
-rw-r--r--user/perl-moo/APKBUILD2
-rw-r--r--user/perl-moose/APKBUILD8
-rw-r--r--user/perl-moosex-getopt/APKBUILD4
-rw-r--r--user/perl-moosex-role-parameterised/APKBUILD6
-rw-r--r--user/perl-moosex-strictconstructor/APKBUILD4
-rw-r--r--user/perl-moox-late/APKBUILD6
-rw-r--r--user/perl-moox-types-mooselike/APKBUILD2
-rw-r--r--user/perl-moox/APKBUILD2
-rw-r--r--user/perl-mouse/APKBUILD3
-rw-r--r--user/perl-multidimensional/APKBUILD4
-rw-r--r--user/perl-namespace-autoclean/APKBUILD4
-rw-r--r--user/perl-namespace-clean/APKBUILD2
-rw-r--r--user/perl-net-dbus/APKBUILD6
-rw-r--r--user/perl-net-snmp/APKBUILD5
-rw-r--r--user/perl-number-compare/APKBUILD2
-rw-r--r--user/perl-number-range/APKBUILD4
-rw-r--r--user/perl-package-deprecationmanager/APKBUILD4
-rw-r--r--user/perl-package-stash-xs/APKBUILD4
-rw-r--r--user/perl-package-stash/APKBUILD2
-rw-r--r--user/perl-parallel-forkmanager/APKBUILD4
-rw-r--r--user/perl-params-util/APKBUILD1
-rw-r--r--user/perl-params-validate/APKBUILD4
-rw-r--r--user/perl-params-validationcompiler/APKBUILD2
-rw-r--r--user/perl-parse-recdescent/APKBUILD2
-rw-r--r--user/perl-patchreader/APKBUILD2
-rw-r--r--user/perl-path-iterator-rule/APKBUILD6
-rw-r--r--user/perl-path-tiny/APKBUILD2
-rw-r--r--user/perl-pegex/APKBUILD2
-rw-r--r--user/perl-perl-tidy/APKBUILD2
-rw-r--r--user/perl-perlio-utf8_strict/APKBUILD2
-rw-r--r--user/perl-plack/APKBUILD4
-rw-r--r--user/perl-pod-constants/APKBUILD4
-rw-r--r--user/perl-pod-coverage/APKBUILD4
-rw-r--r--user/perl-posix-strftime-compiler/APKBUILD2
-rw-r--r--user/perl-probe-perl/APKBUILD4
-rw-r--r--user/perl-regexp-common/APKBUILD4
-rw-r--r--user/perl-regexp-pattern-license/APKBUILD6
-rw-r--r--user/perl-regexp-pattern/APKBUILD6
-rw-r--r--user/perl-role-tiny/APKBUILD2
-rw-r--r--user/perl-router-simple/APKBUILD4
-rw-r--r--user/perl-scope-guard/APKBUILD3
-rw-r--r--user/perl-soap-lite/APKBUILD4
-rw-r--r--user/perl-software-license/APKBUILD6
-rw-r--r--user/perl-sort-key/APKBUILD2
-rw-r--r--user/perl-specio-library-path-tiny/APKBUILD4
-rw-r--r--user/perl-specio/APKBUILD6
-rw-r--r--user/perl-stream-buffered/APKBUILD2
-rw-r--r--user/perl-strictures/APKBUILD6
-rw-r--r--user/perl-string-copyright/APKBUILD6
-rw-r--r--user/perl-string-escape/APKBUILD4
-rw-r--r--user/perl-string-shellquote/APKBUILD2
-rw-r--r--user/perl-sub-exporter-progressive/APKBUILD4
-rw-r--r--user/perl-sub-exporter/APKBUILD4
-rw-r--r--user/perl-sub-info/APKBUILD6
-rw-r--r--user/perl-sub-install/APKBUILD1
-rw-r--r--user/perl-sub-quote/APKBUILD2
-rw-r--r--user/perl-task-freecellsolver-testing/APKBUILD2
-rw-r--r--user/perl-task-test-run-allplugins/APKBUILD2
-rw-r--r--user/perl-task-weaken/APKBUILD4
-rw-r--r--user/perl-template-gd/APKBUILD4
-rw-r--r--user/perl-template-toolkit/APKBUILD2
-rw-r--r--user/perl-term-size-any/APKBUILD6
-rw-r--r--user/perl-term-size-perl/APKBUILD4
-rw-r--r--user/perl-term-table/APKBUILD10
-rw-r--r--user/perl-test-class-most/APKBUILD4
-rw-r--r--user/perl-test-class/APKBUILD4
-rw-r--r--user/perl-test-cleannamespaces/APKBUILD4
-rw-r--r--user/perl-test-command/APKBUILD4
-rw-r--r--user/perl-test-data-split/APKBUILD4
-rw-r--r--user/perl-test-deep/APKBUILD2
-rw-r--r--user/perl-test-differences/APKBUILD4
-rw-r--r--user/perl-test-failwarnings/APKBUILD6
-rw-r--r--user/perl-test-file-sharedir/APKBUILD4
-rw-r--r--user/perl-test-file/APKBUILD2
-rw-r--r--user/perl-test-filename/APKBUILD6
-rw-r--r--user/perl-test-manifest/APKBUILD4
-rw-r--r--user/perl-test-mockrandom/APKBUILD2
-rw-r--r--user/perl-test-mocktime/APKBUILD2
-rw-r--r--user/perl-test-more-utf8/APKBUILD4
-rw-r--r--user/perl-test-most/APKBUILD5
-rw-r--r--user/perl-test-output/APKBUILD6
-rw-r--r--user/perl-test-perltidy/APKBUILD4
-rw-r--r--user/perl-test-pod-coverage/APKBUILD2
-rw-r--r--user/perl-test-run-cmdline/APKBUILD6
-rw-r--r--user/perl-test-run-plugin-ai/APKBUILD4
-rw-r--r--user/perl-test-run-plugin-bof/APKBUILD4
-rw-r--r--user/perl-test-run-plugin-cfv/APKBUILD4
-rw-r--r--user/perl-test-run-plugin-cs/APKBUILD4
-rw-r--r--user/perl-test-run-plugin-tdf/APKBUILD4
-rw-r--r--user/perl-test-run/APKBUILD4
-rw-r--r--user/perl-test-runvalgrind/APKBUILD4
-rw-r--r--user/perl-test-script/APKBUILD6
-rw-r--r--user/perl-test-sharedfork/APKBUILD2
-rw-r--r--user/perl-test-tcp/APKBUILD4
-rw-r--r--user/perl-test-time/APKBUILD2
-rw-r--r--user/perl-test-trailingspace/APKBUILD4
-rw-r--r--user/perl-test-trap/APKBUILD4
-rw-r--r--user/perl-test-utf8/APKBUILD2
-rw-r--r--user/perl-test-warnings/APKBUILD6
-rw-r--r--user/perl-test2-suite/APKBUILD6
-rw-r--r--user/perl-text-diff/APKBUILD4
-rw-r--r--user/perl-text-glob/APKBUILD2
-rw-r--r--user/perl-text-sprintf-named/APKBUILD4
-rw-r--r--user/perl-text-template/APKBUILD6
-rw-r--r--user/perl-throwable/APKBUILD5
-rw-r--r--user/perl-time-duration-parse/APKBUILD4
-rw-r--r--user/perl-time-duration/APKBUILD2
-rw-r--r--user/perl-timedate/APKBUILD9
-rw-r--r--user/perl-timedate/y2020.patch11
-rw-r--r--user/perl-type-tiny/APKBUILD8
-rw-r--r--user/perl-types-serialiser/APKBUILD4
-rw-r--r--user/perl-universal-require/APKBUILD2
-rw-r--r--user/perl-www-form-urlencoded/APKBUILD2
-rw-r--r--user/perl-x11-xcb/APKBUILD6
-rw-r--r--user/perl-xml-descent/APKBUILD4
-rw-r--r--user/perl-xml-namespacesupport/APKBUILD2
-rw-r--r--user/perl-xml-parser-lite/APKBUILD2
-rw-r--r--user/perl-xml-sax-base/APKBUILD2
-rw-r--r--user/perl-xml-sax/APKBUILD6
-rw-r--r--user/perl-xml-simple/APKBUILD2
-rw-r--r--user/perl-xml-tokeparser/APKBUILD4
-rw-r--r--user/perl-xml-twig/APKBUILD4
-rw-r--r--user/perl-xmlrpc-lite/APKBUILD5
-rw-r--r--user/perl-xs-object-magic/APKBUILD4
-rw-r--r--user/phonon-vlc/APKBUILD2
-rw-r--r--user/physfs/APKBUILD5
-rw-r--r--user/physlock/APKBUILD3
-rw-r--r--user/picocom/APKBUILD2
-rw-r--r--user/pidgin-otr/APKBUILD3
-rw-r--r--user/pidgin/APKBUILD7
-rw-r--r--user/pigz/APKBUILD4
-rw-r--r--user/plasma-desktop/APKBUILD21
-rw-r--r--user/plasma-desktop/cmake-fixes.patch174
-rw-r--r--user/plasma-framework/APKBUILD4
-rw-r--r--user/plasma-integration/APKBUILD8
-rw-r--r--user/plasma-workspace-wallpapers/APKBUILD8
-rw-r--r--user/plasma-workspace/APKBUILD18
-rw-r--r--user/plasma-workspace/cmake-fixes.patch89
-rw-r--r--user/plasma-workspace/libkworkspace.patch35
-rw-r--r--user/plib/APKBUILD5
-rw-r--r--user/pluma/APKBUILD7
-rw-r--r--user/pm-quirks/APKBUILD7
-rw-r--r--user/pm-utils/APKBUILD2
-rw-r--r--user/ponysay/APKBUILD2
-rw-r--r--user/postfix/APKBUILD13
-rw-r--r--user/powerdevil/APKBUILD10
-rw-r--r--user/prison/APKBUILD4
-rw-r--r--user/prosody/APKBUILD7
-rw-r--r--user/prosody/prosody.initd2
-rw-r--r--user/protobuf/APKBUILD11
-rw-r--r--user/purple-plugin-pack/APKBUILD3
-rw-r--r--user/py3-alabaster/APKBUILD5
-rw-r--r--user/py3-configargparse/APKBUILD11
-rw-r--r--user/py3-configargparse/python3.patch11
-rw-r--r--user/py3-configobj/APKBUILD5
-rw-r--r--user/py3-distutils-extra/APKBUILD14
-rw-r--r--user/py3-docutils/APKBUILD13
-rw-r--r--user/py3-future/APKBUILD6
-rw-r--r--user/py3-html5lib/APKBUILD14
-rw-r--r--user/py3-html5lib/pytest.patch163
-rw-r--r--user/py3-incremental/APKBUILD3
-rw-r--r--user/py3-josepy/APKBUILD1
-rw-r--r--user/py3-lxml/APKBUILD4
-rw-r--r--user/py3-markdown/APKBUILD2
-rw-r--r--user/py3-markupsafe/APKBUILD7
-rw-r--r--user/py3-mock/APKBUILD2
-rw-r--r--user/py3-olefile/APKBUILD4
-rw-r--r--user/py3-paho-mqtt/APKBUILD8
-rw-r--r--user/py3-paho-mqtt/setup.patch5
-rw-r--r--user/py3-parsedatetime/APKBUILD7
-rw-r--r--user/py3-passlib/APKBUILD4
-rw-r--r--user/py3-pexpect/APKBUILD7
-rw-r--r--user/py3-pillow/APKBUILD7
-rw-r--r--user/py3-ply/APKBUILD3
-rw-r--r--user/py3-psutil/APKBUILD4
-rw-r--r--user/py3-ptyprocess/APKBUILD9
-rw-r--r--user/py3-pycairo/APKBUILD10
-rw-r--r--user/py3-pycotap/APKBUILD3
-rw-r--r--user/py3-pygobject/APKBUILD7
-rw-r--r--user/py3-pytest-expect/APKBUILD4
-rw-r--r--user/py3-random2/APKBUILD4
-rw-r--r--user/py3-requests-toolbelt/APKBUILD4
-rw-r--r--user/py3-rfc3339/APKBUILD2
-rw-r--r--user/py3-six/APKBUILD5
-rw-r--r--user/py3-twisted/APKBUILD2
-rw-r--r--user/py3-u-msgpack-python/APKBUILD3
-rw-r--r--user/py3-webencodings/APKBUILD6
-rw-r--r--user/py3-zope-component/APKBUILD4
-rw-r--r--user/py3-zope-deferredimport/APKBUILD2
-rw-r--r--user/py3-zope-deprecation/APKBUILD4
-rw-r--r--user/py3-zope-event/APKBUILD6
-rw-r--r--user/py3-zope-interface/APKBUILD3
-rw-r--r--user/py3-zope-proxy/APKBUILD2
-rw-r--r--user/qastools/APKBUILD5
-rw-r--r--user/qca/APKBUILD4
-rw-r--r--user/qemu/APKBUILD2
-rw-r--r--user/qemu/time64.patch20
-rw-r--r--user/qml-box2d/APKBUILD2
-rw-r--r--user/qpdf/APKBUILD2
-rw-r--r--user/qpdfview/APKBUILD2
-rw-r--r--user/qps/APKBUILD19
-rw-r--r--user/qt-creator/APKBUILD8
-rw-r--r--user/qt5-qtvirtualkeyboard/APKBUILD27
-rw-r--r--user/qt5-qtwebchannel/APKBUILD2
-rw-r--r--user/qt5-qtwebkit/0001-Add-ARM-64-support.patch13
-rw-r--r--user/qt5-qtwebkit/APKBUILD124
-rw-r--r--user/qt5-qtwebkit/bug-931.patch10
-rw-r--r--user/qt5-qtwebkit/cmake.patch60
-rw-r--r--user/qt5-qtwebkit/fix-execinfo.patch20
-rw-r--r--user/qt5-qtwebkit/fix-rpath.patch11
-rw-r--r--user/qt5-qtwebkit/pic.patch11
-rw-r--r--user/qt5-qtwebkit/ppc-llint.patch32
-rw-r--r--user/qt5ct/APKBUILD6
-rw-r--r--user/qterminal/APKBUILD16
-rw-r--r--user/qtermwidget/APKBUILD16
-rw-r--r--user/qtkeychain/APKBUILD19
-rw-r--r--user/quassel/APKBUILD9
-rw-r--r--user/quaternion/APKBUILD2
-rw-r--r--user/quazip/APKBUILD2
-rw-r--r--user/r/APKBUILD4
-rw-r--r--user/ragel/APKBUILD9
-rw-r--r--user/range-v3/APKBUILD37
-rw-r--r--user/raptor2/APKBUILD5
-rw-r--r--user/rasqal/APKBUILD3
-rw-r--r--user/rdesktop/APKBUILD18
-rw-r--r--user/rdesktop/gssapi.patch47
-rw-r--r--user/rdesktop/signed-int.patch11
-rw-r--r--user/redis/APKBUILD6
-rw-r--r--user/redland/APKBUILD3
-rw-r--r--user/redshift/APKBUILD8
-rw-r--r--user/rendercheck/APKBUILD3
-rw-r--r--user/rfkill/APKBUILD6
-rw-r--r--user/rgb/APKBUILD3
-rw-r--r--user/rinutils/APKBUILD41
-rw-r--r--user/ripgrep/APKBUILD1
-rw-r--r--user/ristretto/APKBUILD5
-rw-r--r--user/rlottie/APKBUILD36
-rw-r--r--user/rocs/APKBUILD14
-rw-r--r--user/rocs/webkit.patch11
-rw-r--r--user/rpcbind/APKBUILD8
-rw-r--r--user/rpcsvc-proto/APKBUILD3
-rw-r--r--user/rpm2targz/APKBUILD3
-rw-r--r--user/rrdtool/APKBUILD11
-rw-r--r--user/rsibreak/APKBUILD2
-rw-r--r--user/rtmpdump/APKBUILD7
-rw-r--r--user/rtmpdump/openssl11.patch251
-rw-r--r--user/rttr/APKBUILD4
-rw-r--r--user/rubberband/APKBUILD12
-rw-r--r--user/ruby-bundler/APKBUILD9
-rw-r--r--user/ruby-diff-lcs/APKBUILD2
-rw-r--r--user/ruby-rake-compiler/APKBUILD11
-rw-r--r--user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch10
-rw-r--r--user/ruby-rspec-core/APKBUILD8
-rw-r--r--user/ruby-rspec-expectations/APKBUILD10
-rw-r--r--user/ruby-rspec-mocks/APKBUILD10
-rw-r--r--user/ruby-rspec-support/APKBUILD10
-rw-r--r--user/ruby-rspec/APKBUILD7
-rw-r--r--user/rxvt-unicode/APKBUILD15
-rw-r--r--user/s6-dns/APKBUILD41
-rw-r--r--user/s6-linux-utils/APKBUILD15
-rw-r--r--user/s6-networking/APKBUILD63
-rw-r--r--user/s6-portable-utils/APKBUILD14
-rw-r--r--user/sassc/APKBUILD5
-rw-r--r--user/schismtracker/APKBUILD2
-rw-r--r--user/scons/APKBUILD4
-rw-r--r--user/screen/APKBUILD10
-rw-r--r--user/screengrab/APKBUILD17
-rw-r--r--user/scummvm/APKBUILD9
-rw-r--r--user/scummvm/fluidsynth.patch37
-rw-r--r--user/sddm-kcm/APKBUILD11
-rw-r--r--user/sddm-kcm/qt59.patch28
-rw-r--r--user/sddm/APKBUILD6
-rw-r--r--user/sdl2/APKBUILD11
-rw-r--r--user/sdl2/gles.patch12
-rw-r--r--user/sdl2/sdl2-soname.patch13
-rw-r--r--user/sdl2_image/APKBUILD6
-rw-r--r--user/sdl_image/APKBUILD5
-rw-r--r--user/sdl_mixer/APKBUILD10
-rw-r--r--user/sdl_net/APKBUILD4
-rw-r--r--user/sdl_ttf/APKBUILD4
-rw-r--r--user/serf/APKBUILD4
-rw-r--r--user/sg3_utils/APKBUILD3
-rw-r--r--user/showfont/APKBUILD3
-rw-r--r--user/shunit2/APKBUILD11
-rw-r--r--user/skanlite/APKBUILD5
-rw-r--r--user/slang/APKBUILD7
-rw-r--r--user/smartmontools/APKBUILD9
-rw-r--r--user/smproxy/APKBUILD3
-rw-r--r--user/snappy/APKBUILD10
-rw-r--r--user/socat/APKBUILD9
-rw-r--r--user/solid/APKBUILD4
-rw-r--r--user/sonnet/APKBUILD4
-rw-r--r--user/sound-theme-freedesktop/APKBUILD3
-rw-r--r--user/sox/APKBUILD3
-rw-r--r--user/spectacle/APKBUILD12
-rw-r--r--user/spectacle/qt5.9.patch23
-rw-r--r--user/spectrwm/APKBUILD17
-rw-r--r--user/spice/APKBUILD3
-rw-r--r--user/spleen/APKBUILD3
-rw-r--r--user/sprunge/APKBUILD5
-rw-r--r--user/sshfs/APKBUILD6
-rw-r--r--user/startup-notification/APKBUILD5
-rw-r--r--user/step/APKBUILD11
-rw-r--r--user/stow/APKBUILD2
-rw-r--r--user/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch104
-rw-r--r--user/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch597
-rw-r--r--user/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch131
-rw-r--r--user/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch159
-rw-r--r--user/strongswan/APKBUILD22
-rw-r--r--user/subversion/APKBUILD2
-rw-r--r--user/sword/APKBUILD3
-rw-r--r--user/symboleditor/APKBUILD2
-rw-r--r--user/syntax-highlighting/APKBUILD4
-rw-r--r--user/sysfsutils/APKBUILD5
-rw-r--r--user/systemsettings/APKBUILD11
-rw-r--r--user/talloc/APKBUILD6
-rw-r--r--user/tcsh/APKBUILD12
-rw-r--r--user/telegram/APKBUILD63
-rw-r--r--user/telegram/endian.patch25
-rw-r--r--user/telegram/headers.patch12
-rw-r--r--user/telegram/ppc.patch28
-rw-r--r--user/telegram/rlottie.patch16
-rw-r--r--user/tellico/APKBUILD6
-rw-r--r--user/tf/APKBUILD8
-rw-r--r--user/the_silver_searcher/APKBUILD5
-rw-r--r--user/threadweaver/APKBUILD4
-rw-r--r--user/thunar-volman/APKBUILD5
-rw-r--r--user/thunar/APKBUILD5
-rw-r--r--user/thunderbird/APKBUILD27
-rw-r--r--user/thunderbird/yuv-be.patch48
-rw-r--r--user/tigervnc/APKBUILD20
-rw-r--r--user/tigervnc/endian.patch51
-rw-r--r--user/tigervnc/ensure-throw.patch59
-rw-r--r--user/tigervnc/initialise-var.patch24
-rw-r--r--user/tigervnc/null-termination.patch39
-rw-r--r--user/tint2/APKBUILD12
-rw-r--r--user/tinyxml2/APKBUILD4
-rw-r--r--user/tk/APKBUILD7
-rw-r--r--user/tlp/APKBUILD3
-rw-r--r--user/tmux-bash-completion/APKBUILD7
-rw-r--r--user/tmux/APKBUILD15
-rw-r--r--user/tmux/xterm-DECLRMM.patch23
-rw-r--r--user/torcs/APKBUILD7
-rw-r--r--user/traceroute/APKBUILD7
-rw-r--r--user/transmission/APKBUILD6
-rw-r--r--user/transset/APKBUILD3
-rw-r--r--user/trigger-rally/APKBUILD10
-rw-r--r--user/trigger-rally/sdl2-compat.patch11
-rw-r--r--user/trojita/APKBUILD21
-rw-r--r--user/ttc-iosevka/APKBUILD3
-rw-r--r--user/ttf-alee/APKBUILD3
-rw-r--r--user/ttf-freefont/APKBUILD5
-rw-r--r--user/ttf-hack/APKBUILD4
-rw-r--r--user/ttf-sinhala-lklug/APKBUILD4
-rw-r--r--user/ttf-sudo/APKBUILD7
-rw-r--r--user/ttf-terminus/APKBUILD7
-rw-r--r--user/tumbler/APKBUILD10
-rw-r--r--user/twm/APKBUILD2
-rw-r--r--user/uchardet/APKBUILD13
-rw-r--r--user/ucpp/APKBUILD2
-rw-r--r--user/ufw/APKBUILD42
-rw-r--r--user/ufw/ufw-0.36-bash-completion.patch16
-rw-r--r--user/ufw/ufw-0.36-move-path.patch174
-rw-r--r--user/ufw/ufw.confd5
-rw-r--r--user/ufw/ufw.initd136
-rw-r--r--user/umbrello/APKBUILD11
-rw-r--r--user/umbrello/assertion-fix.patch41
-rw-r--r--user/unicode-data/APKBUILD27
-rw-r--r--user/unittest-cpp/APKBUILD4
-rw-r--r--user/uptimed/APKBUILD14
-rw-r--r--user/urw-base35-fonts/APKBUILD3
-rw-r--r--user/usbredir/APKBUILD4
-rw-r--r--user/usbutils/APKBUILD4
-rw-r--r--user/user-manager/APKBUILD8
-rw-r--r--user/utf8proc/APKBUILD2
-rw-r--r--user/v4l-utils/APKBUILD2
-rw-r--r--user/v4l-utils/time64.patch11
-rw-r--r--user/vala/APKBUILD5
-rw-r--r--user/valgrind/APKBUILD9
-rw-r--r--user/vamp-sdk/APKBUILD11
-rw-r--r--user/vde2/APKBUILD4
-rw-r--r--user/vde2/openssl11.patch92
-rw-r--r--user/vte/APKBUILD8
-rw-r--r--user/w3m/APKBUILD2
-rw-r--r--user/weechat/APKBUILD28
-rw-r--r--user/weechat/libintl-fix.patch12
-rw-r--r--user/wine/APKBUILD23
-rw-r--r--user/wine/dlclose.patch66
-rw-r--r--user/wine/printer.patch13
-rw-r--r--user/wireguard-module/APKBUILD20
-rw-r--r--user/wireguard-tools/APKBUILD7
-rw-r--r--user/wireless-tools/APKBUILD3
-rw-r--r--user/wpa_supplicant/APKBUILD4
-rw-r--r--user/wv/APKBUILD4
-rw-r--r--user/wxwidgets/APKBUILD3
-rw-r--r--user/x11vnc/APKBUILD9
-rw-r--r--user/x11vnc/time64.patch78
-rw-r--r--user/x264/APKBUILD23
-rw-r--r--user/xabacus/APKBUILD14
-rw-r--r--user/xapian-core/APKBUILD13
-rw-r--r--user/xautolock/APKBUILD20
-rw-r--r--user/xbitmaps/APKBUILD4
-rw-r--r--user/xcape/APKBUILD2
-rw-r--r--user/xcb-util-cursor/APKBUILD6
-rw-r--r--user/xcb-util-xrm/APKBUILD6
-rw-r--r--user/xclip/APKBUILD5
-rw-r--r--user/xclipboard/APKBUILD3
-rw-r--r--user/xcmsdb/APKBUILD3
-rw-r--r--user/xconsole/APKBUILD3
-rw-r--r--user/xdbedizzy/APKBUILD4
-rw-r--r--user/xdg-user-dirs/APKBUILD6
-rw-r--r--user/xdotool/APKBUILD5
-rw-r--r--user/xdpyinfo/APKBUILD7
-rw-r--r--user/xdriinfo/APKBUILD3
-rw-r--r--user/xedit/APKBUILD3
-rw-r--r--user/xeyes/APKBUILD3
-rw-r--r--user/xf86-input-evdev/APKBUILD5
-rw-r--r--user/xf86-input-joystick/APKBUILD3
-rw-r--r--user/xf86-input-keyboard/APKBUILD3
-rw-r--r--user/xf86-input-mouse/APKBUILD3
-rw-r--r--user/xf86-input-synaptics/APKBUILD10
-rw-r--r--user/xf86-input-synaptics/input-event.patch27
-rw-r--r--user/xf86-input-void/APKBUILD3
-rw-r--r--user/xf86-input-wacom/APKBUILD4
-rw-r--r--user/xf86-video-ast/APKBUILD3
-rw-r--r--user/xf86-video-ati/APKBUILD3
-rw-r--r--user/xf86-video-cirrus/APKBUILD3
-rw-r--r--user/xf86-video-dummy/APKBUILD3
-rw-r--r--user/xf86-video-fbdev/APKBUILD5
-rw-r--r--user/xf86-video-freedreno/APKBUILD5
-rw-r--r--user/xf86-video-geode/APKBUILD3
-rw-r--r--user/xf86-video-intel/APKBUILD5
-rw-r--r--user/xf86-video-mach64/APKBUILD3
-rw-r--r--user/xf86-video-mga/APKBUILD3
-rw-r--r--user/xf86-video-openchrome/APKBUILD4
-rw-r--r--user/xf86-video-qxl/APKBUILD3
-rw-r--r--user/xf86-video-r128/APKBUILD3
-rw-r--r--user/xf86-video-sis/APKBUILD4
-rw-r--r--user/xfburn/APKBUILD9
-rw-r--r--user/xfce-desktop/APKBUILD14
-rw-r--r--user/xfce-plugins/APKBUILD9
-rw-r--r--user/xfce4-appfinder/APKBUILD5
-rw-r--r--user/xfce4-battery-plugin/APKBUILD5
-rw-r--r--user/xfce4-clipman-plugin/APKBUILD5
-rw-r--r--user/xfce4-cpugraph-plugin/APKBUILD5
-rw-r--r--user/xfce4-dict/APKBUILD8
-rw-r--r--user/xfce4-diskperf-plugin/APKBUILD5
-rw-r--r--user/xfce4-indicator-plugin/APKBUILD5
-rw-r--r--user/xfce4-netload-plugin/APKBUILD5
-rw-r--r--user/xfce4-notifyd/APKBUILD5
-rw-r--r--user/xfce4-panel-profiles/APKBUILD4
-rw-r--r--user/xfce4-panel/APKBUILD5
-rw-r--r--user/xfce4-power-manager/APKBUILD5
-rw-r--r--user/xfce4-pulseaudio-plugin/APKBUILD5
-rw-r--r--user/xfce4-screenshooter/APKBUILD10
-rw-r--r--user/xfce4-sensors-plugin/APKBUILD5
-rw-r--r--user/xfce4-session/APKBUILD4
-rw-r--r--user/xfce4-settings/APKBUILD5
-rw-r--r--user/xfce4-systemload-plugin/APKBUILD5
-rw-r--r--user/xfce4-taskmanager/APKBUILD12
-rw-r--r--user/xfce4-terminal/APKBUILD7
-rw-r--r--user/xfce4-time-out-plugin/APKBUILD5
-rw-r--r--user/xfce4-timer-plugin/APKBUILD5
-rw-r--r--user/xfce4-verve-plugin/APKBUILD5
-rw-r--r--user/xfce4-volumed-pulse/APKBUILD8
-rw-r--r--user/xfce4-whiskermenu-plugin/APKBUILD11
-rw-r--r--user/xfconf/APKBUILD6
-rw-r--r--user/xfdashboard/APKBUILD5
-rw-r--r--user/xfdesktop/APKBUILD5
-rw-r--r--user/xfindproxy/APKBUILD3
-rw-r--r--user/xfmpc/APKBUILD5
-rw-r--r--user/xfontsel/APKBUILD3
-rw-r--r--user/xfs/APKBUILD3
-rw-r--r--user/xfwm4/APKBUILD5
-rw-r--r--user/xfwp/APKBUILD3
-rw-r--r--user/xgamma/APKBUILD3
-rw-r--r--user/xgc/APKBUILD3
-rw-r--r--user/xinput/APKBUILD1
-rw-r--r--user/xkbevd/APKBUILD3
-rw-r--r--user/xkbprint/APKBUILD3
-rw-r--r--user/xkbutils/APKBUILD4
-rw-r--r--user/xkill/APKBUILD3
-rw-r--r--user/xload/APKBUILD3
-rw-r--r--user/xlsclients/APKBUILD3
-rw-r--r--user/xlsfonts/APKBUILD3
-rw-r--r--user/xmag/APKBUILD3
-rw-r--r--user/xmessage/APKBUILD4
-rw-r--r--user/xmh/APKBUILD3
-rw-r--r--user/xmlsec/APKBUILD12
-rw-r--r--user/xmlsec/fix-tests.patch176
-rw-r--r--user/xmodmap/APKBUILD2
-rw-r--r--user/xmoto/APKBUILD7
-rw-r--r--user/xorg-apps/APKBUILD19
-rw-r--r--user/xorg-cf-files/APKBUILD17
-rw-r--r--user/xorg-drivers/APKBUILD12
-rw-r--r--user/xorg-gtest/APKBUILD13
-rw-r--r--user/xorriso/APKBUILD7
-rw-r--r--user/xpr/APKBUILD3
-rw-r--r--user/xprop/APKBUILD5
-rw-r--r--user/xrandr/APKBUILD2
-rw-r--r--user/xrefresh/APKBUILD3
-rw-r--r--user/xrx/APKBUILD4
-rw-r--r--user/xscope/APKBUILD3
-rw-r--r--user/xscreensaver/APKBUILD8
-rw-r--r--user/xset/APKBUILD5
-rw-r--r--user/xsetmode/APKBUILD4
-rw-r--r--user/xsetpointer/APKBUILD4
-rw-r--r--user/xsetroot/APKBUILD5
-rw-r--r--user/xsm/APKBUILD3
-rw-r--r--user/xsv/APKBUILD1
-rw-r--r--user/xterm/APKBUILD13
-rw-r--r--user/xterm/posix-ptmx.patch4
-rw-r--r--user/xvidtune/APKBUILD4
-rw-r--r--user/xwd/APKBUILD3
-rw-r--r--user/xwud/APKBUILD3
-rw-r--r--user/xxhash/APKBUILD34
-rw-r--r--user/yajl/APKBUILD20
-rw-r--r--user/yakuake/APKBUILD8
-rw-r--r--user/youtube-dl/APKBUILD5
-rw-r--r--user/yubico-c/APKBUILD14
-rw-r--r--user/yubikey-personalization/APKBUILD7
-rw-r--r--user/zenity/APKBUILD7
-rw-r--r--user/zola/APKBUILD1
1580 files changed, 12345 insertions, 12304 deletions
diff --git a/experimental/qt5-qtwebkit/APKBUILD b/experimental/qt5-qtwebkit/APKBUILD
deleted file mode 100644
index c7e0834e5..000000000
--- a/experimental/qt5-qtwebkit/APKBUILD
+++ /dev/null
@@ -1,94 +0,0 @@
-# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=qt5-qtwebkit
-_realname=qtwebkit
-pkgver=5.212.0_alpha2
-_realver=$(printf '%s' "$pkgver" | sed 's/_/-/')
-pkgrel=0
-pkgdesc="Open source Web browser engine"
-url="https://github.com/annulen/webkit"
-arch="all"
-license="LGPL-2.1+ AND BSD-3-Clause AND Others"
-depends="gst-plugins-base"
-depends_dev="qt5-qtbase-dev"
-makedepends="$depends_dev ninja sqlite-dev icu-dev ruby perl bison flex gperf
- libxml2-dev libxslt-dev libjpeg-turbo-dev libpng-dev zlib-dev glib-dev
- gstreamer-dev fontconfig-dev qt5-qtsensors-dev qt5-qtpositioning-dev
- qt5-qtdeclarative-dev qt5-qtwebchannel-dev libxcomposite-dev
- libxrender-dev gst-plugins-base-dev hyphen-dev libexecinfo-dev"
-subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/annulen/webkit/releases/download/$_realname-$_realver/$_realname-$_realver.tar.xz
- jsc-port-to-musl.patch
- musl-thread-stacksize.patch
- "
-builddir="$srcdir"/$_realname-$_realver
-
-unpack() {
- default_unpack
- # just ripped from Firefox's APKBUILD...
- [ -z $SKIP_PYTHON ] || return 0
- msg "Killing all remaining hope for humanity and building Python 2..."
- cd "$srcdir"
- [ -d python ] && rm -r python
- mkdir python
- cd python
- # 19:39 <+solar> just make the firefox build process build its own py2 copy
- curl -O https://www.python.org/ftp/python/2.7.15/Python-2.7.15.tar.xz
- tar xJf Python-2.7.15.tar.xz
- cd Python-2.7.15
- # 20:03 <calvin> TheWilfox: there's always violence
- ./configure --prefix="$srcdir/python"
- make -j $JOBS
- # 6 tests failed:
- # test__locale test_os test_posix test_re test_strptime test_time
- # make test
- make -j $JOBS install
-}
-
-build() {
- cd "$builddir"
- if [ "$CBUILD" != "$CHOST" ]; then
- CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
- fi
- export PATH="$srcdir/python/bin:$PATH"
- # We can enable the JIT when it is stable on all Tier 1 platforms:
- # pmmx (ensure no SSE)
- # ppc
- # ppc64
- #
- # DONE:
- # aarch64
- # armv7
- # x86_64
- cmake \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DBUILD_SHARED_LIBS=True \
- -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
- -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS" \
- -DENABLE_JIT=OFF \
- -DPORT=Qt \
- -DUSE_SYSTEM_MALLOC=ON \
- ${CMAKE_CROSSOPTS}
- # too memory hungry
- if [ -z "$JOBS" ] || [ $JOBS -gt 32 ]; then
- make -j32
- else
- make
- fi
-}
-
-check() {
- cd "$builddir"
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
-}
-
-package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
-}
-
-sha512sums="b15985aab20c5618dc1f71a0d91f02dbed993516272090a4a12990714bf4c9554ccbdcf9d6a143bf46fcc2c170f691e571114d61686fe49791f8d5c540785758 qtwebkit-5.212.0-alpha2.tar.xz
-19efd97c5f628108d30cc0e5e53f689725cc480ffe1ea90577e5f961d7f35a6a434dda5a03c73c0fb74a30c46ced32bcf580340a2eaf4e72960e61c28ed34dba jsc-port-to-musl.patch
-a8df6d20346882e49745dbdf9bdf2eddf2f3e1ac3301e9fd826397fa746d1d9228deaf2eab0316fa977a85032d6c091559cd5404b7a576e3adc0bec64a5a4ad9 musl-thread-stacksize.patch"
diff --git a/experimental/qt5-qtwebkit/jsc-port-to-musl.patch b/experimental/qt5-qtwebkit/jsc-port-to-musl.patch
deleted file mode 100644
index 0b2d7dfce..000000000
--- a/experimental/qt5-qtwebkit/jsc-port-to-musl.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur qtwebkit-5.212.0-alpha2-original/Source/JavaScriptCore/heap/MachineStackMarker.cpp qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/heap/MachineStackMarker.cpp
---- qtwebkit-5.212.0-alpha2-original/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2017-06-04 20:16:05.000000000 +0000
-+++ qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2018-09-26 02:13:44.660000000 +0000
-@@ -566,7 +566,7 @@
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__) && ENABLE(JIT)
-+#elif defined(__linux__) && ENABLE(JIT)
-
- #if CPU(X86)
- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
-@@ -665,7 +665,7 @@
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__)
-+#elif defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -747,7 +747,7 @@
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__)
-+#elif defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-@@ -838,7 +838,7 @@
- #error Unknown Architecture
- #endif
-
--#elif defined(__GLIBC__)
-+#elif defined(__linux__)
-
- // The following sequence depends on glibc's sys/ucontext.h.
- #if CPU(X86)
-diff -Naur qtwebkit-5.212.0-alpha2-original/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp qtwebkit-5.212.0-alpha2/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp
---- qtwebkit-5.212.0-alpha2-original/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp 2017-06-04 20:16:06.000000000 +0000
-+++ qtwebkit-5.212.0-alpha2/Source/ThirdParty/ANGLE/src/compiler/preprocessor/ExpressionParser.cpp 2018-09-26 02:12:36.770000000 +0000
-@@ -828,7 +828,7 @@
- #if YYERROR_VERBOSE
-
- # ifndef yystrlen
--# if defined __GLIBC__ && defined _STRING_H
-+# if defined __linux__ && defined _STRING_H
- # define yystrlen strlen
- # else
- /* Return the length of YYSTR. */
-@@ -844,7 +844,7 @@
- # endif
-
- # ifndef yystpcpy
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
- # define yystpcpy stpcpy
- # else
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-diff -Naur qtwebkit-5.212.0-alpha2-original/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp qtwebkit-5.212.0-alpha2/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp
---- qtwebkit-5.212.0-alpha2-original/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp 2017-06-04 20:16:06.000000000 +0000
-+++ qtwebkit-5.212.0-alpha2/Source/ThirdParty/ANGLE/src/compiler/translator/glslang_tab.cpp 2018-09-26 02:12:54.740000000 +0000
-@@ -1835,7 +1835,7 @@
- #if YYERROR_VERBOSE
-
- # ifndef yystrlen
--# if defined __GLIBC__ && defined _STRING_H
-+# if defined __linux__ && defined _STRING_H
- # define yystrlen strlen
- # else
- /* Return the length of YYSTR. */
-@@ -1851,7 +1851,7 @@
- # endif
-
- # ifndef yystpcpy
--# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-+# if defined __linux__ && defined _STRING_H && defined _GNU_SOURCE
- # define yystpcpy stpcpy
- # else
- /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
diff --git a/experimental/qt5-qtwebkit/musl-thread-stacksize.patch b/experimental/qt5-qtwebkit/musl-thread-stacksize.patch
deleted file mode 100644
index e790222dc..000000000
--- a/experimental/qt5-qtwebkit/musl-thread-stacksize.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- qtwebkit-5.212.0-alpha2/Source/WTF/wtf/ThreadingPthreads.cpp.old 2017-06-04 15:16:06.000000000 -0500
-+++ qtwebkit-5.212.0-alpha2/Source/WTF/wtf/ThreadingPthreads.cpp 2018-09-05 02:29:45.980000000 +0000
-@@ -107,10 +107,11 @@
- void initializeThreading()
- {
- static bool isInitialized;
-+ pthread_attr_t attr;
-
- if (isInitialized)
- return;
-
- isInitialized = true;
-
- WTF::double_conversion::initialize();
-@@ -122,6 +122,11 @@
- ThreadIdentifierData::initializeOnce();
- wtfThreadData();
- initializeDates();
-+
-+ pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 2097152);
-+ pthread_setattr_default_np(&attr);
-+ pthread_attr_destroy(&attr);
- }
-
- static ThreadMap& threadMap()
-@@ -171,6 +171,7 @@
- pthread_t threadHandle;
- pthread_attr_t attr;
- pthread_attr_init(&attr);
-+ pthread_attr_setstacksize(&attr, 2097152);
- #if HAVE(QOS_CLASSES)
- pthread_attr_set_qos_class_np(&attr, QOS_CLASS_USER_INITIATED, 0);
- #endif
---- qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/runtime/Options.h.old 2017-06-04 20:16:05.000000000 +0000
-+++ qtwebkit-5.212.0-alpha2/Source/JavaScriptCore/runtime/Options.h 2018-09-26 03:02:39.700000000 +0000
-@@ -112,9 +112,9 @@
- \
- v(bool, reportMustSucceedExecutableAllocations, false, nullptr) \
- \
-- v(unsigned, maxPerThreadStackUsage, 4 * MB, nullptr) \
-- v(unsigned, reservedZoneSize, 128 * KB, nullptr) \
-- v(unsigned, errorModeReservedZoneSize, 64 * KB, nullptr) \
-+ v(unsigned, maxPerThreadStackUsage, 512 * KB, nullptr) \
-+ v(unsigned, reservedZoneSize, 32 * KB, nullptr) \
-+ v(unsigned, errorModeReservedZoneSize, 16 * KB, nullptr) \
- \
- v(bool, crashIfCantAllocateJITMemory, false, nullptr) \
- v(unsigned, jitMemoryReservationSize, 0, "Set this number to change the executable allocation size in ExecutableAllocatorFixedVMPool. (In bytes.)") \
diff --git a/user/corindon-red/APKBUILD b/legacy/corindon-red/APKBUILD
index e099c5de9..0cd8da56a 100644
--- a/user/corindon-red/APKBUILD
+++ b/legacy/corindon-red/APKBUILD
@@ -11,17 +11,10 @@ options="!check" # No test suite.
depends=""
makedepends=""
source="https://dl.opendesktop.org/api/files/downloadfile/id/1460740699/s/90b6b780028e72203f2a0fba41edf43a/t/1520219138/u//122445-corindon-red.tar.gz"
-builddir="$srcdir/"
-
-build() {
- cd "$builddir"
-}
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/usr/share/aurorae/themes
-
- mv "$builddir"/corindon-red "$pkgdir"/usr/share/aurorae/themes/
+ mv "$srcdir"/corindon-red "$pkgdir"/usr/share/aurorae/themes/
}
sha512sums="9be72e3404eac6c7f0093038b1f873064883ed62ab81486133ef1d9ce50a9ede43d68ed61ebc3280289433abf8a794ca6591c906f51636dec5c1fa197626a630 122445-corindon-red.tar.gz"
diff --git a/user/dmenu/APKBUILD b/legacy/dmenu/APKBUILD
index ec90c9934..36c844132 100644
--- a/user/dmenu/APKBUILD
+++ b/legacy/dmenu/APKBUILD
@@ -7,10 +7,10 @@ pkgrel=0
pkgdesc="Dynamic menu for X"
url="https://tools.suckless.org/dmenu/"
arch="all"
+options="!check" # This package has no testsuite
license="MIT OR X11"
depends=""
makedepends="libx11-dev libxinerama-dev libxft-dev"
-options="!check" # This package has no testsuite
subpackages="$pkgname-doc"
source="https://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz"
diff --git a/user/lbxproxy/APKBUILD b/legacy/lbxproxy/APKBUILD
index f72865a4f..f0da569fc 100644
--- a/user/lbxproxy/APKBUILD
+++ b/legacy/lbxproxy/APKBUILD
@@ -14,14 +14,12 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/lbxproxy-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
chmod a+w config.sub
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +31,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libxfont/APKBUILD b/legacy/libxfont/APKBUILD
index c98112974..c98112974 100644
--- a/user/libxfont/APKBUILD
+++ b/legacy/libxfont/APKBUILD
diff --git a/user/proxymngr/APKBUILD b/legacy/proxymngr/APKBUILD
index 00215b164..4d4d220e6 100644
--- a/user/proxymngr/APKBUILD
+++ b/legacy/proxymngr/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/proxymngr-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/which/APKBUILD b/legacy/which/APKBUILD
index cea55c32a..f8360b7b7 100644
--- a/user/which/APKBUILD
+++ b/legacy/which/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=which
pkgver=2.21
pkgrel=2
@@ -9,11 +9,10 @@ arch="all"
license="GPL-2.0+ AND LGPL-2.0+ AND GPL-3.0+"
makedepends=""
subpackages="$pkgname-doc"
-source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
provider_priority=1
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -22,12 +21,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/system/abuild/APKBUILD b/system/abuild/APKBUILD
index cb6cb9ba9..b2ccb8f8d 100644
--- a/system/abuild/APKBUILD
+++ b/system/abuild/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=abuild
pkgver=3.3.1
-pkgrel=3
+pkgrel=4
pkgdesc="Script to build APK packages"
url="https://code.foxkit.us/adelie/abuild"
arch="all"
@@ -21,6 +21,8 @@ pkggroups="abuild"
source="https://distfiles.adelielinux.org/source/abuild-$pkgver+adelie.tar.xz
keyhole.patch
auto-dev-symbols.patch
+ bang.patch
+ modernise.patch
"
builddir="$srcdir/$pkgname-$pkgver+adelie"
@@ -58,4 +60,6 @@ _rootbld() {
sha512sums="c358f84d198527eeeac1a1aacc101174e18f9f34f692b12a4e4deb6b32d5f3ebdc703c90de6a6f81f195a81eebb90a11f9bfea13ef5db531d9b5d5ae6ecd6a66 abuild-3.3.1+adelie.tar.xz
757d750d4b5c88bf00774b64f2b93a9461e03f284d9423dc58c581e1309f276628de3114fcb510afd7c3cd55ceb721c1278e42756977c97ebe2597207805318d keyhole.patch
-2aa43539fc465f5abdc7c3d994363b80d1f7494c2d659093e5a2c45056e07617506ad8ea98f0e7d4ebe2596802b76605cd7c9f3ffc5a30c488c30bb36248e3d2 auto-dev-symbols.patch"
+2aa43539fc465f5abdc7c3d994363b80d1f7494c2d659093e5a2c45056e07617506ad8ea98f0e7d4ebe2596802b76605cd7c9f3ffc5a30c488c30bb36248e3d2 auto-dev-symbols.patch
+0fccb03673f2f72a7bd2d2afd1c79141eeb73b3119e83fff966fb8a2851c0484912be70a7b384be1dc384c344cf27427e2fc2426c2f9bf56aa5625f32436524d bang.patch
+b5b200da56c4319d332a7c5ddf38879fba0a4af723e1c6492f80a101afc8711d978dd7e1e5c31c80ed7fee15dcb19e7c449c92761b509a8063e417869885edc5 modernise.patch"
diff --git a/system/abuild/bang.patch b/system/abuild/bang.patch
new file mode 100644
index 000000000..7140f4dd8
--- /dev/null
+++ b/system/abuild/bang.patch
@@ -0,0 +1,10 @@
+diff --git a/abuild.in b/abuild.in
+index acee26f..6e06f29 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -1,4 +1,4 @@
+-#!/bin/sh -e
++#!/bin/bash -e
+
+ # abuild - build apk packages (light version of makepkg)
+ # Copyright (c) 2008-2015 Natanael Copa <ncopa@alpinelinux.org>
diff --git a/system/abuild/modernise.patch b/system/abuild/modernise.patch
new file mode 100644
index 000000000..b87b098f9
--- /dev/null
+++ b/system/abuild/modernise.patch
@@ -0,0 +1,164 @@
+From 9221c1d06e9185b734d58c155764ed24fcfc48ed Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Tue, 14 Jan 2020 04:46:41 -0600
+Subject: [PATCH 1/2] newapkbuild: Drastically modernise output APKBUILD file
+
+---
+ newapkbuild.in | 44 +++++++++++++++++++++++++++++++-------------
+ 1 file changed, 31 insertions(+), 13 deletions(-)
+
+diff --git a/newapkbuild.in b/newapkbuild.in
+index 85f838f..dbcef14 100644
+--- a/newapkbuild.in
++++ b/newapkbuild.in
+@@ -68,13 +68,9 @@ build_cmake() {
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \\
+ -DCMAKE_CXX_FLAGS="\$CXXFLAGS" \\
+ -DCMAKE_C_FLAGS="\$CFLAGS" \\
+- \${CMAKE_CROSSOPTS}
++ \${CMAKE_CROSSOPTS} \\
++ .
+ make
+-}
+-
+-check() {
+- cd "\$builddir"
+- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ __EOF__
+ }
+
+@@ -115,6 +111,12 @@ check_make() {
+ __EOF__
+ }
+
++check_cmake() {
++ cat >>APKBUILD<<__EOF__
++ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
++__EOF__
++}
++
+ check_python() {
+ cat >>APKBUILD<<__EOF__
+ python3 setup.py test
+@@ -193,7 +195,7 @@ newaport() {
+ python) makedepends="python3-dev";;
+ cmake) makedepends="cmake";;
+ meson) makedepends="meson";;
+- *) makedepends="\$depends_dev";;
++ *) makedepends="";;
+ esac
+
+ # Replace pkgver in $source
+@@ -226,9 +228,15 @@ url="$url"
+ arch="all"
+ license="$license"
+ depends="$depends"
+-depends_dev=""
+ makedepends="$makedepends"
++__EOF__
++ if [ -n "$install" ]; then
++ cat >>APKBUILD<<__EOF__
+ install="$install"
++__EOF__
++ fi
++
++ cat >>APKBUILD<<__EOF__
+ subpackages="\$pkgname-dev \$pkgname-doc"
+ source="$source"
+ __EOF__
+@@ -241,7 +249,12 @@ __EOF__
+ builddir=$(echo ${i#*/} | sed "s/$pv/\$pkgver/g")
+ fi
+ done
+- printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD
++ if [ -n "$sdir" ] && [ "$sdir" = "src/$pkgname-$pv" ]; then
++ # No builddir needed.
++ :
++ else
++ printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD
++ fi
+
+ # Subpackage -dev is usually required only for C/C++. Since depends_dev
+ # confuses a lot people, remove it if there's no .h or .hpp file.
+@@ -271,7 +284,6 @@ __EOF__
+ # Create build() function
+ cat >>APKBUILD<<__EOF__
+ build() {
+- cd "\$builddir"
+ __EOF__
+
+ case "$buildtype" in
+@@ -287,6 +299,8 @@ __EOF__
+ build_perl;;
+ python)
+ build_python;;
++ *)
++ printf '# Add build instructions here.' >> APKBUILD
+ esac
+
+ cat >>APKBUILD<<__EOF__
+@@ -297,14 +311,17 @@ __EOF__
+ # Create check() function
+ cat >>APKBUILD<<__EOF__
+ check() {
+- cd "\$builddir"
+ __EOF__
+
+ case "$buildtype" in
+- make|cmake|autotools|perl)
++ make|autotools|perl)
+ check_make;;
++ cmake)
++ check_cmake;;
+ python)
+ check_python;;
++ *)
++ printf '# Add test instructions here.' >> APKBUILD
+ esac
+
+ cat >>APKBUILD<<__EOF__
+@@ -315,7 +332,6 @@ __EOF__
+ # Create package() function
+ cat >>APKBUILD<<__EOF__
+ package() {
+- cd "\$builddir"
+ __EOF__
+
+ case "$buildtype" in
+@@ -329,6 +345,8 @@ __EOF__
+ package_perl;;
+ python)
+ package_python;;
++ *)
++ printf '# Add packaging instructions here.' >> APKBUILD
+ esac
+
+ if [ -n "$cpinitd" ]; then
+--
+2.24.1
+
+From 59cb9822c0ac347d58f1c37627a58fe14dce965d Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Tue, 14 Jan 2020 04:47:36 -0600
+Subject: [PATCH 2/2] newapkbuild: Newline after source
+
+---
+ newapkbuild.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/newapkbuild.in b/newapkbuild.in
+index dbcef14..9c4ffbf 100644
+--- a/newapkbuild.in
++++ b/newapkbuild.in
+@@ -251,7 +251,7 @@ __EOF__
+ done
+ if [ -n "$sdir" ] && [ "$sdir" = "src/$pkgname-$pv" ]; then
+ # No builddir needed.
+- :
++ printf '\n' >> APKBUILD
+ else
+ printf 'builddir="$srcdir/%s"\n\n' "$builddir" >> APKBUILD
+ fi
+--
+2.24.1
+
diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD
index 7ab59cbb5..04b100e69 100644
--- a/system/adelie-base/APKBUILD
+++ b/system/adelie-base/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=adelie-base
-pkgver=0.9.3
-pkgrel=1
+pkgver=0.9.4
+pkgrel=0
pkgdesc="The Adélie Linux Base System"
url="https://www.adelielinux.org/"
arch="noarch"
@@ -115,7 +115,7 @@ symbols() {
return 0
}
-sha512sums="a9690b20f90b94bda458e0570db55ce835e3d34ef04a3ea3f3d77e2d97483cecb940dbc3a1f2def72ff2589cc5b9cbe42ae38dc25d9b9ca25960a4832c87c7b4 adelie-base-0.9.3.tar.xz
+sha512sums="37b8ee0d8f005077c69da72c9f4ca8afe4eacc25aed365992218f1b06b7946666e4060c958eb94bdebdba4b9fc2b4d165bf098ceb4f9f4cf544fb2935e1dd1a7 adelie-base-0.9.4.tar.xz
37260d9315fd8d8b0df3dfb5bd3e1035a47ba1e43f33aa195e3feca6d169da282c1b067ef4603e7e9acaedbfef8b58cf490c00bdca444d43c9d570355ad29eac group
3ee7ebe2ca762029fa1795471735922416a2ec7683774d107b38bcd7aeb8277046edeff0c26b1f1195739478e1e11fb7a51c55149cf79adab44ed217334b7013 passwd
f2437ebfbc83aa6eaeec3a111aae98751215cebfaec3991ccc511be8c8938778ae46f15e07c7306bd431d036bc4ba49b33b724b839c125bd882d2e93c0314ae8 addgroup
diff --git a/system/cmake/APKBUILD b/system/cmake/APKBUILD
index c7cd896e6..e4ae8c5f8 100644
--- a/system/cmake/APKBUILD
+++ b/system/cmake/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=cmake
-pkgver=3.15.4
+pkgver=3.16.3
pkgrel=0
pkgdesc="Cross-platform build system"
url="https://cmake.org"
@@ -53,4 +53,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4058b89d35d243146f4f521356d483a850cbade316b60cf896c90da5d6b6504bc35224c0702fa525d90fe97a5311c7a895466e5eb2edb4cd4306a3cc45182650 cmake-3.15.4.tar.gz"
+sha512sums="ca9e0a142369735ef6469afb97f4463c981404bd59c7d48c1ef454dd705460a31a5dcffa4949b84b1ac723f5b7e79d67b250126fb42e1f15dab0ac2a17603672 cmake-3.16.3.tar.gz"
diff --git a/system/curl/APKBUILD b/system/curl/APKBUILD
index c65f14b60..8303e6d75 100644
--- a/system/curl/APKBUILD
+++ b/system/curl/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer:
pkgname=curl
-pkgver=7.66.0
+pkgver=7.68.0
pkgrel=0
pkgdesc="A URL retrival utility and library"
url="https://curl.haxx.se"
@@ -110,4 +110,4 @@ libcurl() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr
}
-sha512sums="81170e7e4fa9d99ee2038d96d7f2ab10dcf52435331c818c7565c1a733891720f845a08029915e52ba532c6a344c346e1678474624aac1cc333aea6d1eacde35 curl-7.66.0.tar.xz"
+sha512sums="bf365609c9a66a05b3a263d02bcd3f81f905570c5739c8ec522a296b4b8e2a479d64d5524e8345e14eafad28995ee22d923522f1a45fa40eb46db38759c2eb2c curl-7.68.0.tar.xz"
diff --git a/system/cxref/APKBUILD b/system/cxref/APKBUILD
index eeea821be..f1bc75fb4 100644
--- a/system/cxref/APKBUILD
+++ b/system/cxref/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=cxref
pkgver=1.6e
pkgrel=0
diff --git a/system/dash/APKBUILD b/system/dash/APKBUILD
index 04b81b17f..8abd44b65 100644
--- a/system/dash/APKBUILD
+++ b/system/dash/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=dash
pkgver=0.5.10.2
pkgrel=0
diff --git a/system/file/APKBUILD b/system/file/APKBUILD
index b1c337355..0e093ec4b 100644
--- a/system/file/APKBUILD
+++ b/system/file/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=file
pkgver=5.37
pkgrel=0
diff --git a/system/gcc/202-ibm-ldbl.patch b/system/gcc/202-ibm-ldbl.patch
new file mode 100644
index 000000000..bdf5c75d9
--- /dev/null
+++ b/system/gcc/202-ibm-ldbl.patch
@@ -0,0 +1,38 @@
+From 236634eed58fa6e00cc50f19e7202903a9d8fae6 Mon Sep 17 00:00:00 2001
+From: q66 <daniel@octaforge.org>
+Date: Thu, 12 Dec 2019 04:03:56 +0100
+Subject: [PATCH] libgcc: use -mno-gnu-attribute for 128-bit IBM ldouble
+ support code
+
+Doing this will allow libgcc to emit the appropriate symbols without actually
+emitting the FP ABI tag for them, which allows 64-bit long double environments
+to function and even link statically while still allowing usage of
+explicit __ibm128.
+---
+ libgcc/config/rs6000/t-ibm-ldouble | 2 +-
+ libgcc/config/rs6000/t-linux | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgcc/config/rs6000/t-ibm-ldouble b/libgcc/config/rs6000/t-ibm-ldouble
+index b132784..fb5eca8 100644
+--- a/libgcc/config/rs6000/t-ibm-ldouble
++++ b/libgcc/config/rs6000/t-ibm-ldouble
+@@ -1,6 +1,6 @@
+ # GCC 128-bit long double support routines.
+ LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c
+
+-HOST_LIBGCC2_CFLAGS += -mlong-double-128
++HOST_LIBGCC2_CFLAGS += -mlong-double-128 -mno-gnu-attribute
+
+ SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-ibm-ldouble.ver
+diff --git a/libgcc/config/rs6000/t-linux b/libgcc/config/rs6000/t-linux
+index 4f6d4c4..fa93bb6 100644
+--- a/libgcc/config/rs6000/t-linux
++++ b/libgcc/config/rs6000/t-linux
+@@ -1,3 +1,3 @@
+ SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-glibc.ver
+
+-HOST_LIBGCC2_CFLAGS += -mlong-double-128 -mno-minimal-toc
++HOST_LIBGCC2_CFLAGS += -mlong-double-128 -mno-gnu-attribute -mno-minimal-toc
+--
+2.24.0
diff --git a/system/gcc/APKBUILD b/system/gcc/APKBUILD
index 5d5758528..32de06be4 100644
--- a/system/gcc/APKBUILD
+++ b/system/gcc/APKBUILD
@@ -6,7 +6,7 @@ pkgver=8.3.0
[ "$CHOST" != "$CTARGET" ] && _target="-$CTARGET_ARCH" || _target=""
pkgname="$pkgname$_target"
-pkgrel=1
+pkgrel=2
pkgdesc="The GNU Compiler Collection"
url="https://gcc.gnu.org"
arch="all"
@@ -156,6 +156,7 @@ source="https://ftp.gnu.org/gnu/gcc/gcc-$pkgver/gcc-$pkgver.tar.xz
051_all_libiberty-pic.patch
201-ada.patch
+ 202-ibm-ldbl.patch
205-nopie.patch
libgcc-always-build-gcceh.a.patch
@@ -283,6 +284,8 @@ build() {
echo " hash_style=$_hash_style"
echo ""
+ export enable_libstdcxx_time=rt
+
mkdir -p "$_builddir"
cd "$_builddir"
"$_gccdir"/configure --prefix=/usr \
@@ -554,6 +557,7 @@ dfedf48829cff22ee836ece743de20ad467b40e86c8f4034326a4c32df35b10affd69d6b9ab3382d
d35a3ac7e13a4446921a90e1ff3eec1079840c845f9d523c868e24ae21f94cf69ba041de5341ebef96432a6f57598e223381d4286e8fb8baaa25906707f29fbd 020_all_msgfmt-libstdc++-link.patch
0a0bc72b9366158f5d23fff1928e756fdd212433bac6ab1f00d632f241382820db8db5d475ddf11ea020eaf7e2e71b12fb9b1c3c870cf84adf6c2b16f15aabca 051_all_libiberty-pic.patch
a3702c1f642412413d0ffc69f6439a3e101b2b56c16610f94c66556c88e52d01b0b6d1e57bfc5a972668f976c02fbf2fc22bcf707b000867e44744d9eb7b7566 201-ada.patch
+152639228a189b211df660b5b7543e3744cf136e80fed7f1ac37a3bc1b692fba3431a0d62337e769ee8f323188acdf11092cb1b2ef5c75fafee9628d13bc4163 202-ibm-ldbl.patch
98473bcaa77903a223ca9b0d2087c0921b287a2816d308cc32c8fe009e6cbf5dd1ae7fba27794ab8d9c09e117fe534413d91a464d1218474fc123ce0adfdc2c1 205-nopie.patch
d08d7ead2de0429e5c9055d5b029ec2be9a8c821d22cecaf9b51f633652c493333f98963d9267fa2fa63850c50ae5eefd5f59e5910ec10d20044dac082182a8b libgcc-always-build-gcceh.a.patch
600fe5098dc54edaa9808fd5717af9dec058953f9ad37d49cfba1db4f7e9a7a8f02019342f75157fc575946fa693259422184de27b7ecc8386d9f3ecc0f7cc5d gcc-4.9-musl-fortify.patch
diff --git a/system/gettext-tiny/APKBUILD b/system/gettext-tiny/APKBUILD
index a2e541df5..702b85130 100644
--- a/system/gettext-tiny/APKBUILD
+++ b/system/gettext-tiny/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gettext-tiny
-pkgver=0.3.0_pre1
-pkgrel=7
+pkgver=0.3.1_git20191130
+pkgrel=1
pkgdesc="An internationalisation and localisation system"
url="https://github.com/sabotage-linux/gettext-tiny"
arch="all"
@@ -12,13 +12,9 @@ depends=""
makedepends=""
subpackages="$pkgname-dev"
source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz
- omg-i-cant-believe-im-doing-ua-crap.patch
+ line-length.patch
respect-cflags.patch
stop-doing-macro-crap.patch
- cpp-compat.patch
- double-stack-size.patch
- m4-installation.patch
- dynamic.patch
"
build() {
@@ -29,11 +25,7 @@ package() {
make LIBINTL=MUSL DESTDIR="$pkgdir" prefix=/usr install
}
-sha512sums="3795b9923f6820ce6e2c6a27480365a4ee1cb1f8f8916256887a40c8e0f0b582ada049a528330297f8daa1bff7d5877a15169095332456c57dc3fdb49407ef98 gettext-tiny-0.3.0_pre1.tar.xz
-2951ad99fd04ee7d8dc06b4de575b7838e350737e3b40ecd93eae9f6f2b4c15883a392370e25dfaf834a57bc801721894e946d24910cfd65c44c2e025321ade4 omg-i-cant-believe-im-doing-ua-crap.patch
-cea1596f3f20c8983e57d2e49e955a43ed2e261b244f6c4c2ae7d8b869e3cfce3bb87b0a17c16bdac59afd99703cef9c7ef4e93fca536bf1bf9aa5f9be9fa34f respect-cflags.patch
-d2a1a6b1f135c25172cf98dfed64739ff85f6016a31c3ce028b3a7aa72de0b55c1f9a54c5ba2c58817f5222c3d2a5bc3d03ec9058ae5fbae2c798df9227a4e52 stop-doing-macro-crap.patch
-0f1a1be10a038e6d30976f060c271e926f8f6b0541af7044f1b0ac2641825fc784ce3e3ff6ca13f3a5d15bbcd355a0999b60d4aa6f30c7b75254ca0edcaccc4d cpp-compat.patch
-331bd0442b400407d690cce4a90aac09acf64e1a26f9951dc1d1332cc29916987d34cc13bc13e84482c6950908cedad50f6aaf325f99118d769bb1286dd4db1b double-stack-size.patch
-090b685f6846b1cf4c266cbc982701283c7e30ddcbb1d3d263d50f83645ed168530db4bc03b6b688e46a32ac7ad09f0cd3f0e94f5c1a39e86d904f010353d91e m4-installation.patch
-06ca61de36d41ad9545c7c60e54fe0fe77eb67bb4902679f2828e7a14ad01cfc244b7b136e31debbb60d9dc9b4101b4f0463d46f95c263939017fd38fbe31b19 dynamic.patch"
+sha512sums="a318135626a0403a30a81fa475f7e1878b8af5a87053b0e00876c73b591508f3cf1e66d01f8d6a45013d1dc36a4da9f21fbf2b5050676826cb618b5b659aaaf7 gettext-tiny-0.3.1_git20191130.tar.xz
+0a26a8481bffe2ce8c73f7f500963aea9db8379fb87849142d8efabf1656604b22f6ad345483256f14c388466f2f44e5924b9f65d88f26867a753a96d1529270 line-length.patch
+b4e7db4e415f6bc31f2214f2044506ad18ea0bd3cae4200d93bbd34aa493c7478a7f953d0a7e08f29f0fd5a5d7b7cbfa2bcfd5692c37e423706a1c193239bf1d respect-cflags.patch
+cd4cfc8cc6ea998f1e33ef666e3b9c3de3f3253994bccc942b177773c94f785e3892cb7d5f34bec1102dc7558236c07c5eac90e15d755e12ee06836336373526 stop-doing-macro-crap.patch"
diff --git a/system/gettext-tiny/cpp-compat.patch b/system/gettext-tiny/cpp-compat.patch
deleted file mode 100644
index e47c59695..000000000
--- a/system/gettext-tiny/cpp-compat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gettext-tiny-0.3.0_pre1/include/libintl.h.old 2018-06-21 19:55:29.646162973 -0500
-+++ gettext-tiny-0.3.0_pre1/include/libintl.h 2018-06-21 19:56:16.886116203 -0500
-@@ -1,6 +1,9 @@
- #ifndef LIBINTL_H
- #define LIBINTL_H
-
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- char *gettext(const char *msgid);
- char *dgettext(const char *domainname, const char *msgid);
- char *dcgettext(const char *domainname, const char *msgid, int category);
-@@ -11,6 +14,9 @@
- char *textdomain(const char *domainname);
- char *bind_textdomain_codeset(const char *domainname, const char *codeset);
- char *bindtextdomain(const char *domainname, const char *dirname);
-+#ifdef __cplusplus
-+}
-+#endif
-
- #undef gettext_noop
- #define gettext_noop(X) X
diff --git a/system/gettext-tiny/double-stack-size.patch b/system/gettext-tiny/double-stack-size.patch
deleted file mode 100644
index 275f477e9..000000000
--- a/system/gettext-tiny/double-stack-size.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Seen in the Dzongkha translation of GConf 3.2.6:
-
- /bin/sh: line 1: 25453 Aborted /usr/bin/msgfmt -o $file dz.po
-
-This is what we expect to see having a short read of the line; the line in
-question is 4,279 bytes long.
-
---- gettext-tiny-0.3.0_pre1/src/msgfmt.c.old 2018-06-21 04:47:19.927932643 +0000
-+++ gettext-tiny-0.3.0_pre1/src/msgfmt.c 2018-07-12 01:23:59.250000000 +0000
-@@ -370,8 +370,8 @@
-
- int process(FILE *in, FILE *out) {
- struct mo_hdr mohdr = def_hdr;
-- char line[4096]; char *lp;
-- char convbuf[16384];
-+ char line[8448]; char *lp;
-+ char convbuf[33792];
-
- struct callbackdata d = {
- .num = {
diff --git a/system/gettext-tiny/dynamic.patch b/system/gettext-tiny/dynamic.patch
deleted file mode 100644
index aa027d155..000000000
--- a/system/gettext-tiny/dynamic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-GDB/symbol splitting doesn't work on static binaries.
-
-For debugability, build dynamic.
---- gettext-tiny-0.3.0_pre1/Makefile.old 2018-07-25 23:41:05.120000000 +0000
-+++ gettext-tiny-0.3.0_pre1/Makefile 2018-07-25 23:42:51.350000000 +0000
-@@ -62,10 +62,10 @@
- $(RANLIB) $@
-
- msgmerge: $(OBJS)
-- $(CC) $(LDFLAGS) -static -o $@ src/msgmerge.o $(PARSEROBJS)
-+ $(CC) $(LDFLAGS) -o $@ src/msgmerge.o $(PARSEROBJS)
-
- msgfmt: $(OBJS)
-- $(CC) $(LDFLAGS) -static -o $@ src/msgfmt.o $(PARSEROBJS)
-+ $(CC) $(LDFLAGS) -o $@ src/msgfmt.o $(PARSEROBJS)
-
- xgettext:
- cp src/xgettext.sh ./xgettext
diff --git a/system/gettext-tiny/line-length.patch b/system/gettext-tiny/line-length.patch
new file mode 100644
index 000000000..0ba978197
--- /dev/null
+++ b/system/gettext-tiny/line-length.patch
@@ -0,0 +1,15 @@
+https://github.com/sabotage-linux/gettext-tiny/issues/50
+
+We're losing the battle of the bulge; someone really should make this use malloc.
+
+--- gettext-tiny-0.3.1_git20191130/src/msgfmt.c.old 2020-01-14 08:03:11.000000000 +0000
++++ gettext-tiny-0.3.1_git20191130/src/msgfmt.c 2020-01-21 18:58:28.257709860 +0000
+@@ -160,7 +160,7 @@
+
+ int process(FILE *in, FILE *out, bool strict) {
+ struct mo_hdr mohdr = def_hdr;
+- char line[8192]; char *lp;
++ char line[12288]; char *lp;
+ size_t off, i;
+ enum po_error t;
+ char convbuf[32768];
diff --git a/system/gettext-tiny/m4-installation.patch b/system/gettext-tiny/m4-installation.patch
deleted file mode 100644
index f55a03b08..000000000
--- a/system/gettext-tiny/m4-installation.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 7698cca6d5634ce0de4bb382e0535e1f02d7fb17 Mon Sep 17 00:00:00 2001
-From: xhe <xw897002528@gmail.com>
-Date: Sat, 14 Jul 2018 18:45:45 +0800
-Subject: [PATCH] install: symlink m4 files to $(dataroot)/aclocal follow
- https://github.com/sabotage-linux/gettext-tiny/issues/27.
-
-According to @awilfox, GNU gettext will install m4 files to aclocal dir.
-But gettext-tiny did not. So autoreconf just stops working and complains
-that it can not find needed macros.
-
-Suggested by rofl0r, symlinking all m4 files into $(dataroot)/aclocal is
-a good idea. Save a little disk space.
----
- Makefile | 22 ++++++++++++---------
- install.sh | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 80 insertions(+), 9 deletions(-)
- create mode 100644 install.sh
-
-diff --git a/Makefile b/Makefile
-index 7842c0f..927d02e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,9 @@ bindir=$(prefix)/bin
- includedir=$(prefix)/include
- libdir=$(prefix)/lib
- sysconfdir=$(prefix)/etc
--datadir=$(prefix)/share/gettext-tiny
-+datarootdir=$(prefix)/share
-+datadir=$(datarootdir)/gettext-tiny
-+acdir=$(datarootdir)/aclocal
-
- ifeq ($(LIBINTL), MUSL)
- LIBSRC = libintl/libintl-musl.c
-@@ -36,13 +38,15 @@ AR ?= $(CROSS_COMPILE)ar
- RANLIB ?= $(CROSS_COMPILE)ranlib
- CC ?= $(CROSS_COMPILE)cc
-
-+INSTALL ?= ./install.sh
-+
- -include config.mak
-
- BUILDCFLAGS=$(CFLAGS)
-
- all: $(ALL_LIBS) $(ALL_TOOLS)
-
--install: $(ALL_LIBS:lib%=$(DESTDIR)$(libdir)/lib%) $(ALL_INCLUDES:%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:%=$(DESTDIR)$(bindir)/%) $(ALL_M4S:%=$(DESTDIR)$(datadir)/%) $(ALL_DATA:%=$(DESTDIR)$(datadir)/%)
-+install: $(ALL_LIBS:lib%=$(DESTDIR)$(libdir)/lib%) $(ALL_INCLUDES:%=$(DESTDIR)$(includedir)/%) $(ALL_TOOLS:%=$(DESTDIR)$(bindir)/%) $(ALL_M4S:%=$(DESTDIR)$(datadir)/%) $(ALL_M4S:%=$(DESTDIR)$(acdir)/%) $(ALL_DATA:%=$(DESTDIR)$(datadir)/%)
-
- clean:
- rm -f $(ALL_LIBS)
-@@ -70,18 +74,18 @@ autopoint: src/autopoint.in
- cat $< | sed 's,@datadir@,$(datadir),' > $@
-
- $(DESTDIR)$(libdir)/%.a: %.a
-- install -D -m 755 $< $@
-+ $(INSTALL) -D -m 755 $< $@
-
- $(DESTDIR)$(includedir)/%.h: include/%.h
-- install -D -m 644 $< $@
-+ $(INSTALL) -D -m 644 $< $@
-
- $(DESTDIR)$(bindir)/%: %
-- install -D -m 755 $< $@
-+ $(INSTALL) -D -m 755 $< $@
-
- $(DESTDIR)$(datadir)/%: %
-- install -D -m 644 $< $@
--
--.PHONY: all clean install
--
-+ $(INSTALL) -D -m 644 $< $@
-
-+$(DESTDIR)$(acdir)/%: %
-+ $(INSTALL) -D -l ../$(subst $(datarootdir)/,,$(datadir))/$< $(subst m4/,,$@)
-
-+.PHONY: all clean install
-diff --git a/install.sh b/install.sh
-new file mode 100755
-index 0000000..0410883
---- /dev/null
-+++ b/install.sh
-@@ -0,0 +1,67 @@
-+#!/bin/sh
-+#
-+# Written by Rich Felker, originally as part of musl libc.
-+# Multi-licensed under MIT, 0BSD, and CC0.
-+#
-+# This is an actually-safe install command which installs the new
-+# file atomically in the new location, rather than overwriting
-+# existing files.
-+#
-+
-+usage() {
-+printf "usage: %s [-D] [-l] [-m mode] src dest\n" "$0" 1>&2
-+exit 1
-+}
-+
-+mkdirp=
-+symlink=
-+mode=755
-+
-+while getopts Dlm: name ; do
-+case "$name" in
-+D) mkdirp=yes ;;
-+l) symlink=yes ;;
-+m) mode=$OPTARG ;;
-+?) usage ;;
-+esac
-+done
-+shift $(($OPTIND - 1))
-+
-+test "$#" -eq 2 || usage
-+src=$1
-+dst=$2
-+tmp="$dst.tmp.$$"
-+
-+case "$dst" in
-+*/) printf "%s: %s ends in /\n", "$0" "$dst" 1>&2 ; exit 1 ;;
-+esac
-+
-+set -C
-+set -e
-+
-+if test "$mkdirp" ; then
-+umask 022
-+case "$2" in
-+*/*) mkdir -p "${dst%/*}" ;;
-+esac
-+fi
-+
-+trap 'rm -f "$tmp"' EXIT INT QUIT TERM HUP
-+
-+umask 077
-+
-+if test "$symlink" ; then
-+ln -s "$1" "$tmp"
-+else
-+cat < "$1" > "$tmp"
-+chmod "$mode" "$tmp"
-+fi
-+
-+mv -f "$tmp" "$2"
-+test -d "$2" && {
-+rm -f "$2/$tmp"
-+printf "%s: %s is a directory\n" "$0" "$dst" 1>&2
-+exit 1
-+}
-+
-+exit 0
diff --git a/system/gettext-tiny/omg-i-cant-believe-im-doing-ua-crap.patch b/system/gettext-tiny/omg-i-cant-believe-im-doing-ua-crap.patch
deleted file mode 100644
index ced35e74b..000000000
--- a/system/gettext-tiny/omg-i-cant-believe-im-doing-ua-crap.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-It turns out CMake requires the format to be:
-
-^msgmerge \(.*\) (gettext-version-number-here)
-
-So, this fixes CMake's test suite, and properly sets GETTEXT_VERSION_STRING
-to be the same as the m4 scripts shipped.
-
---- gettext-tiny-0.3.0_pre1/src/msgmerge.c.old 2018-06-20 23:47:19.927932643 -0500
-+++ gettext-tiny-0.3.0_pre1/src/msgmerge.c 2018-06-20 23:55:12.997464272 -0500
-@@ -18,7 +18,7 @@
- __attribute__((noreturn))
- static void version(void) {
- fprintf(stdout,
-- "these are not (GNU gettext-tools) 99.9999.9999\n");
-+ "msgmerge (GNU gettext-tools compatible) 99.9999.9999\n");
- exit(0);
- }
-
diff --git a/system/gettext-tiny/respect-cflags.patch b/system/gettext-tiny/respect-cflags.patch
index b949371c4..dd1cf3fe2 100644
--- a/system/gettext-tiny/respect-cflags.patch
+++ b/system/gettext-tiny/respect-cflags.patch
@@ -1,8 +1,8 @@
--- gettext-tiny-0.2.0/Makefile.old 2017-08-02 06:14:20.000000000 -0500
+++ gettext-tiny-0.2.0/Makefile 2018-06-16 21:21:57.148735892 -0500
-@@ -29,7 +29,7 @@
- ALL_TOOLS=msgfmt msgmerge xgettext autopoint
+@@ -32,7 +32,7 @@
ALL_M4S=$(sort $(wildcard m4/*.m4))
+ ALL_DATA=$(sort $(wildcard data/*))
-CFLAGS=-O0 -fPIC
+CFLAGS ?= -O0 -fPIC
diff --git a/system/gettext-tiny/stop-doing-macro-crap.patch b/system/gettext-tiny/stop-doing-macro-crap.patch
index 8886b4eb5..277bc7ae7 100644
--- a/system/gettext-tiny/stop-doing-macro-crap.patch
+++ b/system/gettext-tiny/stop-doing-macro-crap.patch
@@ -1,6 +1,6 @@
--- gettext-tiny-0.2.0/include/libintl.h.old 2017-08-02 06:14:20.000000000 -0500
+++ gettext-tiny-0.2.0/include/libintl.h 2018-06-15 02:31:14.241446687 -0500
-@@ -15,14 +15,14 @@
+@@ -34,14 +34,14 @@
#undef gettext_noop
#define gettext_noop(X) X
diff --git a/system/git/APKBUILD b/system/git/APKBUILD
index 07adcfdaa..0440b0f0b 100644
--- a/system/git/APKBUILD
+++ b/system/git/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=git
-pkgver=2.24.1
+pkgver=2.25.0
pkgrel=0
pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
@@ -22,6 +22,7 @@ subpackages="$pkgname-doc
$pkgname-gitweb
$pkgname-subtree::noarch
$pkgname-subtree-doc:subtree_doc:noarch
+ $pkgname-lang
"
replaces="git-perl perl-git"
source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
@@ -50,7 +51,6 @@ _gitcoredir=/usr/libexec/git-core
prepare() {
default_prepare
cat >> config.mak <<-EOF
- NO_GETTEXT=YesPlease
NO_SVN_TESTS=YesPlease
NO_REGEX=YesPlease
USE_ASCIIDOCTOR=1
@@ -173,7 +173,7 @@ subtree_doc() {
gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1
}
-sha512sums="010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7 git-2.24.1.tar.xz
-315e4666c425b31a7f7a447e777cbf2a1050feac9b4d4b8a61c05248024e790d4d18f3336faf2a2c68584e05e8194c22a09e1caba1352cfec194e0bc01277a6c dont-test-other-encodings.patch
+sha512sums="8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 git-2.25.0.tar.xz
+0a0935d876024d96156df3aeec06b47fd9e370484d4552786c450cb500ae671a631e64c30994ec39f43a2f313f75d68909688ea92b47327d1af65e365dc77480 dont-test-other-encodings.patch
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd"
diff --git a/system/git/dont-test-other-encodings.patch b/system/git/dont-test-other-encodings.patch
index 9019d4cab..7d176d57a 100644
--- a/system/git/dont-test-other-encodings.patch
+++ b/system/git/dont-test-other-encodings.patch
@@ -1,140 +1,5 @@
We can't support Japanese people using musl
---- git-2.14.1/t/t3900-i18n-commit.sh.old 2017-08-09 14:54:31.000000000 -0500
-+++ git-2.14.1/t/t3900-i18n-commit.sh 2017-09-10 21:10:09.269860087 -0500
-@@ -76,132 +76,4 @@
- test_i18ngrep "did not conform" "$HOME"/stderr
- '
-
--for H in ISO8859-1 eucJP ISO-2022-JP
--do
-- test_expect_success "$H setup" '
-- git config i18n.commitencoding $H &&
-- git checkout -b $H C0 &&
-- echo $H >F &&
-- git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt
-- '
--done
--
--for H in ISO8859-1 eucJP ISO-2022-JP
--do
-- test_expect_success "check encoding header for $H" '
-- E=$(git cat-file commit '$H' | sed -ne "s/^encoding //p") &&
-- test "z$E" = "z'$H'"
-- '
--done
--
--test_expect_success 'config to remove customization' '
-- git config --unset-all i18n.commitencoding &&
-- if Z=$(git config --get-all i18n.commitencoding)
-- then
-- echo Oops, should have failed.
-- false
-- else
-- test z = "z$Z"
-- fi &&
-- git config i18n.commitencoding UTF-8
--'
--
--test_expect_success 'ISO8859-1 should be shown in UTF-8 now' '
-- compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
--'
--
--for H in eucJP ISO-2022-JP
--do
-- test_expect_success "$H should be shown in UTF-8 now" '
-- compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-- '
--done
--
--test_expect_success 'config to add customization' '
-- git config --unset-all i18n.commitencoding &&
-- if Z=$(git config --get-all i18n.commitencoding)
-- then
-- echo Oops, should have failed.
-- false
-- else
-- test z = "z$Z"
-- fi
--'
--
--for H in ISO8859-1 eucJP ISO-2022-JP
--do
-- test_expect_success "$H should be shown in itself now" '
-- git config i18n.commitencoding '$H' &&
-- compare_with '$H' "$TEST_DIRECTORY"/t3900/'$H'.txt
-- '
--done
--
--test_expect_success 'config to tweak customization' '
-- git config i18n.logoutputencoding UTF-8
--'
--
--test_expect_success 'ISO8859-1 should be shown in UTF-8 now' '
-- compare_with ISO8859-1 "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
--'
--
--for H in eucJP ISO-2022-JP
--do
-- test_expect_success "$H should be shown in UTF-8 now" '
-- compare_with '$H' "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
-- '
--done
--
--for J in eucJP ISO-2022-JP
--do
-- if test "$J" = ISO-2022-JP
-- then
-- ICONV=$J
-- else
-- ICONV=
-- fi
-- git config i18n.logoutputencoding $J
-- for H in eucJP ISO-2022-JP
-- do
-- test_expect_success "$H should be shown in $J now" '
-- compare_with '$H' "$TEST_DIRECTORY"/t3900/'$J'.txt $ICONV
-- '
-- done
--done
--
--for H in ISO8859-1 eucJP ISO-2022-JP
--do
-- test_expect_success "No conversion with $H" '
-- compare_with "--encoding=none '$H'" "$TEST_DIRECTORY"/t3900/'$H'.txt
-- '
--done
--
--test_commit_autosquash_flags () {
-- H=$1
-- flag=$2
-- test_expect_success "commit --$flag with $H encoding" '
-- git config i18n.commitencoding $H &&
-- git checkout -b $H-$flag C0 &&
-- echo $H >>F &&
-- git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
-- test_tick &&
-- echo intermediate stuff >>G &&
-- git add G &&
-- git commit -a -m "intermediate commit" &&
-- test_tick &&
-- echo $H $flag >>F &&
-- git commit -a --$flag HEAD~1 &&
-- E=$(git cat-file commit '$H-$flag' |
-- sed -ne "s/^encoding //p") &&
-- test "z$E" = "z$H" &&
-- git config --unset-all i18n.commitencoding &&
-- git rebase --autosquash -i HEAD^^^ &&
-- git log --oneline >actual &&
-- test_line_count = 3 actual
-- '
--}
--
--test_commit_autosquash_flags eucJP fixup
--
--test_commit_autosquash_flags ISO-2022-JP squash
--
- test_done
--- git-2.14.1/t/t5100-mailinfo.sh.old 2017-08-09 14:54:31.000000000 -0500
+++ git-2.14.1/t/t5100-mailinfo.sh 2017-09-10 23:26:39.206126739 -0500
@@ -27,6 +27,7 @@
diff --git a/system/mailx/APKBUILD b/system/mailx/APKBUILD
index 846c4a08b..81322941b 100644
--- a/system/mailx/APKBUILD
+++ b/system/mailx/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=mailx
pkgver=12.4
-pkgrel=1
+pkgrel=2
pkgdesc="Send and receive Internet mail"
url="http://heirloom.sourceforge.net/mailx.html"
arch="all"
@@ -14,16 +14,19 @@ subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/heirloom/$pkgname-$pkgver.tar.bz2
Mail
mailx-12.4-openssl.patch
- mailx-12.4-cve.patch"
+ mailx-12.4-cve.patch
+ openssl-1.1.patch
+ sendmail.patch
+ "
build() {
- make PREFIX="/usr" SYSCONFDIR="/etc" STRIP=":" SENDMAIL="/usr/sbin/sendmail" \
+ make PREFIX="/usr" SYSCONFDIR="/etc" STRIP=":" \
MAILSPOOL="/var/spool/mail"
}
package() {
make DESTDIR="$pkgdir" PREFIX="/usr" SYSCONFDIR="/etc" STRIP=":" \
- UCBINSTALL="`command -v install`" SENDMAIL="/usr/sbin/sendmail" \
+ UCBINSTALL="`command -v install`" \
MAILSPOOL="/var/spool/mail" install
install -m 755 "$srcdir"/Mail "$pkgdir"/usr/bin/Mail
}
@@ -31,4 +34,6 @@ package() {
sha512sums="a0e29972f552bd630ce1a14f70e61661815118520bcd4a00b6cad53f3270d3d08c835ff6982ba8800eb380a5b46f54eb6e60fb7533b5f41c916af45d29605af8 mailx-12.4.tar.bz2
8715bcdbcc5170f406df2a78dc9bac144c5d73eb90ba4832162cd3c5d72c938a32a86e622e64c7e786c05343a37d7b94245cc636511261d1d4f817def04087d2 Mail
a74f85b5a4a9f9cd9a38e244498a11394c42189bbd0601656b6ed56fa55bf596820ef2f995c6878d322a1eca135bd1b1822467c4086adb849c81d65229845663 mailx-12.4-openssl.patch
-1e77cd6ea251793ca48ae86b265580cd70fe33838b0b4e1f522af07f4f34bc909e1bab52dc0180516d44399c4227a54be7718c76ebbc4f886f372fdc5c19278f mailx-12.4-cve.patch"
+1e77cd6ea251793ca48ae86b265580cd70fe33838b0b4e1f522af07f4f34bc909e1bab52dc0180516d44399c4227a54be7718c76ebbc4f886f372fdc5c19278f mailx-12.4-cve.patch
+6b7cb06d13c6e213a403e6544fc73b1c3ea0a1dd96ef06ed3bb9f2b2519c1bc9a9e0510462c414ebe86a19e75dcdc1c634588036813136a16b7a3eccc24459e8 openssl-1.1.patch
+0e7b7ed38546081df301123907cc12e2cd4b4c411da7976a5035239eecd1f6741a3faefdf6fdf1ed1b57afc1e58a9f24b0b5f3f129d78b3dfa9f9e5beda7d9b4 sendmail.patch"
diff --git a/system/mailx/openssl-1.1.patch b/system/mailx/openssl-1.1.patch
new file mode 100644
index 000000000..0c41ff1d6
--- /dev/null
+++ b/system/mailx/openssl-1.1.patch
@@ -0,0 +1,43 @@
+Remove EGD support no longer present in 1.1.
+
+Remove SSLv3 support.
+
+--- mailx-12.4/openssl.c.old 2020-01-15 02:20:57.711188031 +0000
++++ mailx-12.4/openssl.c 2020-01-15 02:34:43.412879382 +0000
+@@ -130,15 +130,7 @@
+ char *cp;
+ int state = 0;
+
+- if ((cp = value("ssl-rand-egd")) != NULL) {
+- cp = expand(cp);
+- if (RAND_egd(cp) == -1) {
+- fprintf(stderr, catgets(catd, CATSET, 245,
+- "entropy daemon at \"%s\" not available\n"),
+- cp);
+- } else
+- state = 1;
+- } else if ((cp = value("ssl-rand-file")) != NULL) {
++ if ((cp = value("ssl-rand-file")) != NULL) {
+ cp = expand(cp);
+ if (RAND_load_file(cp, 1024) == -1) {
+ fprintf(stderr, catgets(catd, CATSET, 246,
+@@ -156,6 +148,8 @@
+ }
+ state = 1;
+ }
++ } else {
++ RAND_poll();
+ }
+ return state;
+ }
+@@ -211,9 +205,7 @@
+
+ cp = ssl_method_string(uhp);
+ if (cp != NULL) {
+- if (equal(cp, "ssl3"))
+- method = SSLv3_client_method();
+- else if (equal(cp, "tls1"))
++ if (equal(cp, "tls1"))
+ method = TLSv1_client_method();
+ else {
+ fprintf(stderr, catgets(catd, CATSET, 244,
diff --git a/system/mailx/sendmail.patch b/system/mailx/sendmail.patch
new file mode 100644
index 000000000..9be0fd0bd
--- /dev/null
+++ b/system/mailx/sendmail.patch
@@ -0,0 +1,24 @@
+This patch additionally fixes the manpage.
+
+--- mailx-12.4/Makefile.old 2008-07-28 22:33:38.000000000 +0000
++++ mailx-12.4/Makefile 2020-01-15 02:29:34.445930298 +0000
+@@ -13,7 +13,7 @@
+
+ MAILRC = $(SYSCONFDIR)/nail.rc
+ MAILSPOOL = /var/mail
+-SENDMAIL = /usr/lib/sendmail
++SENDMAIL = /usr/sbin/sendmail
+
+ DESTDIR =
+
+--- mailx-12.4/mailx.1.old 2020-01-15 02:20:57.711188031 +0000
++++ mailx-12.4/mailx.1 2020-01-15 02:29:50.274237107 +0000
+@@ -4907,7 +4907,7 @@
+ which just acts as a proxy.
+ .PP
+ \fIMailx\fR immediately contacts the SMTP server (or
+-.IR \%/usr/lib/sendmail )
++.IR \%/usr/sbin/sendmail )
+ even when operating in
+ .I disconnected
+ mode.
diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD
index 414283adf..5a28c9100 100644
--- a/system/ncurses/APKBUILD
+++ b/system/ncurses/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ncurses
pkgver=6.1
_ver=${pkgver}-20190713
diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD
index 38d947585..10eee5514 100644
--- a/system/openssh/APKBUILD
+++ b/system/openssh/APKBUILD
@@ -136,7 +136,7 @@ server() {
pkgdesc="OpenSSH server"
depends="openssh-client openssh-keygen"
replaces="openssh-server-common"
- cd "$builddir"
+
install -d "$subpkgdir"/usr/sbin
install -d "$subpkgdir"/etc/ssh
mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/
diff --git a/system/openssl/0003-use-termios.patch b/system/openssl/0003-use-termios.patch
deleted file mode 100644
index 3312d1856..000000000
--- a/system/openssl/0003-use-termios.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5caf1bdcdb56358c0ce38ef404fedbe323e66cb9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 5 Feb 2015 08:40:32 +0200
-Subject: [PATCH] use termios
-
----
- crypto/ui/ui_openssl.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c
-index 8bda83c..a89b5f2 100644
---- a/crypto/ui/ui_openssl.c
-+++ b/crypto/ui/ui_openssl.c
-@@ -224,6 +224,9 @@
- # undef SGTTY
- #endif
-
-+#define TERMIOS
-+#undef TERMIO
-+
- #ifdef TERMIOS
- # include <termios.h>
- # define TTY_STRUCT struct termios
---
-2.2.2
-
diff --git a/system/openssl/0004-fix-default-ca-path-for-apps.patch b/system/openssl/0004-fix-default-ca-path-for-apps.patch
deleted file mode 100644
index c2c53184a..000000000
--- a/system/openssl/0004-fix-default-ca-path-for-apps.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 09e6425ad6927a825b077af85c50b2fb04773757 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 5 Feb 2015 08:52:05 +0200
-Subject: [PATCH] fix default ca path for apps
-
----
- apps/s_server.c | 22 ++++++++++++++--------
- apps/s_time.c | 13 ++++++-------
- 3 files changed, 26 insertions(+), 22 deletions(-)
-
-diff --git a/apps/s_server.c b/apps/s_server.c
-index baa2455..2d5dc97 100644
---- a/apps/s_server.c
-+++ b/apps/s_server.c
-@@ -1770,12 +1770,14 @@ int MAIN(int argc, char *argv[])
- }
- #endif
-
-- if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) ||
-- (!SSL_CTX_set_default_verify_paths(ctx))) {
-- /* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
-- ERR_print_errors(bio_err);
-- /* goto end; */
-+ if (CAfile == NULL && CApath == NULL) {
-+ if (!SSL_CTX_set_default_verify_paths(ctx))
-+ ERR_print_errors(bio_err);
-+ } else {
-+ if (!SSL_CTX_load_verify_locations(ctx, CAfile, CApath))
-+ ERR_print_errors(bio_err);
- }
-+
- if (vpm)
- SSL_CTX_set1_param(ctx, vpm);
-
-@@ -1838,10 +1840,14 @@ int MAIN(int argc, char *argv[])
- else
- SSL_CTX_sess_set_cache_size(ctx2, 128);
-
-- if ((!SSL_CTX_load_verify_locations(ctx2, CAfile, CApath)) ||
-- (!SSL_CTX_set_default_verify_paths(ctx2))) {
-- ERR_print_errors(bio_err);
-+ if (CAfile == NULL && CApath == NULL) {
-+ if (!SSL_CTX_set_default_verify_paths(ctx2))
-+ ERR_print_errors(bio_err);
-+ } else {
-+ if (!SSL_CTX_load_verify_locations(ctx2, CAfile, CApath))
-+ ERR_print_errors(bio_err);
- }
-+
- if (vpm)
- SSL_CTX_set1_param(ctx2, vpm);
-
-diff --git a/apps/s_time.c b/apps/s_time.c
-index 5846f3a..c8f371a 100644
---- a/apps/s_time.c
-+++ b/apps/s_time.c
-@@ -377,13 +377,12 @@ int MAIN(int argc, char **argv)
-
- SSL_load_error_strings();
-
-- if ((!SSL_CTX_load_verify_locations(tm_ctx, CAfile, CApath)) ||
-- (!SSL_CTX_set_default_verify_paths(tm_ctx))) {
-- /*
-- * BIO_printf(bio_err,"error setting default verify locations\n");
-- */
-- ERR_print_errors(bio_err);
-- /* goto end; */
-+ if (CAfile == NULL && CApath == NULL) {
-+ if (!SSL_CTX_set_default_verify_paths(tm_ctx))
-+ ERR_print_errors(bio_err);
-+ } else {
-+ if (!SSL_CTX_load_verify_locations(tm_ctx, CAfile, CApath))
-+ ERR_print_errors(bio_err);
- }
-
- if (tm_cipher == NULL)
---
-2.2.2
-
diff --git a/system/openssl/0005-fix-parallel-build.patch b/system/openssl/0005-fix-parallel-build.patch
deleted file mode 100644
index 70073fd19..000000000
--- a/system/openssl/0005-fix-parallel-build.patch
+++ /dev/null
@@ -1,349 +0,0 @@
-diff -ru openssl-1.0.2a.orig/Makefile.org openssl-1.0.2a/Makefile.org
---- openssl-1.0.2d.orig/Makefile.org 2015-07-09 16:30:50.201986573 -0300
-+++ openssl-1.0.2d/Makefile.org 2015-07-09 16:30:50.201986573 -0300
-@@ -278,17 +278,17 @@
- build_libssl: build_ssl libssl.pc
-
- build_crypto:
-- @dir=crypto; target=all; $(BUILD_ONE_CMD)
-+ +@dir=crypto; target=all; $(BUILD_ONE_CMD)
- build_ssl: build_crypto
-- @dir=ssl; target=all; $(BUILD_ONE_CMD)
-+ +@dir=ssl; target=all; $(BUILD_ONE_CMD)
- build_engines: build_crypto
-- @dir=engines; target=all; $(BUILD_ONE_CMD)
-+ +@dir=engines; target=all; $(BUILD_ONE_CMD)
- build_apps: build_libs
-- @dir=apps; target=all; $(BUILD_ONE_CMD)
-+ +@dir=apps; target=all; $(BUILD_ONE_CMD)
- build_tests: build_libs
-- @dir=test; target=all; $(BUILD_ONE_CMD)
-+ +@dir=test; target=all; $(BUILD_ONE_CMD)
- build_tools: build_libs
-- @dir=tools; target=all; $(BUILD_ONE_CMD)
-+ +@dir=tools; target=all; $(BUILD_ONE_CMD)
-
- all_testapps: build_libs build_testapps
- build_testapps:
-@@ -536,9 +536,9 @@
- dist_pem_h:
- (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
-
--install: all install_docs install_sw
-+install: install_docs install_sw
-
--install_sw:
-+install_dirs:
- @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
- $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-@@ -547,12 +547,19 @@
- $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
- $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
- $(INSTALL_PREFIX)$(OPENSSLDIR)/private
-+ @$(PERL) $(TOP)/util/mkdir-p.pl \
-+ $(INSTALL_PREFIX)$(MANDIR)/man1 \
-+ $(INSTALL_PREFIX)$(MANDIR)/man3 \
-+ $(INSTALL_PREFIX)$(MANDIR)/man5 \
-+ $(INSTALL_PREFIX)$(MANDIR)/man7
-+
-+install_sw: install_dirs
- @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
- do \
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- done;
-- @set -e; target=install; $(RECURSIVE_BUILD_CMD)
-+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
- @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
- do \
- if [ -f "$$i" ]; then \
-@@ -636,12 +643,7 @@
- done; \
- done
-
--install_docs:
-- @$(PERL) $(TOP)/util/mkdir-p.pl \
-- $(INSTALL_PREFIX)$(MANDIR)/man1 \
-- $(INSTALL_PREFIX)$(MANDIR)/man3 \
-- $(INSTALL_PREFIX)$(MANDIR)/man5 \
-- $(INSTALL_PREFIX)$(MANDIR)/man7
-+install_docs: install_dirs
- @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
- here="`pwd`"; \
- filecase=; \
-diff -ru openssl-1.0.2a.orig/Makefile.shared openssl-1.0.2a/Makefile.shared
---- openssl-1.0.2a.orig/Makefile.shared 2015-01-20 12:33:36.000000000 +0000
-+++ openssl-1.0.2a/Makefile.shared 2015-03-19 14:53:31.246908039 +0000
-@@ -105,6 +105,7 @@
- SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
- LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
- LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
-+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
- LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
- $${SHAREDCMD} $${SHAREDFLAGS} \
- -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
-@@ -122,6 +123,7 @@
- done; \
- fi; \
- if [ -n "$$SHLIB_SOVER" ]; then \
-+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
- ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
- ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
- fi; \
-diff -ru openssl-1.0.2a.orig/crypto/Makefile openssl-1.0.2a/crypto/Makefile
---- openssl-1.0.2a.orig/crypto/Makefile 2015-03-19 13:31:02.000000000 +0000
-+++ openssl-1.0.2a/crypto/Makefile 2015-03-19 14:53:31.246908039 +0000
-@@ -85,11 +85,11 @@
- @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
-
- subdirs:
-- @target=all; $(RECURSIVE_MAKE)
-+ +@target=all; $(RECURSIVE_MAKE)
-
- files:
- $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
-- @target=files; $(RECURSIVE_MAKE)
-+ +@target=files; $(RECURSIVE_MAKE)
-
- links:
- @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
-@@ -100,7 +100,7 @@
- # lib: $(LIB): are splitted to avoid end-less loop
- lib: $(LIB)
- @touch lib
--$(LIB): $(LIBOBJ)
-+$(LIB): $(LIBOBJ) | subdirs
- $(AR) $(LIB) $(LIBOBJ)
- test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
- $(RANLIB) $(LIB) || echo Never mind.
-@@ -111,7 +111,7 @@
- fi
-
- libs:
-- @target=lib; $(RECURSIVE_MAKE)
-+ +@target=lib; $(RECURSIVE_MAKE)
-
- install:
- @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
-@@ -120,7 +120,7 @@
- (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
- done;
-- @target=install; $(RECURSIVE_MAKE)
-+ +@target=install; $(RECURSIVE_MAKE)
-
- lint:
- @target=lint; $(RECURSIVE_MAKE)
-diff -ru openssl-1.0.2a.orig/engines/Makefile openssl-1.0.2a/engines/Makefile
---- openssl-1.0.2a.orig/engines/Makefile 2015-03-19 13:31:14.000000000 +0000
-+++ openssl-1.0.2a/engines/Makefile 2015-03-19 14:53:31.246908039 +0000
-@@ -72,7 +72,7 @@
-
- all: lib subdirs
-
--lib: $(LIBOBJ)
-+lib: $(LIBOBJ) | subdirs
- @if [ -n "$(SHARED_LIBS)" ]; then \
- set -e; \
- for l in $(LIBNAMES); do \
-@@ -89,7 +89,7 @@
-
- subdirs:
- echo $(EDIRS)
-- @target=all; $(RECURSIVE_MAKE)
-+ +@target=all; $(RECURSIVE_MAKE)
-
- files:
- $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
-@@ -128,7 +128,7 @@
- mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
- done; \
- fi
-- @target=install; $(RECURSIVE_MAKE)
-+ +@target=install; $(RECURSIVE_MAKE)
-
- tags:
- ctags $(SRC)
-diff -ru openssl-1.0.2a.orig/test/Makefile openssl-1.0.2a/test/Makefile
---- openssl-1.0.2a.orig/test/Makefile 2015-03-19 13:31:16.000000000 +0000
-+++ openssl-1.0.2a/test/Makefile 2015-03-19 14:55:44.146017128 +0000
-@@ -133,7 +133,7 @@
- tags:
- ctags $(SRC)
-
--tests: exe apps $(TESTS)
-+tests: exe $(TESTS)
-
- apps:
- @(cd ..; $(MAKE) DIRS=apps all)
-@@ -402,121 +402,121 @@
- link_app.$${shlib_target}
-
- $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
-- @target=$(RSATEST); $(BUILD_CMD)
-+ +@target=$(RSATEST); $(BUILD_CMD)
-
- $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
-- @target=$(BNTEST); $(BUILD_CMD)
-+ +@target=$(BNTEST); $(BUILD_CMD)
-
- $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
-- @target=$(ECTEST); $(BUILD_CMD)
-+ +@target=$(ECTEST); $(BUILD_CMD)
-
- $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
-- @target=$(EXPTEST); $(BUILD_CMD)
-+ +@target=$(EXPTEST); $(BUILD_CMD)
-
- $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
-- @target=$(IDEATEST); $(BUILD_CMD)
-+ +@target=$(IDEATEST); $(BUILD_CMD)
-
- $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
-- @target=$(MD2TEST); $(BUILD_CMD)
-+ +@target=$(MD2TEST); $(BUILD_CMD)
-
- $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
-- @target=$(SHATEST); $(BUILD_CMD)
-+ +@target=$(SHATEST); $(BUILD_CMD)
-
- $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
-- @target=$(SHA1TEST); $(BUILD_CMD)
-+ +@target=$(SHA1TEST); $(BUILD_CMD)
-
- $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
-- @target=$(SHA256TEST); $(BUILD_CMD)
-+ +@target=$(SHA256TEST); $(BUILD_CMD)
-
- $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
-- @target=$(SHA512TEST); $(BUILD_CMD)
-+ +@target=$(SHA512TEST); $(BUILD_CMD)
-
- $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
-- @target=$(RMDTEST); $(BUILD_CMD)
-+ +@target=$(RMDTEST); $(BUILD_CMD)
-
- $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
-- @target=$(MDC2TEST); $(BUILD_CMD)
-+ +@target=$(MDC2TEST); $(BUILD_CMD)
-
- $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
-- @target=$(MD4TEST); $(BUILD_CMD)
-+ +@target=$(MD4TEST); $(BUILD_CMD)
-
- $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
-- @target=$(MD5TEST); $(BUILD_CMD)
-+ +@target=$(MD5TEST); $(BUILD_CMD)
-
- $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
-- @target=$(HMACTEST); $(BUILD_CMD)
-+ +@target=$(HMACTEST); $(BUILD_CMD)
-
- $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
-- @target=$(WPTEST); $(BUILD_CMD)
-+ +@target=$(WPTEST); $(BUILD_CMD)
-
- $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
-- @target=$(RC2TEST); $(BUILD_CMD)
-+ +@target=$(RC2TEST); $(BUILD_CMD)
-
- $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
-- @target=$(BFTEST); $(BUILD_CMD)
-+ +@target=$(BFTEST); $(BUILD_CMD)
-
- $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
-- @target=$(CASTTEST); $(BUILD_CMD)
-+ +@target=$(CASTTEST); $(BUILD_CMD)
-
- $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
-- @target=$(RC4TEST); $(BUILD_CMD)
-+ +@target=$(RC4TEST); $(BUILD_CMD)
-
- $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
-- @target=$(RC5TEST); $(BUILD_CMD)
-+ +@target=$(RC5TEST); $(BUILD_CMD)
-
- $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
-- @target=$(DESTEST); $(BUILD_CMD)
-+ +@target=$(DESTEST); $(BUILD_CMD)
-
- $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
-- @target=$(RANDTEST); $(BUILD_CMD)
-+ +@target=$(RANDTEST); $(BUILD_CMD)
-
- $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
-- @target=$(DHTEST); $(BUILD_CMD)
-+ +@target=$(DHTEST); $(BUILD_CMD)
-
- $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
-- @target=$(DSATEST); $(BUILD_CMD)
-+ +@target=$(DSATEST); $(BUILD_CMD)
-
- $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
-- @target=$(METHTEST); $(BUILD_CMD)
-+ +@target=$(METHTEST); $(BUILD_CMD)
-
- $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
-- @target=$(SSLTEST); $(FIPS_BUILD_CMD)
-+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
-
- $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
-- @target=$(ENGINETEST); $(BUILD_CMD)
-+ +@target=$(ENGINETEST); $(BUILD_CMD)
-
- $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
-- @target=$(EVPTEST); $(BUILD_CMD)
-+ +@target=$(EVPTEST); $(BUILD_CMD)
-
- $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO)
-- @target=$(EVPEXTRATEST); $(BUILD_CMD)
-+ +@target=$(EVPEXTRATEST); $(BUILD_CMD)
-
- $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
-- @target=$(ECDSATEST); $(BUILD_CMD)
-+ +@target=$(ECDSATEST); $(BUILD_CMD)
-
- $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
-- @target=$(ECDHTEST); $(BUILD_CMD)
-+ +@target=$(ECDHTEST); $(BUILD_CMD)
-
- $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
-- @target=$(IGETEST); $(BUILD_CMD)
-+ +@target=$(IGETEST); $(BUILD_CMD)
-
- $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
-- @target=$(JPAKETEST); $(BUILD_CMD)
-+ +@target=$(JPAKETEST); $(BUILD_CMD)
-
- $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
-- @target=$(ASN1TEST); $(BUILD_CMD)
-+ +@target=$(ASN1TEST); $(BUILD_CMD)
-
- $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
-- @target=$(SRPTEST); $(BUILD_CMD)
-+ +@target=$(SRPTEST); $(BUILD_CMD)
-
- $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
-- @target=$(V3NAMETEST); $(BUILD_CMD)
-+ +@target=$(V3NAMETEST); $(BUILD_CMD)
-
- $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO)
-- @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
-+ +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC)
-
- $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o
-- @target=$(CONSTTIMETEST) $(BUILD_CMD)
-+ +@target=$(CONSTTIMETEST) $(BUILD_CMD)
-
- #$(AESTEST).o: $(AESTEST).c
- # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c
-@@ -529,7 +529,7 @@
- # fi
-
- dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
-- @target=dummytest; $(BUILD_CMD)
-+ +@target=dummytest; $(BUILD_CMD)
-
- # DO NOT DELETE THIS LINE -- make depend depends on it.
-
diff --git a/system/openssl/0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch b/system/openssl/0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
deleted file mode 100644
index daa6df02f..000000000
--- a/system/openssl/0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 4785c095dbfb3630ddf6685f23e3a19c7c804cbc Mon Sep 17 00:00:00 2001
-From: William Pitcock <nenolod@dereferenced.org>
-Date: Thu, 5 Feb 2015 09:02:00 +0200
-Subject: [PATCH] add ircv3 tls-3.1 extension support to s_client
-
----
- apps/s_client.c | 24 ++++++++++++++++++++++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/apps/s_client.c b/apps/s_client.c
-index 8aee02a..0a28b89 100644
---- a/apps/s_client.c
-+++ b/apps/s_client.c
-@@ -401,7 +401,7 @@ static void sc_usage(void)
- BIO_printf(bio_err,
- " 'prot' defines which one to assume. Currently,\n");
- BIO_printf(bio_err,
-- " only \"smtp\", \"pop3\", \"imap\", \"ftp\" and \"xmpp\"\n");
-+ " only \"smtp\", \"pop3\", \"imap\", \"ftp\", \"xmpp\" and \"ircv3\"\n");
- BIO_printf(bio_err, " are supported.\n");
- #ifndef OPENSSL_NO_ENGINE
- BIO_printf(bio_err,
-@@ -640,7 +640,8 @@ enum {
- PROTO_POP3,
- PROTO_IMAP,
- PROTO_FTP,
-- PROTO_XMPP
-+ PROTO_XMPP,
-+ PROTO_IRCV3,
- };
-
- int MAIN(int, char **);
-@@ -1062,6 +1063,8 @@ int MAIN(int argc, char **argv)
- starttls_proto = PROTO_FTP;
- else if (strcmp(*argv, "xmpp") == 0)
- starttls_proto = PROTO_XMPP;
-+ else if (strcmp(*argv, "ircv3") == 0)
-+ starttls_proto = PROTO_IRCV3;
- else
- goto bad;
- }
-@@ -1646,6 +1649,23 @@ int MAIN(int argc, char **argv)
- goto shut;
- mbuf[0] = 0;
- }
-+ if (starttls_proto == PROTO_IRCV3) {
-+ int seen = 0;
-+ BIO_printf(sbio,"CAP REQ :tls\r\n");
-+
-+ while (!strstr(mbuf,"CAP")) {
-+ seen = BIO_read(sbio,mbuf,BUFSIZZ);
-+ mbuf[seen] = 0;
-+ }
-+ if (!strstr(mbuf,"ACK"))
-+ goto shut;
-+ BIO_printf(sbio,"CAP END\r\nSTARTTLS\r\n");
-+ while (!strstr(sbuf, "670")) {
-+ seen = BIO_read(sbio,sbuf,BUFSIZZ);
-+ sbuf[seen] = 0;
-+ }
-+ mbuf[0] = 0;
-+ }
-
- for (;;) {
- FD_ZERO(&readfds);
---
-2.2.2
-
diff --git a/system/openssl/0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch b/system/openssl/0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
deleted file mode 100644
index ff3d25eff..000000000
--- a/system/openssl/0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 7457e26d3a78c7cd923242d87d04febadddea086 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 5 Feb 2015 10:06:31 +0200
-Subject: [PATCH] maintain abi compat with no-freelist and regular build
-
----
- ssl/ssl.h | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/ssl/ssl.h b/ssl/ssl.h
-index 2b0f662..636cb5d 100644
---- a/ssl/ssl.h
-+++ b/ssl/ssl.h
-@@ -1113,6 +1113,10 @@ struct ssl_ctx_st {
- unsigned int freelist_max_len;
- struct ssl3_buf_freelist_st *wbuf_freelist;
- struct ssl3_buf_freelist_st *rbuf_freelist;
-+# else
-+ unsigned int freelist_dummy0;
-+ void *freelist_dummy1;
-+ void *freelist_dummy2;
- # endif
- # ifndef OPENSSL_NO_SRP
- SRP_CTX srp_ctx; /* ctx for SRP authentication */
---
-2.2.2
-
diff --git a/system/openssl/0009-no-rpath.patch b/system/openssl/0009-no-rpath.patch
deleted file mode 100644
index 56df75b79..000000000
--- a/system/openssl/0009-no-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.shared 2005-06-23 22:47:54.000000000 +0200
-+++ b/Makefile.shared 2005-11-16 22:35:37.000000000 +0100
-@@ -153,7 +153,7 @@
- NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
- SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX"
-
--DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)"
-+DO_GNU_APP=LDFLAGS="$(CFLAGS)"
-
- #This is rather special. It's a special target with which one can link
- #applications without bothering with any features that have anything to
diff --git a/system/openssl/0010-ssl-env-zlib.patch b/system/openssl/0010-ssl-env-zlib.patch
deleted file mode 100644
index 9eae15d72..000000000
--- a/system/openssl/0010-ssl-env-zlib.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ru openssl-1.0.2a.orig/doc/ssl/SSL_COMP_add_compression_method.pod openssl-1.0.2a/doc/ssl/SSL_COMP_add_compression_method.pod
---- openssl-1.0.2a.orig/doc/ssl/SSL_COMP_add_compression_method.pod 2015-01-15 16:43:14.000000000 -0200
-+++ openssl-1.0.2a/doc/ssl/SSL_COMP_add_compression_method.pod 2015-03-27 15:18:47.280054883 -0200
-@@ -47,6 +47,13 @@
- been standardized, the compression API will most likely be changed. Using
- it in the current state is not recommended.
-
-+It is also not recommended to use compression if data transfered contain
-+untrusted parts that can be manipulated by an attacker as he could then
-+get information about the encrypted data. See the CRIME attack. For
-+that reason the default loading of the zlib compression method is
-+disabled and enabled only if the environment variable B<OPENSSL_DEFAULT_ZLIB>
-+is present during the library initialization.
-+
- =head1 RETURN VALUES
-
- SSL_COMP_add_compression_method() may return the following values:
-diff -ru openssl-1.0.2a.orig/ssl/ssl_ciph.c openssl-1.0.2a/ssl/ssl_ciph.c
---- openssl-1.0.2a.orig/ssl/ssl_ciph.c 2015-03-19 15:30:36.000000000 -0200
-+++ openssl-1.0.2a/ssl/ssl_ciph.c 2015-03-27 15:23:05.960057092 -0200
-@@ -141,6 +141,8 @@
- */
-
- #include <stdio.h>
-+#include <stdlib.h>
-+#include <sys/auxv.h>
- #include <openssl/objects.h>
- #ifndef OPENSSL_NO_COMP
- # include <openssl/comp.h>
-@@ -481,7 +483,7 @@
-
- MemCheck_off();
- ssl_comp_methods = sk_SSL_COMP_new(sk_comp_cmp);
-- if (ssl_comp_methods != NULL) {
-+ if (ssl_comp_methods != NULL && getauxval(AT_SECURE) == 0 && getenv("OPENSSL_DEFAULT_ZLIB") != NULL) {
- comp = (SSL_COMP *)OPENSSL_malloc(sizeof(SSL_COMP));
- if (comp != NULL) {
- comp->method = COMP_zlib();
diff --git a/system/openssl/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch b/system/openssl/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
deleted file mode 100644
index ef46faa84..000000000
--- a/system/openssl/1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 83c96cbc76604daccbc31cea9411555aea96fd6d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 5 Feb 2015 09:16:51 +0200
-Subject: [PATCH] crypto/hmac: support EVP_MD_CTX_FLAG_ONESHOT and set it
- properly
-
-Some engines (namely VIA C7 Padlock) work only if EVP_MD_CTX_FLAG_ONESHOT
-is set before final update. This is because some crypto accelerators cannot
-perform non-finalizing transform of the digest.
-
-The usage of EVP_MD_CTX_FLAG_ONESHOT is used semantically slightly
-differently here. It is set before the final EVP_DigestUpdate call, not
-necessarily before EVP_DigestInit call. This will not cause any problems
-though.
----
- crypto/hmac/hmac.c | 14 ++++++++++----
- 1 file changed, 10 insertions(+), 4 deletions(-)
-
-diff --git a/crypto/hmac/hmac.c b/crypto/hmac/hmac.c
-index 1fc9e2c..6f16578 100644
---- a/crypto/hmac/hmac.c
-+++ b/crypto/hmac/hmac.c
-@@ -109,7 +109,8 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
- j = EVP_MD_block_size(md);
- OPENSSL_assert(j <= (int)sizeof(ctx->key));
- if (j < len) {
-- if (!EVP_DigestInit_ex(&ctx->md_ctx, md, impl))
-+ EVP_MD_CTX_set_flags(&ctx->md_ctx, EVP_MD_CTX_FLAG_ONESHOT);
-+ if (!EVP_DigestInit_ex(&ctx->md_ctx, md, impl))
- goto err;
- if (!EVP_DigestUpdate(&ctx->md_ctx, key, len))
- goto err;
-@@ -129,6 +130,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
- if (reset) {
- for (i = 0; i < HMAC_MAX_MD_CBLOCK; i++)
- pad[i] = 0x36 ^ ctx->key[i];
-+ EVP_MD_CTX_clear_flags(&ctx->i_ctx, EVP_MD_CTX_FLAG_ONESHOT);
- if (!EVP_DigestInit_ex(&ctx->i_ctx, md, impl))
- goto err;
- if (!EVP_DigestUpdate(&ctx->i_ctx, pad, EVP_MD_block_size(md)))
-@@ -136,6 +138,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
-
- for (i = 0; i < HMAC_MAX_MD_CBLOCK; i++)
- pad[i] = 0x5c ^ ctx->key[i];
-+ EVP_MD_CTX_clear_flags(&ctx->o_ctx, EVP_MD_CTX_FLAG_ONESHOT);
- if (!EVP_DigestInit_ex(&ctx->o_ctx, md, impl))
- goto err;
- if (!EVP_DigestUpdate(&ctx->o_ctx, pad, EVP_MD_block_size(md)))
-@@ -143,6 +146,7 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
- }
- if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx, &ctx->i_ctx))
- goto err;
-+ EVP_MD_CTX_clear_flags(&ctx->md_ctx, EVP_MD_CTX_FLAG_ONESHOT);
- return 1;
- err:
- return 0;
-@@ -177,6 +181,7 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
- goto err;
- if (!EVP_MD_CTX_copy_ex(&ctx->md_ctx, &ctx->o_ctx))
- goto err;
-+ EVP_MD_CTX_set_flags(&ctx->md_ctx,EVP_MD_CTX_FLAG_ONESHOT);
- if (!EVP_DigestUpdate(&ctx->md_ctx, buf, i))
- goto err;
- if (!EVP_DigestFinal_ex(&ctx->md_ctx, md, len))
-@@ -233,8 +238,9 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
- if (md == NULL)
- md = m;
- HMAC_CTX_init(&c);
-- if (!HMAC_Init(&c, key, key_len, evp_md))
-+ if (!HMAC_Init_ex(&c, key, key_len, evp_md, NULL))
- goto err;
-+ HMAC_CTX_set_flags(&c,EVP_MD_CTX_FLAG_ONESHOT);
- if (!HMAC_Update(&c, d, n))
- goto err;
- if (!HMAC_Final(&c, md, md_len))
-@@ -247,7 +253,7 @@ unsigned char *HMAC(const EVP_MD *evp_md, const void *key, int key_len,
-
- void HMAC_CTX_set_flags(HMAC_CTX *ctx, unsigned long flags)
- {
-- EVP_MD_CTX_set_flags(&ctx->i_ctx, flags);
-- EVP_MD_CTX_set_flags(&ctx->o_ctx, flags);
-+ EVP_MD_CTX_set_flags(&ctx->i_ctx, flags & ~EVP_MD_CTX_FLAG_ONESHOT);
-+ EVP_MD_CTX_set_flags(&ctx->o_ctx, flags & ~EVP_MD_CTX_FLAG_ONESHOT);
- EVP_MD_CTX_set_flags(&ctx->md_ctx, flags);
- }
---
-2.2.2
-
diff --git a/system/openssl/1002-backport-changes-from-upstream-padlock-module.patch b/system/openssl/1002-backport-changes-from-upstream-padlock-module.patch
deleted file mode 100644
index f63bbcd1c..000000000
--- a/system/openssl/1002-backport-changes-from-upstream-padlock-module.patch
+++ /dev/null
@@ -1,200 +0,0 @@
-From ba17588a940ee712c3ef6d458adb1087f0c84521 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 5 Feb 2015 09:28:10 +0200
-Subject: [PATCH] backport changes from upstream padlock module.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Includes support for VIA Nano 64-bit mode.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- engines/e_padlock.c | 142 +++++++++++++++++++++++++++++++++++++++++++++-------
- 1 file changed, 125 insertions(+), 17 deletions(-)
-
-diff --git a/engines/e_padlock.c b/engines/e_padlock.c
-index 2898e4c..94406cb 100644
---- a/engines/e_padlock.c
-+++ b/engines/e_padlock.c
-@@ -101,7 +101,10 @@
- */
- # undef COMPILE_HW_PADLOCK
- # if !defined(I386_ONLY) && !defined(OPENSSL_NO_INLINE_ASM)
--# if (defined(__GNUC__) && (defined(__i386__) || defined(__i386))) || \
-+# if (defined(__GNUC__) && __GNUC__>=2 && \
-+ (defined(__i386__) || defined(__i386) || \
-+ defined(__x86_64__) || defined(__x86_64)) \
-+ ) || \
- (defined(_MSC_VER) && defined(_M_IX86))
- # define COMPILE_HW_PADLOCK
- # endif
-@@ -303,6 +306,7 @@ static volatile struct padlock_cipher_data *padlock_saved_context;
- * =======================================================
- */
- # if defined(__GNUC__) && __GNUC__>=2
-+# if defined(__i386__) || defined(__i386)
- /*
- * As for excessive "push %ebx"/"pop %ebx" found all over.
- * When generating position-independent code GCC won't let
-@@ -379,22 +383,6 @@ static int padlock_available(void)
- return padlock_use_ace + padlock_use_rng;
- }
-
--# ifndef OPENSSL_NO_AES
--# ifndef AES_ASM
--/* Our own htonl()/ntohl() */
--static inline void padlock_bswapl(AES_KEY *ks)
--{
-- size_t i = sizeof(ks->rd_key) / sizeof(ks->rd_key[0]);
-- unsigned int *key = ks->rd_key;
--
-- while (i--) {
-- asm volatile ("bswapl %0":"+r" (*key));
-- key++;
-- }
--}
--# endif
--# endif
--
- /*
- * Force key reload from memory to the CPU microcode. Loading EFLAGS from the
- * stack clears EFLAGS[30] which does the trick.
-@@ -448,6 +436,110 @@ static inline void *name(size_t cnt, \
- : "edx", "cc", "memory"); \
- return iv; \
- }
-+#endif
-+
-+#elif defined(__x86_64__) || defined(__x86_64)
-+
-+/* Load supported features of the CPU to see if
-+ the PadLock is available. */
-+static int
-+padlock_available(void)
-+{
-+ char vendor_string[16];
-+ unsigned int eax, edx;
-+
-+ /* Are we running on the Centaur (VIA) CPU? */
-+ eax = 0x00000000;
-+ vendor_string[12] = 0;
-+ asm volatile (
-+ "cpuid\n"
-+ "movl %%ebx,(%1)\n"
-+ "movl %%edx,4(%1)\n"
-+ "movl %%ecx,8(%1)\n"
-+ : "+a"(eax) : "r"(vendor_string) : "rbx", "rcx", "rdx");
-+ if (strcmp(vendor_string, "CentaurHauls") != 0)
-+ return 0;
-+
-+ /* Check for Centaur Extended Feature Flags presence */
-+ eax = 0xC0000000;
-+ asm volatile ("cpuid"
-+ : "+a"(eax) : : "rbx", "rcx", "rdx");
-+ if (eax < 0xC0000001)
-+ return 0;
-+
-+ /* Read the Centaur Extended Feature Flags */
-+ eax = 0xC0000001;
-+ asm volatile ("cpuid"
-+ : "+a"(eax), "=d"(edx) : : "rbx", "rcx");
-+
-+ /* Fill up some flags */
-+ padlock_use_ace = ((edx & (0x3<<6)) == (0x3<<6));
-+ padlock_use_rng = ((edx & (0x3<<2)) == (0x3<<2));
-+
-+ return padlock_use_ace + padlock_use_rng;
-+}
-+
-+/* Force key reload from memory to the CPU microcode.
-+ Loading EFLAGS from the stack clears EFLAGS[30]
-+ which does the trick. */
-+static inline void
-+padlock_reload_key(void)
-+{
-+ asm volatile ("pushfq; popfq");
-+}
-+
-+#ifndef OPENSSL_NO_AES
-+/*
-+ * This is heuristic key context tracing. At first one
-+ * believes that one should use atomic swap instructions,
-+ * but it's not actually necessary. Point is that if
-+ * padlock_saved_context was changed by another thread
-+ * after we've read it and before we compare it with cdata,
-+ * our key *shall* be reloaded upon thread context switch
-+ * and we are therefore set in either case...
-+ */
-+static inline void
-+padlock_verify_context(struct padlock_cipher_data *cdata)
-+{
-+ asm volatile (
-+ "pushfq\n"
-+" btl $30,(%%rsp)\n"
-+" jnc 1f\n"
-+" cmpq %2,%1\n"
-+" je 1f\n"
-+" popfq\n"
-+" subq $8,%%rsp\n"
-+"1: addq $8,%%rsp\n"
-+" movq %2,%0"
-+ :"+m"(padlock_saved_context)
-+ : "r"(padlock_saved_context), "r"(cdata) : "cc");
-+}
-+
-+/* Template for padlock_xcrypt_* modes */
-+/* BIG FAT WARNING:
-+ * The offsets used with 'leal' instructions
-+ * describe items of the 'padlock_cipher_data'
-+ * structure.
-+ */
-+#define PADLOCK_XCRYPT_ASM(name,rep_xcrypt) \
-+static inline void *name(size_t cnt, \
-+ struct padlock_cipher_data *cdata, \
-+ void *out, const void *inp) \
-+{ void *iv; \
-+ asm volatile ( "leaq 16(%0),%%rdx\n" \
-+ " leaq 32(%0),%%rbx\n" \
-+ rep_xcrypt "\n" \
-+ : "=a"(iv), "=c"(cnt), "=D"(out), "=S"(inp) \
-+ : "0"(cdata), "1"(cnt), "2"(out), "3"(inp) \
-+ : "rbx", "rdx", "cc", "memory"); \
-+ return iv; \
-+}
-+#endif
-+
-+#endif /* cpu */
-+
-+
-+# ifndef OPENSSL_NO_AES
-
- /* Generate all functions with appropriate opcodes */
- /* rep xcryptecb */
-@@ -458,7 +550,23 @@ PADLOCK_XCRYPT_ASM(padlock_xcrypt_ecb, ".byte 0xf3,0x0f,0xa7,0xc8")
- PADLOCK_XCRYPT_ASM(padlock_xcrypt_cfb, ".byte 0xf3,0x0f,0xa7,0xe0")
- /* rep xcryptofb */
- PADLOCK_XCRYPT_ASM(padlock_xcrypt_ofb, ".byte 0xf3,0x0f,0xa7,0xe8")
-+
-+# ifndef AES_ASM
-+/* Our own htonl()/ntohl() */
-+static inline void padlock_bswapl(AES_KEY *ks)
-+{
-+ size_t i = sizeof(ks->rd_key) / sizeof(ks->rd_key[0]);
-+ unsigned int *key = ks->rd_key;
-+
-+ while (i--) {
-+ asm volatile ("bswapl %0":"+r" (*key));
-+ key++;
-+ }
-+}
-+# endif
-+
- # endif
-+
- /* The RNG call itself */
- static inline unsigned int padlock_xstore(void *addr, unsigned int edx_in)
- {
---
-2.2.2
-
diff --git a/system/openssl/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch b/system/openssl/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
deleted file mode 100644
index 5a2cdd633..000000000
--- a/system/openssl/1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
+++ /dev/null
@@ -1,782 +0,0 @@
-From 728af0306505f1ff91364ac2175fb6bf5da90ec3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Thu, 5 Feb 2015 09:41:12 +0200
-Subject: [PATCH] engines/e_padlock: implement sha1/sha224/sha256 acceleration
-
-Limited support for VIA C7 that works only when EVP_MD_CTX_FLAG_ONESHOT
-is used appropriately (as done by EVP_Digest, and my previous HMAC patch).
-
-Full support for VIA Nano including partial transformation and 64-bit mode.
-
-Benchmarks from VIA Nano 1.6GHz, done with including the previous HMAC and
-apps/speed patches done. From single run, error margin of about 100-200k.
-
-No padlock
-
-type 16 bytes 64 bytes 256 bytes 1024 bytes 8192 bytes
-sha1 20057.60k 51514.05k 99721.39k 130167.81k 142811.14k
-sha256 7757.72k 16907.18k 28937.05k 35181.23k 37568.51k
-hmac(sha1) 8582.53k 27644.69k 70402.30k 114602.67k 140167.85k
-
-With the patch
-
-sha1 37713.77k 114562.71k 259637.33k 379907.41k 438818.13k
-sha256 34262.86k 103233.75k 232476.07k 338386.60k 389860.01k
-hmac(sha1) 8424.70k 31475.11k 104036.10k 245559.30k 406667.26k
----
- engines/e_padlock.c | 663 ++++++++++++++++++++++++++++++++++++++++++++++++----
- 1 file changed, 614 insertions(+), 49 deletions(-)
-
-diff --git a/engines/e_padlock.c b/engines/e_padlock.c
-index 94406cb..5e99114 100644
---- a/engines/e_padlock.c
-+++ b/engines/e_padlock.c
-@@ -3,6 +3,9 @@
- * Written by Michal Ludvig <michal@logix.cz>
- * http://www.logix.cz/michal
- *
-+ * SHA support by Timo Teras <timo.teras@iki.fi>. Portions based on
-+ * code originally written by Michal Ludvig.
-+ *
- * Big thanks to Andy Polyakov for a help with optimization,
- * assembler fixes, port to MS Windows and a lot of other
- * valuable work on this engine!
-@@ -63,7 +66,9 @@
- */
-
- #include <stdio.h>
-+#include <stdint.h>
- #include <string.h>
-+#include <netinet/in.h>
-
- #include <openssl/opensslconf.h>
- #include <openssl/crypto.h>
-@@ -73,11 +78,32 @@
- #ifndef OPENSSL_NO_AES
- # include <openssl/aes.h>
- #endif
-+#ifndef OPENSSL_NO_SHA
-+# include <openssl/sha.h>
-+#endif
- #include <openssl/rand.h>
- #include <openssl/err.h>
-
- #ifndef OPENSSL_NO_HW
--# ifndef OPENSSL_NO_HW_PADLOCK
-+# ifndef OPENSSL_NO_HW_PADLOCK
-+
-+/* PadLock RNG is disabled by default */
-+# define PADLOCK_NO_RNG 1
-+
-+/* No ASM routines for SHA in MSC yet */
-+# ifdef _MSC_VER
-+# define OPENSSL_NO_SHA
-+# endif
-+
-+/* 64-bit mode does not need software SHA1 as fallback, we can
-+ * do all operations with padlock */
-+# if defined(__x86_64__) || defined(__x86_64)
-+# define PADLOCK_NEED_FALLBACK_SHA 0
-+# else
-+# define PADLOCK_NEED_FALLBACK_SHA 1
-+# endif
-+
-+# define PADLOCK_MAX_FINALIZING_LENGTH 0x1FFFFFFE
-
- /* Attempt to have a single source for both 0.9.7 and 0.9.8 :-) */
- # if (OPENSSL_VERSION_NUMBER >= 0x00908000L)
-@@ -151,60 +177,42 @@ void ENGINE_load_padlock(void)
- static int padlock_available(void);
- static int padlock_init(ENGINE *e);
-
-+# ifndef PADLOCK_NO_RNG
- /* RNG Stuff */
- static RAND_METHOD padlock_rand;
--
--/* Cipher Stuff */
--# ifndef OPENSSL_NO_AES
--static int padlock_ciphers(ENGINE *e, const EVP_CIPHER **cipher,
-- const int **nids, int nid);
- # endif
-
- /* Engine names */
- static const char *padlock_id = "padlock";
- static char padlock_name[100];
-
-+static int padlock_bind_helper(ENGINE *e);
-+
- /* Available features */
--static int padlock_use_ace = 0; /* Advanced Cryptography Engine */
--static int padlock_use_rng = 0; /* Random Number Generator */
-+enum padlock_flags {
-+ PADLOCK_RNG = 0x01,
-+ PADLOCK_ACE = 0x02,
-+ PADLOCK_ACE2 = 0x04,
-+ PADLOCK_PHE = 0x08,
-+ PADLOCK_PMM = 0x10,
-+ PADLOCK_NANO = 0x20,
-+};
-+enum padlock_flags padlock_flags;
-+
-+#define PADLOCK_HAVE_RNG (padlock_flags & PADLOCK_RNG)
-+#define PADLOCK_HAVE_ACE (padlock_flags & (PADLOCK_ACE|PADLOCK_ACE2))
-+#define PADLOCK_HAVE_ACE1 (padlock_flags & PADLOCK_ACE)
-+#define PADLOCK_HAVE_ACE2 (padlock_flags & PADLOCK_ACE2)
-+#define PADLOCK_HAVE_PHE (padlock_flags & PADLOCK_PHE)
-+#define PADLOCK_HAVE_PMM (padlock_flags & PADLOCK_PMM)
-+#define PADLOCK_HAVE_NANO (padlock_flags & PADLOCK_NANO)
-+
- # ifndef OPENSSL_NO_AES
- static int padlock_aes_align_required = 1;
- # endif
-
- /* ===== Engine "management" functions ===== */
-
--/* Prepare the ENGINE structure for registration */
--static int padlock_bind_helper(ENGINE *e)
--{
-- /* Check available features */
-- padlock_available();
--
--# if 1 /* disable RNG for now, see commentary in
-- * vicinity of RNG code */
-- padlock_use_rng = 0;
--# endif
--
-- /* Generate a nice engine name with available features */
-- BIO_snprintf(padlock_name, sizeof(padlock_name),
-- "VIA PadLock (%s, %s)",
-- padlock_use_rng ? "RNG" : "no-RNG",
-- padlock_use_ace ? "ACE" : "no-ACE");
--
-- /* Register everything or return with an error */
-- if (!ENGINE_set_id(e, padlock_id) ||
-- !ENGINE_set_name(e, padlock_name) ||
-- !ENGINE_set_init_function(e, padlock_init) ||
--# ifndef OPENSSL_NO_AES
-- (padlock_use_ace && !ENGINE_set_ciphers(e, padlock_ciphers)) ||
--# endif
-- (padlock_use_rng && !ENGINE_set_RAND(e, &padlock_rand))) {
-- return 0;
-- }
--
-- /* Everything looks good */
-- return 1;
--}
--
- # ifdef OPENSSL_NO_DYNAMIC_ENGINE
-
- /* Constructor */
-@@ -229,7 +237,7 @@ static ENGINE *ENGINE_padlock(void)
- /* Check availability of the engine */
- static int padlock_init(ENGINE *e)
- {
-- return (padlock_use_rng || padlock_use_ace);
-+ return padlock_flags;
- }
-
- /*
-@@ -377,10 +385,20 @@ static int padlock_available(void)
- "=d"(edx)::"ecx");
-
- /* Fill up some flags */
-- padlock_use_ace = ((edx & (0x3 << 6)) == (0x3 << 6));
-- padlock_use_rng = ((edx & (0x3 << 2)) == (0x3 << 2));
--
-- return padlock_use_ace + padlock_use_rng;
-+ padlock_flags |= ((edx & (0x3<<3)) ? PADLOCK_RNG : 0);
-+ padlock_flags |= ((edx & (0x3<<7)) ? PADLOCK_ACE : 0);
-+ padlock_flags |= ((edx & (0x3<<9)) ? PADLOCK_ACE2 : 0);
-+ padlock_flags |= ((edx & (0x3<<11)) ? PADLOCK_PHE : 0);
-+ padlock_flags |= ((edx & (0x3<<13)) ? PADLOCK_PMM : 0);
-+
-+ /* Check for VIA Nano CPU */
-+ eax = 0x00000001;
-+ asm volatile ("pushl %%ebx; cpuid; popl %%ebx"
-+ : "+a"(eax) : : "ecx", "edx");
-+ if ((eax | 0x000F) == 0x06FF)
-+ padlock_flags |= PADLOCK_NANO;
-+
-+ return padlock_flags;
- }
-
- /*
-@@ -473,10 +491,14 @@ padlock_available(void)
- : "+a"(eax), "=d"(edx) : : "rbx", "rcx");
-
- /* Fill up some flags */
-- padlock_use_ace = ((edx & (0x3<<6)) == (0x3<<6));
-- padlock_use_rng = ((edx & (0x3<<2)) == (0x3<<2));
--
-- return padlock_use_ace + padlock_use_rng;
-+ padlock_flags |= ((edx & (0x3<<3)) ? PADLOCK_RNG : 0);
-+ padlock_flags |= ((edx & (0x3<<7)) ? PADLOCK_ACE : 0);
-+ padlock_flags |= ((edx & (0x3<<9)) ? PADLOCK_ACE2 : 0);
-+ padlock_flags |= ((edx & (0x3<<11)) ? PADLOCK_PHE : 0);
-+ padlock_flags |= ((edx & (0x3<<13)) ? PADLOCK_PMM : 0);
-+ padlock_flags |= PADLOCK_NANO;
-+
-+ return padlock_flags;
- }
-
- /* Force key reload from memory to the CPU microcode.
-@@ -1293,6 +1315,496 @@ padlock_aes_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out_arg,
-
- # endif /* OPENSSL_NO_AES */
-
-+#ifndef OPENSSL_NO_SHA
-+
-+static inline void
-+padlock_copy_bswap(void *dst, void *src, size_t count)
-+{
-+ uint32_t *udst = dst, *usrc = src;
-+ int i = 0;
-+
-+ for (i = 0; i < count; i++)
-+ udst[i] = htonl(usrc[i]);
-+}
-+
-+static unsigned long padlock_sha_prepare_padding(
-+ EVP_MD_CTX *ctx,
-+ unsigned char *padding,
-+ unsigned char *data, size_t data_len,
-+ uint64_t total)
-+{
-+ unsigned int padding_len;
-+
-+ padding_len = data_len < 56 ? SHA_CBLOCK : 2 * SHA_CBLOCK;
-+ if (data_len)
-+ memcpy(padding, data, data_len);
-+
-+ memset(padding + data_len, 0, padding_len - data_len);
-+ padding[data_len] = 0x80;
-+ *(uint32_t *)(padding + padding_len - 8) = htonl(total >> 32);
-+ *(uint32_t *)(padding + padding_len - 4) = htonl(total & 0xffffffff);
-+
-+ return data_len < 56 ? 1 : 2;
-+}
-+
-+#define PADLOCK_SHA_ALIGN(dd) (uint32_t*)(((uintptr_t)(dd) + 15) & ~15)
-+#define PADLOCK_SHA_HWCTX (128+16)
-+
-+static void
-+padlock_sha1(void *hwctx, const void *buf, unsigned long total, unsigned long now)
-+{
-+ unsigned long pos = total - now;
-+
-+ asm volatile ("xsha1"
-+ : "+S"(buf), "+D"(hwctx), "+a"(pos), "+c"(total)
-+ : : "memory");
-+}
-+
-+static void
-+padlock_sha1_partial(void *hwctx, const void *buf, unsigned long blocks)
-+{
-+ asm volatile ("xsha1"
-+ : "+S"(buf), "+D"(hwctx), "+c"(blocks)
-+ : "a"(-1L) : "memory");
-+}
-+
-+static int padlock_sha1_init(EVP_MD_CTX *ctx)
-+{
-+ return SHA1_Init(ctx->md_data);
-+}
-+
-+#if PADLOCK_NEED_FALLBACK_SHA
-+
-+static int padlock_sha1_update_eden(EVP_MD_CTX *ctx, const void *data,
-+ size_t len)
-+{
-+ unsigned char hwctx[PADLOCK_SHA_HWCTX];
-+ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx);
-+ SHA_CTX *c = ctx->md_data;
-+ uint_fast64_t total;
-+ const unsigned char *p = data;
-+ unsigned long l = 0;
-+
-+ /* Calculate total length (Nl,Nh) is length in bits */
-+ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3);
-+ total += len;
-+
-+ if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) &&
-+ (total <= PADLOCK_MAX_FINALIZING_LENGTH)) {
-+ if (c->num != 0) {
-+ l = (len < SHA_CBLOCK - c->num) ? len : (SHA_CBLOCK - c->num);
-+ if (!SHA1_Update(c, data, l))
-+ return 0;
-+ p += l;
-+ if (c->num != 0) {
-+ p = (unsigned char *) c->data;
-+ len = c->num;
-+ l = 0;
-+ }
-+ }
-+ memcpy(aligned, &c->h0, 5 * sizeof(SHA_LONG));
-+ padlock_sha1(aligned, p, total, len - l);
-+ memcpy(&c->h0, aligned, 5 * sizeof(SHA_LONG));
-+ c->num = -1;
-+ return 1;
-+ }
-+
-+ return SHA1_Update(c, data, len);
-+}
-+#endif
-+
-+static int padlock_sha1_update(EVP_MD_CTX *ctx, const void *data,
-+ size_t len)
-+{
-+ unsigned char hwctx[PADLOCK_SHA_HWCTX];
-+ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx);
-+ SHA_CTX *c = ctx->md_data;
-+ uint_fast64_t total;
-+ unsigned char *p;
-+ unsigned long n;
-+
-+ /* Calculate total length (Nl,Nh) is length in bits */
-+ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3);
-+ total += len;
-+ c->Nh = total >> 29;
-+ c->Nl = (total << 3) & 0xffffffffUL;
-+
-+ memcpy(aligned, &c->h0, 5 * sizeof(SHA_LONG));
-+
-+ /* Check partial data */
-+ n = c->num;
-+ if (n) {
-+ p = (unsigned char *) c->data;
-+ if (len >= SHA_CBLOCK || len+n >= SHA_CBLOCK) {
-+ memcpy(p+n, data, SHA_CBLOCK-n);
-+ padlock_sha1_partial(aligned, p, 1);
-+ n = SHA_CBLOCK - n;
-+ data += n;
-+ len -= n;
-+ c->num = 0;
-+ memset(p, 0, SHA_CBLOCK);
-+ } else {
-+ memcpy(p+n, data, len);
-+ c->num += (unsigned int)len;
-+ return 1;
-+ }
-+ }
-+
-+ /* Can we finalize straight away? */
-+ if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) &&
-+ (total <= PADLOCK_MAX_FINALIZING_LENGTH)) {
-+ padlock_sha1(aligned, data, total, len);
-+ memcpy(&c->h0, aligned, 5 * sizeof(SHA_LONG));
-+ c->num = -1;
-+ return 1;
-+ }
-+
-+ /* Use nonfinalizing update */
-+ n = len / SHA_CBLOCK;
-+ if (n != 0) {
-+ padlock_sha1_partial(aligned, data, n);
-+ data += n * SHA_CBLOCK;
-+ len -= n * SHA_CBLOCK;
-+ }
-+ memcpy(&c->h0, aligned, 5 * sizeof(SHA_LONG));
-+
-+ /* Buffer remaining bytes */
-+ if (len) {
-+ memcpy(c->data, data, len);
-+ c->num = len;
-+ }
-+
-+ return 1;
-+}
-+
-+static int padlock_sha1_final(EVP_MD_CTX *ctx, unsigned char *md)
-+{
-+ unsigned char hwctx[PADLOCK_SHA_HWCTX];
-+ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx);
-+ uint64_t total;
-+ SHA_CTX *c = ctx->md_data;
-+
-+ if (c->num == -1) {
-+ padlock_copy_bswap(md, &c->h0, 5);
-+ c->num = 0;
-+ return 1;
-+ }
-+
-+ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3);
-+#if PADLOCK_NEED_FALLBACK_SHA
-+ if ((!PADLOCK_HAVE_NANO) && (total > PADLOCK_MAX_FINALIZING_LENGTH))
-+ return SHA1_Final(md, c);
-+#endif
-+
-+ memcpy(aligned, &c->h0, 5 * sizeof(SHA_LONG));
-+ if (total > PADLOCK_MAX_FINALIZING_LENGTH) {
-+ unsigned char padding[2 * SHA_CBLOCK];
-+ unsigned long n;
-+
-+ n = padlock_sha_prepare_padding(ctx, padding,
-+ (unsigned char *) c->data, c->num, total << 3);
-+ padlock_sha1_partial(aligned, padding, n);
-+ } else {
-+ padlock_sha1(aligned, c->data, total, c->num);
-+ }
-+ padlock_copy_bswap(md, aligned, 5);
-+ c->num = 0;
-+
-+ return 1;
-+}
-+
-+static EVP_MD padlock_sha1_md = {
-+ NID_sha1,
-+ NID_sha1WithRSAEncryption,
-+ SHA_DIGEST_LENGTH,
-+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE,
-+ padlock_sha1_init,
-+ padlock_sha1_update,
-+ padlock_sha1_final,
-+ NULL,
-+ NULL,
-+ EVP_PKEY_RSA_method,
-+ SHA_CBLOCK,
-+ sizeof(SHA_CTX),
-+};
-+
-+static EVP_MD padlock_dss1_md = {
-+ NID_dsa,
-+ NID_dsaWithSHA1,
-+ SHA_DIGEST_LENGTH,
-+ 0,
-+ padlock_sha1_init,
-+ padlock_sha1_update,
-+ padlock_sha1_final,
-+ NULL,
-+ NULL,
-+ EVP_PKEY_DSA_method,
-+ SHA_CBLOCK,
-+ sizeof(SHA_CTX),
-+};
-+
-+
-+#if !defined(OPENSSL_NO_SHA256)
-+
-+static void
-+padlock_sha256(void *hwctx, const void *buf, unsigned long total, unsigned long now)
-+{
-+ unsigned long pos = total - now;
-+
-+ asm volatile ("xsha256"
-+ : "+S"(buf), "+D"(hwctx), "+a"(pos), "+c"(total)
-+ : : "memory");
-+}
-+
-+static void
-+padlock_sha256_partial(void *hwctx, const void *buf, unsigned long blocks)
-+{
-+ asm volatile ("xsha256"
-+ : "+S"(buf), "+D"(hwctx), "+c"(blocks)
-+ : "a"(-1L) : "memory");
-+}
-+
-+#if PADLOCK_NEED_FALLBACK_SHA
-+
-+static int padlock_sha256_update_eden(EVP_MD_CTX *ctx, const void *data,
-+ size_t len)
-+{
-+ unsigned char hwctx[PADLOCK_SHA_HWCTX];
-+ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx);
-+ SHA256_CTX *c = ctx->md_data;
-+ uint_fast64_t total;
-+ const unsigned char *p = data;
-+ unsigned int l = 0;
-+
-+ /* Calculate total length (Nl,Nh) is length in bits */
-+ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3);
-+ total += len;
-+
-+ if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) &&
-+ (total <= PADLOCK_MAX_FINALIZING_LENGTH)) {
-+ if (c->num != 0) {
-+ l = (len < SHA256_CBLOCK - c->num) ? len : (SHA256_CBLOCK - c->num);
-+ if (!SHA256_Update(c, data, l))
-+ return 0;
-+ p += l;
-+ if (c->num != 0) {
-+ p = (unsigned char *) c->data;
-+ len = c->num;
-+ l = 0;
-+ }
-+ }
-+ memcpy(aligned, c->h, sizeof(c->h));
-+ padlock_sha256(aligned, p, total, len - l);
-+ memcpy(c->h, aligned, sizeof(c->h));
-+ c->num = -1;
-+ return 1;
-+ }
-+
-+ return SHA256_Update(c, data, len);
-+}
-+
-+#endif
-+
-+static int padlock_sha256_update(EVP_MD_CTX *ctx, const void *data,
-+ size_t len)
-+{
-+ unsigned char hwctx[PADLOCK_SHA_HWCTX];
-+ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx);
-+ SHA256_CTX *c = ctx->md_data;
-+ uint_fast64_t total;
-+ unsigned char *p;
-+ unsigned long n;
-+
-+ /* Calculate total length (Nl,Nh) is length in bits */
-+ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3);
-+ total += len;
-+ c->Nh = total >> 29;
-+ c->Nl = (total << 3) & 0xffffffffUL;
-+
-+ memcpy(aligned, c->h, sizeof(c->h));
-+
-+ /* Check partial data */
-+ n = c->num;
-+ if (n) {
-+ p = (unsigned char *) c->data;
-+ if (len >= SHA256_CBLOCK || len+n >= SHA256_CBLOCK) {
-+ memcpy(p+n, data, SHA256_CBLOCK-n);
-+ padlock_sha256_partial(aligned, p, 1);
-+ n = SHA256_CBLOCK - n;
-+ data += n;
-+ len -= n;
-+ c->num = 0;
-+ memset(p, 0, SHA256_CBLOCK);
-+ } else {
-+ memcpy(p+n, data, len);
-+ c->num += (unsigned int)len;
-+ return 1;
-+ }
-+ }
-+
-+ /* Can we finalize straight away? */
-+ if ((ctx->flags & EVP_MD_CTX_FLAG_ONESHOT) &&
-+ (total <= PADLOCK_MAX_FINALIZING_LENGTH)) {
-+ padlock_sha256(aligned, data, total, len);
-+ memcpy(c->h, aligned, sizeof(c->h));
-+ c->num = -1;
-+ return 1;
-+ }
-+
-+ /* Use nonfinalizing update */
-+ n = len / SHA256_CBLOCK;
-+ if (n != 0) {
-+ padlock_sha256_partial(aligned, data, n);
-+ data += n * SHA256_CBLOCK;
-+ len -= n * SHA256_CBLOCK;
-+ }
-+ memcpy(c->h, aligned, sizeof(c->h));
-+
-+ /* Buffer remaining bytes */
-+ if (len) {
-+ memcpy(c->data, data, len);
-+ c->num = len;
-+ }
-+
-+ return 1;
-+}
-+
-+static int padlock_sha256_final(EVP_MD_CTX *ctx, unsigned char *md)
-+{
-+ unsigned char hwctx[PADLOCK_SHA_HWCTX];
-+ uint32_t *aligned = PADLOCK_SHA_ALIGN(hwctx);
-+ uint64_t total;
-+ SHA256_CTX *c = ctx->md_data;
-+
-+ if (c->num == -1) {
-+ padlock_copy_bswap(md, c->h, sizeof(c->h)/sizeof(c->h[0]));
-+ c->num = 0;
-+ return 1;
-+ }
-+
-+ total = (((uint_fast64_t) c->Nh) << 29) + (c->Nl >> 3);
-+#if PADLOCK_NEED_FALLBACK_SHA
-+ if ((!PADLOCK_HAVE_NANO) && (total > PADLOCK_MAX_FINALIZING_LENGTH))
-+ return SHA256_Final(md, c);
-+#endif
-+
-+ memcpy(aligned, c->h, sizeof(c->h));
-+ if (total > PADLOCK_MAX_FINALIZING_LENGTH) {
-+ unsigned char padding[2 * SHA_CBLOCK];
-+ unsigned long n;
-+
-+ n = padlock_sha_prepare_padding(ctx, padding,
-+ (unsigned char *) c->data, c->num, total << 3);
-+ padlock_sha256_partial(aligned, padding, n);
-+ } else {
-+ padlock_sha256(aligned, c->data, total, c->num);
-+ }
-+ padlock_copy_bswap(md, aligned, sizeof(c->h)/sizeof(c->h[0]));
-+ c->num = 0;
-+ return 1;
-+}
-+
-+#if !defined(OPENSSL_NO_SHA224)
-+
-+static int padlock_sha224_init(EVP_MD_CTX *ctx)
-+{
-+ return SHA224_Init(ctx->md_data);
-+}
-+
-+static EVP_MD padlock_sha224_md = {
-+ NID_sha224,
-+ NID_sha224WithRSAEncryption,
-+ SHA224_DIGEST_LENGTH,
-+ 0,
-+ padlock_sha224_init,
-+ padlock_sha256_update,
-+ padlock_sha256_final,
-+ NULL,
-+ NULL,
-+ EVP_PKEY_RSA_method,
-+ SHA_CBLOCK,
-+ sizeof(SHA256_CTX),
-+};
-+#endif /* !OPENSSL_NO_SHA224 */
-+
-+static int padlock_sha256_init(EVP_MD_CTX *ctx)
-+{
-+ return SHA256_Init(ctx->md_data);
-+}
-+
-+static EVP_MD padlock_sha256_md = {
-+ NID_sha256,
-+ NID_sha256WithRSAEncryption,
-+ SHA256_DIGEST_LENGTH,
-+ 0,
-+ padlock_sha256_init,
-+ padlock_sha256_update,
-+ padlock_sha256_final,
-+ NULL,
-+ NULL,
-+ EVP_PKEY_RSA_method,
-+ SHA_CBLOCK,
-+ sizeof(SHA256_CTX),
-+};
-+#endif /* !OPENSSL_NO_SHA256 */
-+
-+static int padlock_digest_nids[] = {
-+#if !defined(OPENSSL_NO_SHA)
-+ NID_sha1,
-+ NID_dsa,
-+#endif
-+#if !defined(OPENSSL_NO_SHA256)
-+#if !defined(OPENSSL_NO_SHA224)
-+ NID_sha224,
-+#endif
-+ NID_sha256,
-+#endif
-+};
-+
-+static int padlock_digest_nids_num = sizeof(padlock_digest_nids)/sizeof(padlock_digest_nids[0]);
-+
-+static int
-+padlock_digests (ENGINE *e, const EVP_MD **digest, const int **nids, int nid)
-+{
-+ /* No specific digest => return a list of supported nids ... */
-+ if (!digest) {
-+ *nids = padlock_digest_nids;
-+ return padlock_digest_nids_num;
-+ }
-+
-+ /* ... or the requested "digest" otherwise */
-+ switch (nid) {
-+#if !defined(OPENSSL_NO_SHA)
-+ case NID_sha1:
-+ *digest = &padlock_sha1_md;
-+ break;
-+ case NID_dsa:
-+ *digest = &padlock_dss1_md;
-+ break;
-+#endif
-+#if !defined(OPENSSL_NO_SHA256)
-+#if !defined(OPENSSL_NO_SHA224)
-+ case NID_sha224:
-+ *digest = &padlock_sha224_md;
-+ break;
-+#endif /* OPENSSL_NO_SHA224 */
-+ case NID_sha256:
-+ *digest = &padlock_sha256_md;
-+ break;
-+#endif /* OPENSSL_NO_SHA256 */
-+ default:
-+ /* Sorry, we don't support this NID */
-+ *digest = NULL;
-+ return 0;
-+ }
-+
-+ return 1;
-+}
-+
-+#endif /* OPENSSL_NO_SHA */
-+
-+#ifndef PADLOCK_NO_RNG
-+
- /* ===== Random Number Generator ===== */
- /*
- * This code is not engaged. The reason is that it does not comply
-@@ -1356,6 +1868,59 @@ static RAND_METHOD padlock_rand = {
- padlock_rand_bytes, /* pseudorand */
- padlock_rand_status, /* rand status */
- };
-+#endif /* PADLOCK_NO_RNG */
-+
-+/* Prepare the ENGINE structure for registration */
-+static int
-+padlock_bind_helper(ENGINE *e)
-+{
-+ /* Check available features */
-+ padlock_available();
-+
-+ /* Generate a nice engine name with available features */
-+ BIO_snprintf(padlock_name, sizeof(padlock_name),
-+ "VIA PadLock: %s%s%s%s%s%s",
-+ padlock_flags ? "" : "not supported",
-+ PADLOCK_HAVE_RNG ? "RNG " : "",
-+ PADLOCK_HAVE_ACE ? (PADLOCK_HAVE_ACE2 ? "ACE2 " : "ACE ") : "",
-+ PADLOCK_HAVE_PHE ? "PHE " : "",
-+ PADLOCK_HAVE_PMM ? "PMM " : "",
-+ PADLOCK_HAVE_NANO ? "NANO " : ""
-+ );
-+
-+#if PADLOCK_NEED_FALLBACK_SHA && !defined(OPENSSL_NO_SHA)
-+ if (!PADLOCK_HAVE_NANO) {
-+ padlock_sha1_md.update = padlock_sha1_update_eden;
-+ padlock_dss1_md.update = padlock_sha1_update_eden;
-+#if !defined(OPENSSL_NO_SHA256)
-+#if !defined(OPENSSL_NO_SHA224)
-+ padlock_sha224_md.update = padlock_sha256_update_eden;
-+#endif
-+ padlock_sha256_md.update = padlock_sha256_update_eden;
-+#endif
-+ }
-+#endif
-+
-+ /* Register everything or return with an error */
-+ if (!ENGINE_set_id(e, padlock_id) ||
-+ !ENGINE_set_name(e, padlock_name) ||
-+ !ENGINE_set_init_function(e, padlock_init)
-+#ifndef OPENSSL_NO_AES
-+ || (PADLOCK_HAVE_ACE && !ENGINE_set_ciphers (e, padlock_ciphers))
-+#endif
-+#ifndef OPENSSL_NO_SHA
-+ || (PADLOCK_HAVE_PHE && !ENGINE_set_digests (e, padlock_digests))
-+#endif
-+#ifndef PADLOCK_NO_RNG
-+ || (PADLOCK_HAVE_RNG && !ENGINE_set_RAND (e, &padlock_rand))
-+#endif
-+ ) {
-+ return 0;
-+ }
-+
-+ /* Everything looks good */
-+ return 1;
-+}
-
- # else /* !COMPILE_HW_PADLOCK */
- # ifndef OPENSSL_NO_DYNAMIC_ENGINE
---
-2.2.2
-
diff --git a/system/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch b/system/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch
deleted file mode 100644
index 66f37451e..000000000
--- a/system/openssl/1004-crypto-engine-autoload-padlock-dynamic-engine.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From a58658f191e83f4c6417d2cc879fa572f7978537 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 4 Feb 2016 16:28:15 +0100
-Subject: [PATCH] crypto/engine: autoload padlock dynamic engine
-
----
- crypto/engine/eng_all.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/crypto/engine/eng_all.c b/crypto/engine/eng_all.c
-index 48ad0d2..822aa23 100644
---- a/crypto/engine/eng_all.c
-+++ b/crypto/engine/eng_all.c
-@@ -120,6 +120,16 @@ void ENGINE_load_builtin_engines(void)
- ENGINE_load_capi();
- # endif
- #endif
-+#ifdef OPENSSL_NO_STATIC_ENGINE
-+ {
-+ ENGINE *e = ENGINE_by_id("padlock");
-+ if (e != NULL) {
-+ ENGINE_add(e);
-+ ENGINE_free(e);
-+ ERR_clear_error();
-+ }
-+ }
-+#endif
- ENGINE_register_all_complete();
- }
-
---
-2.7.0
-
diff --git a/system/openssl/APKBUILD b/system/openssl/APKBUILD
index 3a777064b..070d3d0e2 100644
--- a/system/openssl/APKBUILD
+++ b/system/openssl/APKBUILD
@@ -1,30 +1,19 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=openssl
-pkgver=1.0.2t
+pkgver=1.1.1d
pkgrel=0
-pkgdesc="Toolkit for SSL v2/v3 and TLS v1"
+pkgdesc="Toolkit for SSL and TLS"
url="https://www.openssl.org/"
arch="all"
license="OpenSSL"
depends=""
-depends_dev="zlib-dev"
checkdepends="perl"
makedepends_build="perl"
-makedepends_host="zlib-dev"
-makedepends="$makedepends_host $makedepends_build"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libcrypto1.0:libcrypto
- libssl1.0:libssl"
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libcrypto1.1:libcrypto
+ libssl1.1:libssl"
source="https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
- 0003-use-termios.patch
- 0004-fix-default-ca-path-for-apps.patch
- 0005-fix-parallel-build.patch
- 0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
- 0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
- 0009-no-rpath.patch
- 0010-ssl-env-zlib.patch
- 1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
- 1002-backport-changes-from-upstream-padlock-module.patch
- 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch
+ CVE-2019-1551.patch
+ ppc64.patch
"
# secfixes:
@@ -67,6 +56,8 @@ source="https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz
# 1.0.2t-r0:
# - CVE-2019-1547
# - CVE-2019-1563
+# 1.1.1d-r0:
+# - CVE-2019-1551
build() {
# openssl will prepend crosscompile always core CC et al
@@ -79,10 +70,10 @@ build() {
aarch64*) _target="linux-aarch64" ;;
arm*) _target="linux-armv4" ;;
ppc) _target="linux-ppc" ;;
- ppc64) _target="linux-ppc64"; _optflags="no-asm" ;;
+ ppc64) _target="linux-ppc64" ;;
ppc64le) _target="linux-ppc64le" ;;
i528 | pmmx | x86) _target="linux-elf" ;;
- x86_64) _target="linux-x86_64"; _optflags="enable-ec_nistp_64_gcc_128" ;;
+ x86_64) _target="linux-x86_64" ;;
s390x) _target="linux64-s390x";;
*) msg "Unable to determine architecture from (CARCH=$CARCH)" ; return 1 ;;
esac
@@ -94,37 +85,40 @@ build() {
perl ./Configure $_target --prefix=/usr \
--libdir=lib \
--openssldir=/etc/ssl \
- shared zlib enable-montasm enable-md2 $_optflags \
- -DOPENSSL_NO_BUF_FREELISTS \
- $CPPFLAGS $CFLAGS $LDFLAGS -Wa,--noexecstack \
- enable-ssl2
-
- make && make build-shared
+ shared no-zlib enable-md2 no-weak-ssl-ciphers \
+ $CPPFLAGS $CFLAGS $LDFLAGS -Wa,--noexecstack
+ make
}
check() {
- make -j1 test
+ make test
}
package() {
- make INSTALL_PREFIX="$pkgdir" MANDIR=/usr/share/man MANSUFFIX=ssl install
- # remove the script c_rehash
+ make DESTDIR="$pkgdir" install
rm "$pkgdir"/usr/bin/c_rehash
+
+ for _manfile in "$pkgdir"/usr/share/man/man1/*; do
+ case _manfile in
+ openssl*) ;;
+ *) mv $_manfile "$pkgdir"/usr/share/man/man1/openssl-$(basename $_manfile)
+ esac
+ done
}
libcrypto() {
- pkgdesc="Crypto library from openssl"
+ pkgdesc="OpenSSL cryptography library"
mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
for i in "$pkgdir"/usr/lib/libcrypto*; do
mv $i "$subpkgdir"/lib/
ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/}
done
- mv "$pkgdir"/usr/lib/engines "$subpkgdir"/usr/lib/
+ mv "$pkgdir"/usr/lib/engines-1.1 "$subpkgdir"/usr/lib/
}
libssl() {
- pkgdesc="SSL shared libraries"
+ pkgdesc="OpenSSL socket library"
mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
for i in "$pkgdir"/usr/lib/libssl*; do
@@ -133,14 +127,6 @@ libssl() {
done
}
-sha512sums="0b88868933f42fab87e8b22449435a1091cc6e75f986aad6c173e01ad123161fcae8c226759073701bc65c9f2f0b6ce6a63a61203008ed873cfb6e484f32bc71 openssl-1.0.2t.tar.gz
-58e42058a0c8086c49d681b1e226da39a8cf8cb88c51cf739dec2ff12e1bb5d7208ac5033264b186d58e9bdfe992fe9ddb95701d01caf1824396b2cefe30c0a4 0003-use-termios.patch
-c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723ef1ceed092d36e3c15a9777daa844f59b9fa2b0a4f04fd9ae 0004-fix-default-ca-path-for-apps.patch
-5d4191482f8bbf62c75fe6bc2d9587388022c3310703c2a913788a983b1d1406e706cf3916a5792604f0b0f220a87432d3b82b442cea9915f2abb6fdd8478fcb 0005-fix-parallel-build.patch
-820d4ce1c222696fe3f1dd0d11815c06262ec230fdb174532fd507286667a0aefbf858ea5edac4245a54b950cd0556545ecd0c5cf494692a2ba131c667e7bcd5 0006-add-ircv3-tls-3.1-extension-support-to-s_client.patch
-17ad683bb91a3a3c5bcc456c8aed7f0b42414c6de06ebafa4753af93c42d9827c9978a43d4d53d741a45df7f7895c6f6163172af57cc7b391cfd15f45ce6c351 0008-maintain-abi-compat-with-no-freelist-and-regular-bui.patch
-5dbbc01985190ae1254350fb12565beb6abb916b6a7bb1f0f22d9762b1e575d124aaf9aa4cfe5f908e420978f691072d48c61a72660f09dfd6d9a2f83f862bc1 0009-no-rpath.patch
-5febe20948e3f12d981e378e1f4ea538711657aacb6865a1aa91339d4a04277e250f490a1f2abc2c6f290bdc2b1bffdba1d00983b4c09f7ea983eef8163f9420 0010-ssl-env-zlib.patch
-8c181760d7a149aa18d246d50f1c0438ffb63c98677b05306dfc00400ad0429b47d31e7c8d85126005c67f743d23e7a8a81174ffe98556f4caf9cf6b04d9ff17 1001-crypto-hmac-support-EVP_MD_CTX_FLAG_ONESHOT-and-set-.patch
-a3555440b5f544bfd6b9ad97557d8f4c1d673f6a35219f65056a72035d186be5f354717ddf9784899b602464d48657b090ade24379552d43af97609c0f48c389 1002-backport-changes-from-upstream-padlock-module.patch
-6353c7a94016c20db5d683dde37775f6780952ecdb1a5f39f878d04ba37f6ad79ae10fb6d65d181d912505a5d1e22463004cd855d548b364c00b120da2b0fdbc 1003-engines-e_padlock-implement-sha1-sha224-sha256-accel.patch"
+sha512sums="2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7 openssl-1.1.1d.tar.gz
+11ca61515a89766241fe0fae27f3b39767128915f288ea88840bf93e8b50ac416024cb2153efcdf2658d3e82a8e4250a0c069333dbd7347475f9dafcc45370b5 CVE-2019-1551.patch
+66bbb0ae769643c8a0b1501d9c8466f08f0d8b3b2bc4fcc2c0c054ab1971ced85c07aa0e4b8168a4394d0ae407dfbd26066a7a068602ce5b58e459b12ce6d36a ppc64.patch"
diff --git a/system/openssl/CVE-2019-1551.patch b/system/openssl/CVE-2019-1551.patch
new file mode 100644
index 000000000..8daf04ebf
--- /dev/null
+++ b/system/openssl/CVE-2019-1551.patch
@@ -0,0 +1,757 @@
+From 419102400a2811582a7a3d4a4e317d72e5ce0a8f Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Wed, 4 Dec 2019 12:48:21 +0100
+Subject: [PATCH] Fix an overflow bug in rsaz_512_sqr
+
+There is an overflow bug in the x64_64 Montgomery squaring procedure used in
+exponentiation with 512-bit moduli. No EC algorithms are affected. Analysis
+suggests that attacks against 2-prime RSA1024, 3-prime RSA1536, and DSA1024 as a
+result of this defect would be very difficult to perform and are not believed
+likely. Attacks against DH512 are considered just feasible. However, for an
+attack the target would have to re-use the DH512 private key, which is not
+recommended anyway. Also applications directly using the low level API
+BN_mod_exp may be affected if they use BN_FLG_CONSTTIME.
+
+CVE-2019-1551
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
+(Merged from https://github.com/openssl/openssl/pull/10575)
+---
+ crypto/bn/asm/rsaz-x86_64.pl | 381 ++++++++++++++++++-----------------
+ 1 file changed, 197 insertions(+), 184 deletions(-)
+
+diff --git a/crypto/bn/asm/rsaz-x86_64.pl b/crypto/bn/asm/rsaz-x86_64.pl
+index b1797b649f..7534d5cd03 100755
+--- a/crypto/bn/asm/rsaz-x86_64.pl
++++ b/crypto/bn/asm/rsaz-x86_64.pl
+@@ -116,7 +116,7 @@ rsaz_512_sqr: # 25-29% faster than rsaz_512_mul
+ subq \$128+24, %rsp
+ .cfi_adjust_cfa_offset 128+24
+ .Lsqr_body:
+- movq $mod, %rbp # common argument
++ movq $mod, %xmm1 # common off-load
+ movq ($inp), %rdx
+ movq 8($inp), %rax
+ movq $n0, 128(%rsp)
+@@ -134,7 +134,8 @@ $code.=<<___;
+ .Loop_sqr:
+ movl $times,128+8(%rsp)
+ #first iteration
+- movq %rdx, %rbx
++ movq %rdx, %rbx # 0($inp)
++ mov %rax, %rbp # 8($inp)
+ mulq %rdx
+ movq %rax, %r8
+ movq 16($inp), %rax
+@@ -173,31 +174,29 @@ $code.=<<___;
+ mulq %rbx
+ addq %rax, %r14
+ movq %rbx, %rax
+- movq %rdx, %r15
+- adcq \$0, %r15
++ adcq \$0, %rdx
+
+- addq %r8, %r8 #shlq \$1, %r8
+- movq %r9, %rcx
+- adcq %r9, %r9 #shld \$1, %r8, %r9
++ xorq %rcx,%rcx # rcx:r8 = r8 << 1
++ addq %r8, %r8
++ movq %rdx, %r15
++ adcq \$0, %rcx
+
+ mulq %rax
+- movq %rax, (%rsp)
+- addq %rdx, %r8
+- adcq \$0, %r9
++ addq %r8, %rdx
++ adcq \$0, %rcx
+
+- movq %r8, 8(%rsp)
+- shrq \$63, %rcx
++ movq %rax, (%rsp)
++ movq %rdx, 8(%rsp)
+
+ #second iteration
+- movq 8($inp), %r8
+ movq 16($inp), %rax
+- mulq %r8
++ mulq %rbp
+ addq %rax, %r10
+ movq 24($inp), %rax
+ movq %rdx, %rbx
+ adcq \$0, %rbx
+
+- mulq %r8
++ mulq %rbp
+ addq %rax, %r11
+ movq 32($inp), %rax
+ adcq \$0, %rdx
+@@ -205,7 +204,7 @@ $code.=<<___;
+ movq %rdx, %rbx
+ adcq \$0, %rbx
+
+- mulq %r8
++ mulq %rbp
+ addq %rax, %r12
+ movq 40($inp), %rax
+ adcq \$0, %rdx
+@@ -213,7 +212,7 @@ $code.=<<___;
+ movq %rdx, %rbx
+ adcq \$0, %rbx
+
+- mulq %r8
++ mulq %rbp
+ addq %rax, %r13
+ movq 48($inp), %rax
+ adcq \$0, %rdx
+@@ -221,7 +220,7 @@ $code.=<<___;
+ movq %rdx, %rbx
+ adcq \$0, %rbx
+
+- mulq %r8
++ mulq %rbp
+ addq %rax, %r14
+ movq 56($inp), %rax
+ adcq \$0, %rdx
+@@ -229,39 +228,39 @@ $code.=<<___;
+ movq %rdx, %rbx
+ adcq \$0, %rbx
+
+- mulq %r8
++ mulq %rbp
+ addq %rax, %r15
+- movq %r8, %rax
++ movq %rbp, %rax
+ adcq \$0, %rdx
+ addq %rbx, %r15
+- movq %rdx, %r8
+- movq %r10, %rdx
+- adcq \$0, %r8
++ adcq \$0, %rdx
+
+- add %rdx, %rdx
+- lea (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10
+- movq %r11, %rbx
+- adcq %r11, %r11 #shld \$1, %r10, %r11
++ xorq %rbx, %rbx # rbx:r10:r9 = r10:r9 << 1
++ addq %r9, %r9
++ movq %rdx, %r8
++ adcq %r10, %r10
++ adcq \$0, %rbx
+
+ mulq %rax
++ addq %rcx, %rax
++ movq 16($inp), %rbp
++ adcq \$0, %rdx
+ addq %rax, %r9
++ movq 24($inp), %rax
+ adcq %rdx, %r10
+- adcq \$0, %r11
++ adcq \$0, %rbx
+
+ movq %r9, 16(%rsp)
+ movq %r10, 24(%rsp)
+- shrq \$63, %rbx
+
+ #third iteration
+- movq 16($inp), %r9
+- movq 24($inp), %rax
+- mulq %r9
++ mulq %rbp
+ addq %rax, %r12
+ movq 32($inp), %rax
+ movq %rdx, %rcx
+ adcq \$0, %rcx
+
+- mulq %r9
++ mulq %rbp
+ addq %rax, %r13
+ movq 40($inp), %rax
+ adcq \$0, %rdx
+@@ -269,7 +268,7 @@ $code.=<<___;
+ movq %rdx, %rcx
+ adcq \$0, %rcx
+
+- mulq %r9
++ mulq %rbp
+ addq %rax, %r14
+ movq 48($inp), %rax
+ adcq \$0, %rdx
+@@ -277,9 +276,7 @@ $code.=<<___;
+ movq %rdx, %rcx
+ adcq \$0, %rcx
+
+- mulq %r9
+- movq %r12, %r10
+- lea (%rbx,%r12,2), %r12 #shld \$1, %rbx, %r12
++ mulq %rbp
+ addq %rax, %r15
+ movq 56($inp), %rax
+ adcq \$0, %rdx
+@@ -287,36 +284,40 @@ $code.=<<___;
+ movq %rdx, %rcx
+ adcq \$0, %rcx
+
+- mulq %r9
+- shrq \$63, %r10
++ mulq %rbp
+ addq %rax, %r8
+- movq %r9, %rax
++ movq %rbp, %rax
+ adcq \$0, %rdx
+ addq %rcx, %r8
+- movq %rdx, %r9
+- adcq \$0, %r9
++ adcq \$0, %rdx
+
+- movq %r13, %rcx
+- leaq (%r10,%r13,2), %r13 #shld \$1, %r12, %r13
++ xorq %rcx, %rcx # rcx:r12:r11 = r12:r11 << 1
++ addq %r11, %r11
++ movq %rdx, %r9
++ adcq %r12, %r12
++ adcq \$0, %rcx
+
+ mulq %rax
++ addq %rbx, %rax
++ movq 24($inp), %r10
++ adcq \$0, %rdx
+ addq %rax, %r11
++ movq 32($inp), %rax
+ adcq %rdx, %r12
+- adcq \$0, %r13
++ adcq \$0, %rcx
+
+ movq %r11, 32(%rsp)
+ movq %r12, 40(%rsp)
+- shrq \$63, %rcx
+
+ #fourth iteration
+- movq 24($inp), %r10
+- movq 32($inp), %rax
++ mov %rax, %r11 # 32($inp)
+ mulq %r10
+ addq %rax, %r14
+ movq 40($inp), %rax
+ movq %rdx, %rbx
+ adcq \$0, %rbx
+
++ mov %rax, %r12 # 40($inp)
+ mulq %r10
+ addq %rax, %r15
+ movq 48($inp), %rax
+@@ -325,9 +326,8 @@ $code.=<<___;
+ movq %rdx, %rbx
+ adcq \$0, %rbx
+
++ mov %rax, %rbp # 48($inp)
+ mulq %r10
+- movq %r14, %r12
+- leaq (%rcx,%r14,2), %r14 #shld \$1, %rcx, %r14
+ addq %rax, %r8
+ movq 56($inp), %rax
+ adcq \$0, %rdx
+@@ -336,32 +336,33 @@ $code.=<<___;
+ adcq \$0, %rbx
+
+ mulq %r10
+- shrq \$63, %r12
+ addq %rax, %r9
+ movq %r10, %rax
+ adcq \$0, %rdx
+ addq %rbx, %r9
+- movq %rdx, %r10
+- adcq \$0, %r10
++ adcq \$0, %rdx
+
+- movq %r15, %rbx
+- leaq (%r12,%r15,2),%r15 #shld \$1, %r14, %r15
++ xorq %rbx, %rbx # rbx:r13:r14 = r13:r14 << 1
++ addq %r13, %r13
++ movq %rdx, %r10
++ adcq %r14, %r14
++ adcq \$0, %rbx
+
+ mulq %rax
++ addq %rcx, %rax
++ adcq \$0, %rdx
+ addq %rax, %r13
++ movq %r12, %rax # 40($inp)
+ adcq %rdx, %r14
+- adcq \$0, %r15
++ adcq \$0, %rbx
+
+ movq %r13, 48(%rsp)
+ movq %r14, 56(%rsp)
+- shrq \$63, %rbx
+
+ #fifth iteration
+- movq 32($inp), %r11
+- movq 40($inp), %rax
+ mulq %r11
+ addq %rax, %r8
+- movq 48($inp), %rax
++ movq %rbp, %rax # 48($inp)
+ movq %rdx, %rcx
+ adcq \$0, %rcx
+
+@@ -369,97 +370,99 @@ $code.=<<___;
+ addq %rax, %r9
+ movq 56($inp), %rax
+ adcq \$0, %rdx
+- movq %r8, %r12
+- leaq (%rbx,%r8,2), %r8 #shld \$1, %rbx, %r8
+ addq %rcx, %r9
+ movq %rdx, %rcx
+ adcq \$0, %rcx
+
++ mov %rax, %r14 # 56($inp)
+ mulq %r11
+- shrq \$63, %r12
+ addq %rax, %r10
+ movq %r11, %rax
+ adcq \$0, %rdx
+ addq %rcx, %r10
+- movq %rdx, %r11
+- adcq \$0, %r11
++ adcq \$0, %rdx
+
+- movq %r9, %rcx
+- leaq (%r12,%r9,2), %r9 #shld \$1, %r8, %r9
++ xorq %rcx, %rcx # rcx:r8:r15 = r8:r15 << 1
++ addq %r15, %r15
++ movq %rdx, %r11
++ adcq %r8, %r8
++ adcq \$0, %rcx
+
+ mulq %rax
++ addq %rbx, %rax
++ adcq \$0, %rdx
+ addq %rax, %r15
++ movq %rbp, %rax # 48($inp)
+ adcq %rdx, %r8
+- adcq \$0, %r9
++ adcq \$0, %rcx
+
+ movq %r15, 64(%rsp)
+ movq %r8, 72(%rsp)
+- shrq \$63, %rcx
+
+ #sixth iteration
+- movq 40($inp), %r12
+- movq 48($inp), %rax
+ mulq %r12
+ addq %rax, %r10
+- movq 56($inp), %rax
++ movq %r14, %rax # 56($inp)
+ movq %rdx, %rbx
+ adcq \$0, %rbx
+
+ mulq %r12
+ addq %rax, %r11
+ movq %r12, %rax
+- movq %r10, %r15
+- leaq (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10
+ adcq \$0, %rdx
+- shrq \$63, %r15
+ addq %rbx, %r11
+- movq %rdx, %r12
+- adcq \$0, %r12
++ adcq \$0, %rdx
+
+- movq %r11, %rbx
+- leaq (%r15,%r11,2), %r11 #shld \$1, %r10, %r11
++ xorq %rbx, %rbx # rbx:r10:r9 = r10:r9 << 1
++ addq %r9, %r9
++ movq %rdx, %r12
++ adcq %r10, %r10
++ adcq \$0, %rbx
+
+ mulq %rax
++ addq %rcx, %rax
++ adcq \$0, %rdx
+ addq %rax, %r9
++ movq %r14, %rax # 56($inp)
+ adcq %rdx, %r10
+- adcq \$0, %r11
++ adcq \$0, %rbx
+
+ movq %r9, 80(%rsp)
+ movq %r10, 88(%rsp)
+
+ #seventh iteration
+- movq 48($inp), %r13
+- movq 56($inp), %rax
+- mulq %r13
++ mulq %rbp
+ addq %rax, %r12
+- movq %r13, %rax
+- movq %rdx, %r13
+- adcq \$0, %r13
++ movq %rbp, %rax
++ adcq \$0, %rdx
+
+- xorq %r14, %r14
+- shlq \$1, %rbx
+- adcq %r12, %r12 #shld \$1, %rbx, %r12
+- adcq %r13, %r13 #shld \$1, %r12, %r13
+- adcq %r14, %r14 #shld \$1, %r13, %r14
++ xorq %rcx, %rcx # rcx:r12:r11 = r12:r11 << 1
++ addq %r11, %r11
++ movq %rdx, %r13
++ adcq %r12, %r12
++ adcq \$0, %rcx
+
+ mulq %rax
++ addq %rbx, %rax
++ adcq \$0, %rdx
+ addq %rax, %r11
++ movq %r14, %rax # 56($inp)
+ adcq %rdx, %r12
+- adcq \$0, %r13
++ adcq \$0, %rcx
+
+ movq %r11, 96(%rsp)
+ movq %r12, 104(%rsp)
+
+ #eighth iteration
+- movq 56($inp), %rax
++ xorq %rbx, %rbx # rbx:r13 = r13 << 1
++ addq %r13, %r13
++ adcq \$0, %rbx
++
+ mulq %rax
+- addq %rax, %r13
++ addq %rcx, %rax
+ adcq \$0, %rdx
+-
+- addq %rdx, %r14
+-
+- movq %r13, 112(%rsp)
+- movq %r14, 120(%rsp)
++ addq %r13, %rax
++ adcq %rbx, %rdx
+
+ movq (%rsp), %r8
+ movq 8(%rsp), %r9
+@@ -469,6 +472,10 @@ $code.=<<___;
+ movq 40(%rsp), %r13
+ movq 48(%rsp), %r14
+ movq 56(%rsp), %r15
++ movq %xmm1, %rbp
++
++ movq %rax, 112(%rsp)
++ movq %rdx, 120(%rsp)
+
+ call __rsaz_512_reduce
+
+@@ -500,9 +507,9 @@ $code.=<<___;
+ .Loop_sqrx:
+ movl $times,128+8(%rsp)
+ movq $out, %xmm0 # off-load
+- movq %rbp, %xmm1 # off-load
+ #first iteration
+ mulx %rax, %r8, %r9
++ mov %rax, %rbx
+
+ mulx 16($inp), %rcx, %r10
+ xor %rbp, %rbp # cf=0, of=0
+@@ -510,40 +517,39 @@ $code.=<<___;
+ mulx 24($inp), %rax, %r11
+ adcx %rcx, %r9
+
+- mulx 32($inp), %rcx, %r12
++ .byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 # mulx 32($inp), %rcx, %r12
+ adcx %rax, %r10
+
+- mulx 40($inp), %rax, %r13
++ .byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 # mulx 40($inp), %rax, %r13
+ adcx %rcx, %r11
+
+- .byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 # mulx 48($inp), %rcx, %r14
++ mulx 48($inp), %rcx, %r14
+ adcx %rax, %r12
+ adcx %rcx, %r13
+
+- .byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 # mulx 56($inp), %rax, %r15
++ mulx 56($inp), %rax, %r15
+ adcx %rax, %r14
+ adcx %rbp, %r15 # %rbp is 0
+
+- mov %r9, %rcx
+- shld \$1, %r8, %r9
+- shl \$1, %r8
+-
+- xor %ebp, %ebp
+- mulx %rdx, %rax, %rdx
+- adcx %rdx, %r8
+- mov 8($inp), %rdx
+- adcx %rbp, %r9
++ mulx %rdx, %rax, $out
++ mov %rbx, %rdx # 8($inp)
++ xor %rcx, %rcx
++ adox %r8, %r8
++ adcx $out, %r8
++ adox %rbp, %rcx
++ adcx %rbp, %rcx
+
+ mov %rax, (%rsp)
+ mov %r8, 8(%rsp)
+
+ #second iteration
+- mulx 16($inp), %rax, %rbx
++ .byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 # mulx 16($inp), %rax, %rbx
+ adox %rax, %r10
+ adcx %rbx, %r11
+
+- .byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 # mulx 24($inp), $out, %r8
++ mulx 24($inp), $out, %r8
+ adox $out, %r11
++ .byte 0x66
+ adcx %r8, %r12
+
+ mulx 32($inp), %rax, %rbx
+@@ -561,24 +567,25 @@ $code.=<<___;
+ .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r8
+ adox $out, %r15
+ adcx %rbp, %r8
++ mulx %rdx, %rax, $out
+ adox %rbp, %r8
++ .byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 # mov 16($inp), %rdx
+
+- mov %r11, %rbx
+- shld \$1, %r10, %r11
+- shld \$1, %rcx, %r10
+-
+- xor %ebp,%ebp
+- mulx %rdx, %rax, %rcx
+- mov 16($inp), %rdx
++ xor %rbx, %rbx
++ adcx %rcx, %rax
++ adox %r9, %r9
++ adcx %rbp, $out
++ adox %r10, %r10
+ adcx %rax, %r9
+- adcx %rcx, %r10
+- adcx %rbp, %r11
++ adox %rbp, %rbx
++ adcx $out, %r10
++ adcx %rbp, %rbx
+
+ mov %r9, 16(%rsp)
+ .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 # mov %r10, 24(%rsp)
+
+ #third iteration
+- .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 # mulx 24($inp), $out, %r9
++ mulx 24($inp), $out, %r9
+ adox $out, %r12
+ adcx %r9, %r13
+
+@@ -586,7 +593,7 @@ $code.=<<___;
+ adox %rax, %r13
+ adcx %rcx, %r14
+
+- mulx 40($inp), $out, %r9
++ .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 # mulx 40($inp), $out, %r9
+ adox $out, %r14
+ adcx %r9, %r15
+
+@@ -594,27 +601,28 @@ $code.=<<___;
+ adox %rax, %r15
+ adcx %rcx, %r8
+
+- .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r9
++ mulx 56($inp), $out, %r9
+ adox $out, %r8
+ adcx %rbp, %r9
++ mulx %rdx, %rax, $out
+ adox %rbp, %r9
++ mov 24($inp), %rdx
+
+- mov %r13, %rcx
+- shld \$1, %r12, %r13
+- shld \$1, %rbx, %r12
+-
+- xor %ebp, %ebp
+- mulx %rdx, %rax, %rdx
++ xor %rcx, %rcx
++ adcx %rbx, %rax
++ adox %r11, %r11
++ adcx %rbp, $out
++ adox %r12, %r12
+ adcx %rax, %r11
+- adcx %rdx, %r12
+- mov 24($inp), %rdx
+- adcx %rbp, %r13
++ adox %rbp, %rcx
++ adcx $out, %r12
++ adcx %rbp, %rcx
+
+ mov %r11, 32(%rsp)
+- .byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 # mov %r12, 40(%rsp)
++ mov %r12, 40(%rsp)
+
+ #fourth iteration
+- .byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 # mulx 32($inp), %rax, %rbx
++ mulx 32($inp), %rax, %rbx
+ adox %rax, %r14
+ adcx %rbx, %r15
+
+@@ -629,25 +637,25 @@ $code.=<<___;
+ mulx 56($inp), $out, %r10
+ adox $out, %r9
+ adcx %rbp, %r10
++ mulx %rdx, %rax, $out
+ adox %rbp, %r10
++ mov 32($inp), %rdx
+
+- .byte 0x66
+- mov %r15, %rbx
+- shld \$1, %r14, %r15
+- shld \$1, %rcx, %r14
+-
+- xor %ebp, %ebp
+- mulx %rdx, %rax, %rdx
++ xor %rbx, %rbx
++ adcx %rcx, %rax
++ adox %r13, %r13
++ adcx %rbp, $out
++ adox %r14, %r14
+ adcx %rax, %r13
+- adcx %rdx, %r14
+- mov 32($inp), %rdx
+- adcx %rbp, %r15
++ adox %rbp, %rbx
++ adcx $out, %r14
++ adcx %rbp, %rbx
+
+ mov %r13, 48(%rsp)
+ mov %r14, 56(%rsp)
+
+ #fifth iteration
+- .byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 # mulx 40($inp), $out, %r11
++ mulx 40($inp), $out, %r11
+ adox $out, %r8
+ adcx %r11, %r9
+
+@@ -658,18 +666,19 @@ $code.=<<___;
+ mulx 56($inp), $out, %r11
+ adox $out, %r10
+ adcx %rbp, %r11
++ mulx %rdx, %rax, $out
++ mov 40($inp), %rdx
+ adox %rbp, %r11
+
+- mov %r9, %rcx
+- shld \$1, %r8, %r9
+- shld \$1, %rbx, %r8
+-
+- xor %ebp, %ebp
+- mulx %rdx, %rax, %rdx
++ xor %rcx, %rcx
++ adcx %rbx, %rax
++ adox %r15, %r15
++ adcx %rbp, $out
++ adox %r8, %r8
+ adcx %rax, %r15
+- adcx %rdx, %r8
+- mov 40($inp), %rdx
+- adcx %rbp, %r9
++ adox %rbp, %rcx
++ adcx $out, %r8
++ adcx %rbp, %rcx
+
+ mov %r15, 64(%rsp)
+ mov %r8, 72(%rsp)
+@@ -682,18 +691,19 @@ $code.=<<___;
+ .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r12
+ adox $out, %r11
+ adcx %rbp, %r12
++ mulx %rdx, %rax, $out
+ adox %rbp, %r12
++ mov 48($inp), %rdx
+
+- mov %r11, %rbx
+- shld \$1, %r10, %r11
+- shld \$1, %rcx, %r10
+-
+- xor %ebp, %ebp
+- mulx %rdx, %rax, %rdx
++ xor %rbx, %rbx
++ adcx %rcx, %rax
++ adox %r9, %r9
++ adcx %rbp, $out
++ adox %r10, %r10
+ adcx %rax, %r9
+- adcx %rdx, %r10
+- mov 48($inp), %rdx
+- adcx %rbp, %r11
++ adcx $out, %r10
++ adox %rbp, %rbx
++ adcx %rbp, %rbx
+
+ mov %r9, 80(%rsp)
+ mov %r10, 88(%rsp)
+@@ -703,31 +713,31 @@ $code.=<<___;
+ adox %rax, %r12
+ adox %rbp, %r13
+
+- xor %r14, %r14
+- shld \$1, %r13, %r14
+- shld \$1, %r12, %r13
+- shld \$1, %rbx, %r12
+-
+- xor %ebp, %ebp
+- mulx %rdx, %rax, %rdx
+- adcx %rax, %r11
+- adcx %rdx, %r12
++ mulx %rdx, %rax, $out
++ xor %rcx, %rcx
+ mov 56($inp), %rdx
+- adcx %rbp, %r13
++ adcx %rbx, %rax
++ adox %r11, %r11
++ adcx %rbp, $out
++ adox %r12, %r12
++ adcx %rax, %r11
++ adox %rbp, %rcx
++ adcx $out, %r12
++ adcx %rbp, %rcx
+
+ .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 # mov %r11, 96(%rsp)
+ .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 # mov %r12, 104(%rsp)
+
+ #eighth iteration
+ mulx %rdx, %rax, %rdx
+- adox %rax, %r13
+- adox %rbp, %rdx
++ xor %rbx, %rbx
++ adcx %rcx, %rax
++ adox %r13, %r13
++ adcx %rbp, %rdx
++ adox %rbp, %rbx
++ adcx %r13, %rax
++ adcx %rdx, %rbx
+
+- .byte 0x66
+- add %rdx, %r14
+-
+- movq %r13, 112(%rsp)
+- movq %r14, 120(%rsp)
+ movq %xmm0, $out
+ movq %xmm1, %rbp
+
+@@ -741,6 +751,9 @@ $code.=<<___;
+ movq 48(%rsp), %r14
+ movq 56(%rsp), %r15
+
++ movq %rax, 112(%rsp)
++ movq %rbx, 120(%rsp)
++
+ call __rsaz_512_reducex
+
+ addq 64(%rsp), %r8
+--
+2.17.1
+
diff --git a/system/openssl/ppc64.patch b/system/openssl/ppc64.patch
new file mode 100644
index 000000000..5f79c4ddc
--- /dev/null
+++ b/system/openssl/ppc64.patch
@@ -0,0 +1,96 @@
+From 34ab13b7d8e3e723adb60be8142e38b7c9cd382a Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:25:50 +0200
+Subject: [PATCH] crypto/perlasm/ppc-xlate.pl: add linux64v2 flavour
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is a big endian ELFv2 configuration. ELFv2 was already being
+used for little endian, and big endian was traditionally ELFv1
+but there are practical configurations that use ELFv2 with big
+endian nowadays (Adélie Linux, Void Linux, possibly Gentoo, etc.)
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ crypto/perlasm/ppc-xlate.pl | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/crypto/perlasm/ppc-xlate.pl b/crypto/perlasm/ppc-xlate.pl
+index e52f2f6ea62..5fcd0526dff 100755
+--- a/crypto/perlasm/ppc-xlate.pl
++++ b/crypto/perlasm/ppc-xlate.pl
+@@ -49,7 +49,7 @@
+ /osx/ && do { $name = "_$name";
+ last;
+ };
+- /linux.*(32|64le)/
++ /linux.*(32|64(le|v2))/
+ && do { $ret .= ".globl $name";
+ if (!$$type) {
+ $ret .= "\n.type $name,\@function";
+@@ -80,7 +80,7 @@
+ };
+ my $text = sub {
+ my $ret = ($flavour =~ /aix/) ? ".csect\t.text[PR],7" : ".text";
+- $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64le/);
++ $ret = ".abiversion 2\n".$ret if ($flavour =~ /linux.*64(le|v2)/);
+ $ret;
+ };
+ my $machine = sub {
+@@ -186,7 +186,7 @@
+
+ # Some ABIs specify vrsave, special-purpose register #256, as reserved
+ # for system use.
+-my $no_vrsave = ($flavour =~ /aix|linux64le/);
++my $no_vrsave = ($flavour =~ /aix|linux64(le|v2)/);
+ my $mtspr = sub {
+ my ($f,$idx,$ra) = @_;
+ if ($idx == 256 && $no_vrsave) {
+@@ -318,7 +318,7 @@ sub vfour {
+ if ($label) {
+ my $xlated = ($GLOBALS{$label} or $label);
+ print "$xlated:";
+- if ($flavour =~ /linux.*64le/) {
++ if ($flavour =~ /linux.*64(le|v2)/) {
+ if ($TYPES{$label} =~ /function/) {
+ printf "\n.localentry %s,0\n",$xlated;
+ }
+
+From 098404128383ded87ba390dd74ecd9e2ffa6f530 Mon Sep 17 00:00:00 2001
+From: Andy Polyakov <appro@openssl.org>
+Date: Sun, 5 May 2019 18:30:55 +0200
+Subject: [PATCH] Configure: use ELFv2 ABI on some ppc64 big endian systems
+
+If _CALL_ELF is defined to be 2, it's an ELFv2 system.
+Conditionally switch to the v2 perlasm scheme.
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/8883)
+---
+ Configure | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/Configure b/Configure
+index 22082deb4c7..e303d98deb3 100755
+--- a/Configure
++++ b/Configure
+@@ -1411,8 +1410,15 @@
+ my %predefined_C = compiler_predefined($config{CROSS_COMPILE}.$config{CC});
+ my %predefined_CXX = $config{CXX}
+ ? compiler_predefined($config{CROSS_COMPILE}.$config{CXX})
+ : ();
+
++unless ($disabled{asm}) {
++ # big endian systems can use ELFv2 ABI
++ if ($target eq "linux-ppc64") {
++ $target{perlasm_scheme} = "linux64v2" if ($predefined_C{_CALL_ELF} == 2);
++ }
++}
++
+ # Check for makedepend capabilities.
+ if (!$disabled{makedepend}) {
+ if ($config{target} =~ /^(VC|vms)-/) {
diff --git a/system/patch/APKBUILD b/system/patch/APKBUILD
index 5831ede3a..b299382c9 100644
--- a/system/patch/APKBUILD
+++ b/system/patch/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=patch
pkgver=2.7.6
pkgrel=4
diff --git a/system/perl-encode-eucjpascii/APKBUILD b/system/perl-encode-eucjpascii/APKBUILD
index adb4c21de..02ed7b7e3 100644
--- a/system/perl-encode-eucjpascii/APKBUILD
+++ b/system/perl-encode-eucjpascii/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-eucjpascii
_pkgreal=Encode-EUCJPASCII
diff --git a/system/perl-encode-hanextra/APKBUILD b/system/perl-encode-hanextra/APKBUILD
index f00fb7a15..6d52e5647 100644
--- a/system/perl-encode-hanextra/APKBUILD
+++ b/system/perl-encode-hanextra/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-hanextra
_pkgreal=Encode-HanExtra
diff --git a/system/perl-encode-iso2022/APKBUILD b/system/perl-encode-iso2022/APKBUILD
index d9e9928a0..b59b3a5cb 100644
--- a/system/perl-encode-iso2022/APKBUILD
+++ b/system/perl-encode-iso2022/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-iso2022
_pkgreal=Encode-ISO2022
diff --git a/system/perl-encode-jisx0213/APKBUILD b/system/perl-encode-jisx0213/APKBUILD
index 9d939a39b..5a956d1aa 100644
--- a/system/perl-encode-jisx0213/APKBUILD
+++ b/system/perl-encode-jisx0213/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-jisx0213
_pkgreal=Encode-JISX0213
diff --git a/system/perl-http-message/APKBUILD b/system/perl-http-message/APKBUILD
index 39f8523dc..839df093e 100644
--- a/system/perl-http-message/APKBUILD
+++ b/system/perl-http-message/APKBUILD
@@ -1,5 +1,5 @@
# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-http-message
_pkgreal=HTTP-Message
diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD
index ee0c36dc8..e3ce567bb 100644
--- a/system/perl-json/APKBUILD
+++ b/system/perl-json/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-json
_pkgreal=JSON
diff --git a/system/perl-mime-charset/APKBUILD b/system/perl-mime-charset/APKBUILD
index 2dd9090bc..4a04e17e9 100644
--- a/system/perl-mime-charset/APKBUILD
+++ b/system/perl-mime-charset/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-mime-charset
_pkgreal=MIME-Charset
diff --git a/system/perl-pod2-base/APKBUILD b/system/perl-pod2-base/APKBUILD
index 5ba39c600..05703bcf6 100644
--- a/system/perl-pod2-base/APKBUILD
+++ b/system/perl-pod2-base/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-pod2-base
_pkgreal=POD2-Base
diff --git a/system/perl-sgmls/APKBUILD b/system/perl-sgmls/APKBUILD
index a4991b8f2..e6ceae295 100644
--- a/system/perl-sgmls/APKBUILD
+++ b/system/perl-sgmls/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sgmls
_pkgreal=SGMLSpm
diff --git a/system/perl-test-fatal/APKBUILD b/system/perl-test-fatal/APKBUILD
index f6336e2af..e97893fda 100644
--- a/system/perl-test-fatal/APKBUILD
+++ b/system/perl-test-fatal/APKBUILD
@@ -1,5 +1,5 @@
# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-fatal
_pkgreal=Test-Fatal
diff --git a/system/perl-test-needs/APKBUILD b/system/perl-test-needs/APKBUILD
index 439a52ade..0d098b55c 100644
--- a/system/perl-test-needs/APKBUILD
+++ b/system/perl-test-needs/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-needs
_pkgreal=Test-Needs
diff --git a/system/perl-try-tiny/APKBUILD b/system/perl-try-tiny/APKBUILD
index 36129e2a3..4078a2f5e 100644
--- a/system/perl-try-tiny/APKBUILD
+++ b/system/perl-try-tiny/APKBUILD
@@ -1,5 +1,5 @@
# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-try-tiny
_pkgreal=Try-Tiny
diff --git a/system/perl-unicode-linebreak/APKBUILD b/system/perl-unicode-linebreak/APKBUILD
index 5bff8e644..907b970b3 100644
--- a/system/perl-unicode-linebreak/APKBUILD
+++ b/system/perl-unicode-linebreak/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-unicode-linebreak
_pkgreal=Unicode-LineBreak
diff --git a/system/perl-uri/APKBUILD b/system/perl-uri/APKBUILD
index 13763a256..1f3cbec5c 100644
--- a/system/perl-uri/APKBUILD
+++ b/system/perl-uri/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-uri
_pkgreal=URI
diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD
index 4df8d9e58..f65edd034 100644
--- a/system/perl/APKBUILD
+++ b/system/perl/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
# Proxy-For: solar
pkgname=perl
@@ -37,7 +37,6 @@ _archlib=/usr/lib/perl5/core_perl
prepare() {
chmod +w "$builddir"/*.c
default_prepare
- cd "$builddir"
sed -e 's/less -R/less/g' \
-e 's/libswanted="\(.*\) nsl\(.*\)"/libswanted="\1\2"/g' \
-i ./Configure ||
@@ -50,7 +49,6 @@ prepare() {
}
build() {
- cd "$builddir"
BUILD_ZLIB=0
BUILD_BZIP2=0
BZIP2_LIB=/usr/lib
@@ -89,12 +87,10 @@ build() {
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
if [ -n "$(find $pkgdir/usr/local -type f)" ]; then
error "files found under /usr/local"
diff --git a/system/python3/APKBUILD b/system/python3/APKBUILD
index f5d28b236..b8c72f3a7 100644
--- a/system/python3/APKBUILD
+++ b/system/python3/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=python3
pkgver=3.6.9
diff --git a/system/rsync/APKBUILD b/system/rsync/APKBUILD
index 926c741d0..e93da8552 100644
--- a/system/rsync/APKBUILD
+++ b/system/rsync/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=rsync
pkgver=3.1.3
pkgrel=1
diff --git a/system/sed/APKBUILD b/system/sed/APKBUILD
index 8b90aaee0..545d10970 100644
--- a/system/sed/APKBUILD
+++ b/system/sed/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=sed
pkgver=4.7
pkgrel=0
diff --git a/system/uucp/APKBUILD b/system/uucp/APKBUILD
index d17de7902..422f28ae5 100644
--- a/system/uucp/APKBUILD
+++ b/system/uucp/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=uucp
pkgver=1.07
pkgrel=0
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index 0e17d805a..80698a759 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=vim
pkgver=8.1.2311
pkgrel=0
diff --git a/system/zsh/APKBUILD b/system/zsh/APKBUILD
index a85083fc4..3bc96b226 100644
--- a/system/zsh/APKBUILD
+++ b/system/zsh/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=zsh
pkgver=5.7.1
-pkgrel=2
+pkgrel=3
pkgdesc="A very advanced and programmable command interpreter (shell)"
url="https://www.zsh.org/"
arch="all"
@@ -98,6 +98,7 @@ build() {
--enable-unicode9 \
--enable-multibyte \
--enable-function-subdirs \
+ --enable-zprofile=/etc/zsh/zprofile \
--enable-zsh-secure-free \
--with-tcsetpgrp
make
@@ -179,5 +180,5 @@ _submv() {
sha512sums="a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0 zsh-5.7.1.tar.xz
d820fcf65bb3c52f23e968110b5df1188fc0b64079312f64d22ffe35de3b4f3055d4d629b3b0f97a1bfaddf62dbc80676af31c3a1a79645632082abfc854cf97 skel
-e90723eb790581419498f3ab86fb5d6cab4aaede8c87eb79ead7047d259b643cfb47f4d1beb06d03e038cfda3a20ef9dd4c1b417270ab55c688e166fe30ef4f6 zprofile
+63167188e22bf8933eb420a5ba068ab897531b90c8d8b8ec892f26a9180267a971013046a72b810d5b9d3add427cf650df608b0e008cd0789681ed1371b172c3 zprofile
1675e016f97333cad89b587f4292d81b6bc10e27b75482e3e0c3808539c95bd49b907b6579fb98d817f77f2f2384c0df5afa3e2b6f43b6ae9b466925cd9ccffc zshrc"
diff --git a/system/zsh/zprofile b/system/zsh/zprofile
index 50cbdaaaa..df7a3f76e 100644
--- a/system/zsh/zprofile
+++ b/system/zsh/zprofile
@@ -2,8 +2,6 @@
# /etc/zprofile and ~/.zprofile are run for login shells
#
-export PATH="$PATH:$HOME/bin"
-
_src_etc_profile()
{
# Make /etc/profile happier, and have possible ~/.zshenv options like
diff --git a/user/a52dec/APKBUILD b/user/a52dec/APKBUILD
index 9296f3ad0..73419f6c7 100644
--- a/user/a52dec/APKBUILD
+++ b/user/a52dec/APKBUILD
@@ -6,15 +6,15 @@ pkgdesc="Library for decoding ATSC A/52 streams"
url="http://liba52.sourceforge.net/"
arch="all"
license="GPL-2.0+"
-subpackages="$pkgname-dev $pkgname-doc"
+depends=""
makedepends="autoconf automake libtool linux-headers"
+subpackages="$pkgname-dev $pkgname-doc"
source="http://liba52.sourceforge.net/files/$pkgname-$pkgver.tar.gz
automake.patch
$pkgname-$pkgver-build.patch
"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
libtoolize --force && \
@@ -22,7 +22,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +31,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -m644 liba52/a52_internal.h "$pkgdir"/usr/include/a52dec/
}
diff --git a/user/abiword/APKBUILD b/user/abiword/APKBUILD
index 76ae5ea08..a76ef2557 100644
--- a/user/abiword/APKBUILD
+++ b/user/abiword/APKBUILD
@@ -1,13 +1,14 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=abiword
-pkgver=3.0.2
+pkgver=3.0.4
pkgrel=0
pkgdesc="A fully-featured word processor"
url="https://www.abisource.com"
arch="all"
options="!check" # Test suite requires valgrind, etc
license="GPL-2.0+"
+depends=""
makedepends="bzip2-dev enchant-dev fribidi-dev goffice-dev gtk+3.0-dev
libgsf-dev libjpeg-turbo-dev librsvg-dev libxslt-dev pcre-dev
popt-dev wv-dev"
@@ -21,9 +22,7 @@ _plugins="applix babelfish bmp clarisworks collab docbook eml epub \
latex loadbindings mht mif mswrite openwriter openxml opml paint \
passepartout pdb pdf presentation s5 sdw t602 urldict wikipedia wml \
xslfo"
-source="https://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz
- fix-black-drawing-regression.patch
- "
+source="https://www.abisource.com/downloads/$pkgname/$pkgver/source/$pkgname-$pkgver.tar.gz"
build() {
./configure \
@@ -40,5 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3 abiword-3.0.2.tar.gz
-cae9a08047cd97d11acea25a2f0b0ca4e8e4556b462eb476507fa178a7412221839febfeb36bebf491bb94d53525c4584d86230f96c403a7ceb2dec4223be8fe fix-black-drawing-regression.patch"
+sha512sums="121708e010cef6722cab5622dc762f2f92c46e43b65b90b881b4f25ff32c1696fa2d281a3a6f2c04d5b9231bbbd0040281e9d4d7e594ec0ace6caae9c9021ec4 abiword-3.0.4.tar.gz"
diff --git a/user/abiword/fix-black-drawing-regression.patch b/user/abiword/fix-black-drawing-regression.patch
deleted file mode 100644
index dbce8c696..000000000
--- a/user/abiword/fix-black-drawing-regression.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001
-From: Hubert Figuiere <hub@figuiere.net>
-Date: Thu, 8 Dec 2016 02:03:10 +0000
-Subject: [PATCH] Bug 13815 - draw event should return TRUE
-
-This fix the black drawing regression with Gtk3.22
-
-git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6
----
- src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++---
- src/af/xap/gtk/xap_UnixFrameImpl.h | 4 ++--
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-index 780000e..10f8e00 100644
---- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-+++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp
-@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g
- }
-
- #if GTK_CHECK_VERSION(3,0,0)
--gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
-+gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr)
- #else
--gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
-+gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- #endif
- {
- XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data"));
-@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent)
- pView->draw(&rClip);
- #endif
- }
-- return FALSE;
-+ return TRUE;
- }
-
- static bool bScrollWait = false;
-diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h
-index 30ee5d8..a0ff57f 100644
---- a/src/af/xap/gtk/xap_UnixFrameImpl.h
-+++ b/src/af/xap/gtk/xap_UnixFrameImpl.h
-@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl
- static gint key_release_event(GtkWidget* w, GdkEventKey* e);
- static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/);
- #if GTK_CHECK_VERSION(3,0,0)
-- static gint draw(GtkWidget * w, cairo_t * cr);
-+ static gboolean draw(GtkWidget * w, cairo_t * cr);
- #else
-- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
-+ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent);
- #endif
- static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p);
- static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/);
diff --git a/user/accountsservice/APKBUILD b/user/accountsservice/APKBUILD
index 2cee00a05..f6eaa260d 100644
--- a/user/accountsservice/APKBUILD
+++ b/user/accountsservice/APKBUILD
@@ -16,7 +16,6 @@ source="https://www.freedesktop.org/software/accountsservice/accountsservice-$pk
"
build() {
- cd "$builddir"
CPPFLAGS="-D_PATH_WTMPX=\\\"/run/utmps/wtmp\\\"" meson \
--prefix=/usr \
--sysconfdir=/etc \
@@ -36,12 +35,10 @@ build() {
}
check() {
- cd "$builddir"
ninja -C output test
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" ninja -C output install
}
diff --git a/user/acpi/APKBUILD b/user/acpi/APKBUILD
index 8d2b49412..9dc1c2977 100644
--- a/user/acpi/APKBUILD
+++ b/user/acpi/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
source="http://downloads.sourceforge.net/acpiclient/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/acpid/APKBUILD b/user/acpid/APKBUILD
index 4a46b0c93..e9bff1952 100644
--- a/user/acpid/APKBUILD
+++ b/user/acpid/APKBUILD
@@ -5,7 +5,6 @@
# Contributor: Manolis Tzanidakis
# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us>
# Contributor: multiplexd <multi@in-addr.xyz>
-
pkgname=acpid
pkgver=2.0.32
pkgrel=0
diff --git a/user/adelie-kde-theme/APKBUILD b/user/adelie-kde-theme/APKBUILD
index 5eb3e9509..9cc8badd5 100644
--- a/user/adelie-kde-theme/APKBUILD
+++ b/user/adelie-kde-theme/APKBUILD
@@ -9,6 +9,8 @@ arch="noarch"
options="!check" # No test suite.
license="NCSA"
depends="adelie-wallpapers papirus-icons"
+makedepends=""
+subpackages=""
source="kdeglobals
kscreenlockerrc
adelie-kde-theme.js
@@ -16,7 +18,6 @@ source="kdeglobals
builddir="$srcdir/"
package() {
- cd "$builddir"
install -D -m644 kdeglobals "$pkgdir"/etc/xdg/kdeglobals
install -m644 kscreenlockerrc "$pkgdir"/etc/xdg/kscreenlockerrc
install -D -m644 adelie-kde-theme.js \
diff --git a/user/adelie-wallpapers/APKBUILD b/user/adelie-wallpapers/APKBUILD
index dc66e9e5f..5462ef837 100644
--- a/user/adelie-wallpapers/APKBUILD
+++ b/user/adelie-wallpapers/APKBUILD
@@ -14,9 +14,8 @@ subpackages=""
source="https://distfiles.adelielinux.org/source/adelie-wallpapers-$pkgver.tar.xz"
package() {
- cd "$builddir"
mkdir -p "$pkgdir"
- cp -r usr "$pkgdir"/
+ mv "$builddir"/usr "$pkgdir"/
}
sha512sums="3815145eaf92524eb848ec179cefecd66b43873a9f17133b62baf2ce894d7f629585f6670e5e499d7d5779377c1819627256d7812bb4318b0bfd68466c9b1cff adelie-wallpapers-1.0.tar.xz"
diff --git a/user/ae_fonts/APKBUILD b/user/ae_fonts/APKBUILD
index 19535f00f..e23ca23a7 100644
--- a/user/ae_fonts/APKBUILD
+++ b/user/ae_fonts/APKBUILD
@@ -15,12 +15,8 @@ source="https://downloads.sourceforge.net/arabeyes/ae_fonts_$pkgver.tar.bz2"
builddir="$srcdir"/${pkgname}_$pkgver
package() {
- cd "$builddir"
- local _fontdir
for _fontdir in AAHS AGA FS Kasr MCS Shmookh; do
- cd $_fontdir
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
- cd "$OLDPWD"
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/$_fontdir/*.ttf
done
}
diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD
index 1be4e8974..527db1b09 100644
--- a/user/akonadi-contacts/APKBUILD
+++ b/user/akonadi-contacts/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=akonadi-contacts
-pkgver=18.12.3
-pkgrel=1
+pkgver=19.12.1
+pkgrel=0
pkgdesc="Library for integrating contact lists with Akonadi"
url="https://www.kde.org/"
arch="all"
@@ -14,10 +14,9 @@ depends_dev="qt5-qtbase-dev akonadi-dev kcontacts-dev kcoreaddons-dev
makedepends="$depends_dev cmake extra-cmake-modules akonadi-mime-dev kio-dev
kmime-dev prison-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-contacts-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-contacts-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="dba40ec470d8b34b38d69470128708580a0581dcf1a88191da1b6bfedb426a13c964117eea1d266d1cb2224006a4b26f1f8ccc39e79eac67653aa808c5d81fb0 akonadi-contacts-18.12.3.tar.xz"
+sha512sums="27d97c1e6a53faaf588e427ef5e43ce56b5c03194d34ec0a3d97eef5112c98444fb8e98454acb3225ccb0b05ae726acb7872911dfcddccadec93354c99228724 akonadi-contacts-19.12.1.tar.xz"
diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD
index 6ff117f02..fe1076018 100644
--- a/user/akonadi-mime/APKBUILD
+++ b/user/akonadi-mime/APKBUILD
@@ -1,22 +1,20 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=akonadi-mime
-pkgver=18.12.3
-pkgrel=1
+pkgver=19.12.1
+pkgrel=0
pkgdesc="Libraries to implement basic MIME message handling"
url="https://www.kde.org/"
arch="all"
-options="!check" # regression?
license="LGPL-2.1+"
depends=""
depends_dev="qt5-qtbase-dev akonadi-dev kio-dev kmime-dev"
makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev kdbusaddons-dev
kconfig-dev kitemmodels-dev kxmlgui-dev shared-mime-info"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-mime-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-mime-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +25,21 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ # The mailserializerplugintest test requires kdepim-runtime to be
+ # present on the system. Otherwise, Akonadi does not know how to
+ # convert a QByteArray of message/rfc822 to KMime::Message. This
+ # is a circular dependency, because kdepim-runtime requires amime
+ # so we must skip this test.
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'mailserializerplugintest'
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="ecda52f1d41c7b7925b9e71f55f2dca14f38308185a9bdd528f53b109758f79a653b52a2bbb91c138dfc432c798fa9d83307c8652b14269e5d6969a38130ee13 akonadi-mime-18.12.3.tar.xz"
+sha512sums="dd1ef14d7ec9e51bb677c2bddfb082bd10965e94936e23bacec2a167f68fc3965ea83c3636238d9bd1711dc12e3ab3856bb1dec75a7dc7d2f00f16c2c5ad7c0b akonadi-mime-19.12.1.tar.xz"
diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD
index 349967d5a..1337c3c20 100644
--- a/user/akonadi/APKBUILD
+++ b/user/akonadi/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=akonadi
-pkgver=18.12.3
-pkgrel=1
+pkgver=19.12.1
+pkgrel=0
pkgdesc="Libraries and storage system for PIM data"
url="https://community.kde.org/KDE_PIM/Akonadi"
arch="all"
@@ -16,13 +16,11 @@ makedepends="$depends_dev cmake extra-cmake-modules libxslt-dev qt5-qttools-dev
kdesignerplugin-dev ki18n-dev kiconthemes-dev kitemviews-dev kio-dev
kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/akonadi-$pkgver.tar.xz
+source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-$pkgver.tar.xz
akonadiserverrc
- attributes.patch
"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -33,17 +31,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/usr/share/config/akonadi
@@ -51,6 +47,5 @@ package() {
"$pkgdir"/usr/share/config/akonadi
}
-sha512sums="f97e716be612001a8176f20afbe80a1cf4c78c6d348d92e542307ea951e1ff74189d2f0847675ed44ad65845b52a5180346b3866f5a8d82b55ed613d107ac346 akonadi-18.12.3.tar.xz
-b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc
-63a26cf5c20583a372146d11050f5003242997743fe9470fb2b7556d5aebb58c06dfeefc0c14c86a435f7172126dac0d52b1701c6bd872f10531bf1d99625e93 attributes.patch"
+sha512sums="3a38f6bbdb12a48c3da63466271d880e8371349ec8eef697b0bd64619a54e0355611fd7e2580b6e1f56b0fdae2cbe5fc9652579b7aff6ddbfae3b8b7e7a152e7 akonadi-19.12.1.tar.xz
+b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc"
diff --git a/user/akonadi/attributes.patch b/user/akonadi/attributes.patch
deleted file mode 100644
index a49db7f37..000000000
--- a/user/akonadi/attributes.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-From 1d8851495bcfa6ff5d3fa35882b68fdf68b21a7f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
-Date: Thu, 21 Mar 2019 13:22:58 +0100
-Subject: Fix a regression when updating attributes
-
-This fixes a regression introduced in 3a062e6a and 6054e42d where some
-attributes were not sent to the Akonadi server in update job even though
-they were modified. This was due to a bad API design which returns a
-non-const pointer to an attribute from a const method, so callers sometimes
-modify the returned attribute on a const object. Since the method itself
-is const though, it did not mark the attribute as modified.
-
-Proper fix is to introduce a purely const and non-const overloads for
-the attribute accessors, unfortunatelly this requires fixing a lot of our code
-in many places first to not abuse the non-constness of the returned
-attribute.
-
-Note that since the code is in an inlined method, all clients should be
-recompiled.
-
-CCMAIL: faure@kde.org
----
- src/core/collection.h | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/core/collection.h b/src/core/collection.h
-index 50c0926..b5a496c 100644
---- a/src/core/collection.h
-+++ b/src/core/collection.h
-@@ -584,14 +584,19 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option)
- template <typename T>
- inline T *Akonadi::Collection::attribute() const
- {
-- const T dummy;
-- if (hasAttribute(dummy.type())) {
-- T *attr = dynamic_cast<T *>(attribute(dummy.type()));
-+ const QByteArray type = T().type();
-+ if (hasAttribute(type)) {
-+ T *attr = dynamic_cast<T *>(attribute(type));
- if (attr) {
-+ // FIXME: This method returns a non-const pointer, so callers may still modify the
-+ // attribute. Unfortunately, just making this function return a const pointer and
-+ // creating a non-const overload does not work, as many users of this function abuse the
-+ // non-const pointer and modify the attribute even on a const object.
-+ const_cast<Collection*>(this)->markAttributesChanged();
- return attr;
- }
- //reuse 5250
-- qWarning() << "Found attribute of unknown type" << dummy.type()
-+ qWarning() << "Found attribute of unknown type" << type
- << ". Did you forget to call AttributeFactory::registerAttribute()?";
- }
-
---
-cgit v1.1
-
-From 53ad3b6d73d92ea289cf0183c10e2b8a35c8127a Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Thu, 21 Mar 2019 23:37:36 +0100
-Subject: Fix collection detaching at the wrong time in attribute()
-
-Summary:
-Found in FatCRM where changes to collection attributes were not stored
-anymore.
-
-Test Plan:
-New unittest to ensure that we get the attribute from the
-detached collection, not from the original one.
-
-Reviewers: dvratil
-
-Reviewed By: dvratil
-
-Subscribers: kde-pim
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D19741
----
- autotests/libs/collectionattributetest.cpp | 15 +++++++++++++++
- autotests/libs/collectionattributetest.h | 1 +
- src/core/collection.h | 8 ++------
- 3 files changed, 18 insertions(+), 6 deletions(-)
-
-diff --git a/autotests/libs/collectionattributetest.cpp b/autotests/libs/collectionattributetest.cpp
-index e264a37..9c46561 100644
---- a/autotests/libs/collectionattributetest.cpp
-+++ b/autotests/libs/collectionattributetest.cpp
-@@ -240,3 +240,18 @@ void CollectionAttributeTest::testCollectionIdentificationAttribute()
- QCOMPARE(parsed.identifier(), id);
- QCOMPARE(parsed.collectionNamespace(), ns);
- }
-+
-+void CollectionAttributeTest::testDetach()
-+{
-+ // GIVEN a collection with an attribute
-+ Collection col;
-+ col.attribute<TestAttribute>(Akonadi::Collection::AddIfMissing);
-+ Collection col2 = col; // and a copy, so that non-const access detaches
-+
-+ // WHEN
-+ TestAttribute *attr = col2.attribute<TestAttribute>(Akonadi::Collection::AddIfMissing);
-+ TestAttribute *attr2 = col2.attribute<TestAttribute>();
-+
-+ // THEN
-+ QCOMPARE(attr, attr2);
-+}
-diff --git a/autotests/libs/collectionattributetest.h b/autotests/libs/collectionattributetest.h
-index 420df78..2afa9eb 100644
---- a/autotests/libs/collectionattributetest.h
-+++ b/autotests/libs/collectionattributetest.h
-@@ -32,6 +32,7 @@ private Q_SLOTS:
- void testDefaultAttributes();
- void testCollectionRightsAttribute();
- void testCollectionIdentificationAttribute();
-+ void testDetach();
- };
-
- #endif
-diff --git a/src/core/collection.h b/src/core/collection.h
-index b5a496c..9c19cc9 100644
---- a/src/core/collection.h
-+++ b/src/core/collection.h
-@@ -565,10 +565,10 @@ inline T *Akonadi::Collection::attribute(Collection::CreateOption option)
- Q_UNUSED(option);
-
- const T dummy;
-+ markAttributesChanged();
- if (hasAttribute(dummy.type())) {
- T *attr = dynamic_cast<T *>(attribute(dummy.type()));
- if (attr) {
-- markAttributesChanged();
- return attr;
- }
- //Reuse 5250
-@@ -585,14 +585,10 @@ template <typename T>
- inline T *Akonadi::Collection::attribute() const
- {
- const QByteArray type = T().type();
-+ const_cast<Collection*>(this)->markAttributesChanged();
- if (hasAttribute(type)) {
- T *attr = dynamic_cast<T *>(attribute(type));
- if (attr) {
-- // FIXME: This method returns a non-const pointer, so callers may still modify the
-- // attribute. Unfortunately, just making this function return a const pointer and
-- // creating a non-const overload does not work, as many users of this function abuse the
-- // non-const pointer and modify the attribute even on a const object.
-- const_cast<Collection*>(this)->markAttributesChanged();
- return attr;
- }
- //reuse 5250
---
-cgit v1.1
diff --git a/user/alegreya-sans/APKBUILD b/user/alegreya-sans/APKBUILD
index f14a5f467..1f731cc63 100644
--- a/user/alegreya-sans/APKBUILD
+++ b/user/alegreya-sans/APKBUILD
@@ -15,8 +15,7 @@ source="Alegreya-Sans-$pkgver.tar.gz::https://github.com/huertatipografica/Alegr
builddir="$srcdir/Alegreya-Sans-$pkgver"
package() {
- cd "$builddir"/fonts/otf
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/fonts/otf/*.otf
}
sha512sums="8052fe15717ecdfd301d878b03282ff4fd472a7e13a1e581c84d6f3993780897354d103aeda2f027350d9e56466914be38e97417fe450ec32e5823769015d0a4 Alegreya-Sans-2.008.tar.gz"
diff --git a/user/alegreya/APKBUILD b/user/alegreya/APKBUILD
index 354b8c276..0c035efc2 100644
--- a/user/alegreya/APKBUILD
+++ b/user/alegreya/APKBUILD
@@ -15,7 +15,6 @@ source="Alegreya-$pkgver.tar.gz::https://github.com/huertatipografica/Alegreya/a
builddir="$srcdir/Alegreya-$pkgver"
package() {
- cd "$builddir"
install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ fonts/otf/*.otf
}
diff --git a/user/alkimia/APKBUILD b/user/alkimia/APKBUILD
index b864f1105..fa4d4c35d 100644
--- a/user/alkimia/APKBUILD
+++ b/user/alkimia/APKBUILD
@@ -14,7 +14,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtwebkit-dev
kconfig-dev kcoreaddons-dev kdelibs4support-dev knewstuff-dev
kpackage-dev plasma-framework-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz"
+source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz
+ webkit.patch
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -27,7 +29,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -39,4 +41,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6 alkimia-8.0.2.tar.xz"
+sha512sums="5c0c121cac121f68042208ea9b126e4916ee4fa11f41d99709fbf11c44f433ec5eb0c0e112a4e6dc9ccfbc8a5295729cee566783f089bbe9ec2b32b5084839a6 alkimia-8.0.2.tar.xz
+0a9db2efedb01bcd31a3d15890b00f2186d4ff1fc37426f09bd659ae757afca15f996a52f4b6cc64b6b8dfd7010683bbb6e72c8e89a3332b37f4c85828e2de76 webkit.patch"
diff --git a/user/alkimia/webkit.patch b/user/alkimia/webkit.patch
new file mode 100644
index 000000000..224ac2e8b
--- /dev/null
+++ b/user/alkimia/webkit.patch
@@ -0,0 +1,32 @@
+--- alkimia-8.0.2/src/CMakeLists.txt.old 2019-09-06 16:21:26.219957302 +0000
++++ alkimia-8.0.2/src/CMakeLists.txt 2020-01-14 09:56:58.676667188 +0000
+@@ -115,7 +115,6 @@
+ alkimia-internal
+ ${QT_USE_LIBSPREFIX}Core
+ ${ALKIMIA_LIBS}
+- ${QT_USE_LIBSPREFIX}WebKit
+ ${QT_USE_LIBSPREFIX}DBus
+ PUBLIC
+ ${MP_LIBRARIES}
+--- alkimia-8.0.2/autotests/CMakeLists.txt.old 2019-09-06 16:21:26.211957302 +0000
++++ alkimia-8.0.2/autotests/CMakeLists.txt 2020-01-14 09:57:05.305955497 +0000
+@@ -5,7 +5,7 @@
+ ${QT_USE_LIBSPREFIX}Test
+ ${QT_USE_LIBSPREFIX}Core
+ ${QT_USE_LIBSPREFIX}DBus
+- ${QT_USE_LIBSPREFIX}WebKit
++ ${QT_USE_LIBSPREFIX}WebKitWidgets
+ ${MP_LIBRARIES}
+ )
+
+--- alkimia-8.0.2/tests/CMakeLists.txt.old 2019-09-06 16:21:26.219957302 +0000
++++ alkimia-8.0.2/tests/CMakeLists.txt 2020-01-14 09:57:10.785367251 +0000
+@@ -3,7 +3,7 @@
+ alkimia
+ alkimia-internal
+ ${QT_USE_LIBSPREFIX}Core
+- ${QT_USE_LIBSPREFIX}WebKit
++ ${QT_USE_LIBSPREFIX}WebKitWidgets
+ )
+
+ if(BUILD_QT4)
diff --git a/user/alpine/APKBUILD b/user/alpine/APKBUILD
index 189057dea..194e501fe 100644
--- a/user/alpine/APKBUILD
+++ b/user/alpine/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=alpine
pkgver=2.21
pkgrel=0
@@ -9,19 +9,18 @@ arch="all"
license="Apache-2.0"
depends=""
makedepends="aspell-dev krb5-dev linux-pam-dev ncurses-dev openldap-dev
- openssl-dev"
+ openssl-dev autoconf automake libtool"
subpackages="$pkgname-doc"
source="http://alpine.x10host.com/alpine/release/src/alpine-$pkgver.tar.xz
- support-musl.patch"
+ support-musl.patch
+ "
prepare() {
- cd "$builddir"
default_prepare
autoreconf -vif
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,14 +32,12 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
sha512sums="a2a36a033c8af79810816a7da7185c269808ba6d84d013691fd8b3764c63f5fb2284e6844ec5a5e99d168514ae636debf59fae962533a2916679e4e9109c6264 alpine-2.21.tar.xz
-cdf827b5947fd14b6a6c1ad86df4ff1b8be1ffd51279aaa02376b2b60f3de742c54364e18d73d9a75c5c87ed3c8668a3f0c9eb59733f8da195e85833b4364782 support-musl.patch"
+f26aaac4f81762227254e913f15c18b444e89d92b6885d62755d673d1f3097a126d297dc655b619d91b83bf5645ed0b4d5454c74a95cc142cd5fe3cb391e81cd support-musl.patch"
diff --git a/user/alpine/support-musl.patch b/user/alpine/support-musl.patch
index ab3c2d857..a63a351d9 100644
--- a/user/alpine/support-musl.patch
+++ b/user/alpine/support-musl.patch
@@ -1,6 +1,6 @@
--- ./configure.ac.orig
+++ ./configure.ac
-@@ -723,7 +723,7 @@
+@@ -726,7 +726,7 @@
else
dnl preload c-client default locations/options
case $host in
@@ -9,7 +9,7 @@
if test -f /etc/fedora-release -o -f /etc/redhat-release -o -f /etc/redhat_version ; then
alpine_SSLTYPE="nopwd"
if test -d /etc/pki/tls ; then
-@@ -1059,7 +1059,7 @@
+@@ -1070,7 +1070,7 @@
dnl build from c-client. Most of this will go away when c-client
dnl adopts configure
case "$host" in
diff --git a/user/alsa-plugins/APKBUILD b/user/alsa-plugins/APKBUILD
index 1dee01738..2976ee3f3 100644
--- a/user/alsa-plugins/APKBUILD
+++ b/user/alsa-plugins/APKBUILD
@@ -1,13 +1,14 @@
# Contributor: Taner Tas <taner76@gmail.com>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=alsa-plugins
-pkgver=1.1.9
+pkgver=1.2.1
pkgrel=0
pkgdesc="Advanced Linux Sound Architecture (ALSA) plugins"
url="https://www.alsa-project.org/main/index.php/Main_Page"
arch="all"
options="!check" # No test suite.
license="GPL-2.0+ AND LGPL-2.1+ AND BSD-3-Clause AND MIT"
+depends=""
makedepends="linux-headers alsa-lib-dev speexdsp-dev ffmpeg-dev
libsamplerate-dev pulseaudio-dev"
subpackages="$pkgname-lavcrate $pkgname-pulse $pkgname-a52"
@@ -59,4 +60,4 @@ a52() {
"$subpkgdir"/usr/share/alsa/alsa.conf.d/
}
-sha512sums="1969dfe8f2bb4283e81a18da73d2f7f86d8788d1a8764d7195b4830b2f4704c208eacb50a1e26e20c9fe57e7d5bb06a004112d84cc86b4682b4180d2fec4d5d9 alsa-plugins-1.1.9.tar.bz2"
+sha512sums="a49ef9290b66855112e301a5fd5a0932f13a50254e164f3340f2b342a36469532ee783beabfe5e95870dbf4cd81ca1e8d0415d94c8c7ee963133fb3c343721de alsa-plugins-1.2.1.tar.bz2"
diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD
index d63b3acbd..4bae36cb5 100644
--- a/user/analitza/APKBUILD
+++ b/user/analitza/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=analitza
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Mathematical object library"
url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html"
@@ -12,10 +12,9 @@ depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev eigen-dev
qt5-qtsvg-dev qt5-qtdeclarative-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/analitza-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/analitza-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,19 +25,17 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3
- ${CMAKE_CROSSOPTS}
+ -DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(export|curve|plots|surface)'
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="cab6796e0b2e6223ad59b9754add045277834c6b4ae2ed4a498d116d9daec158543a8d1276db65a5f34c41064094ee4534f7fd87d3dc991825731f87a151eb87 analitza-19.08.2.tar.xz"
+sha512sums="793aba78447c1366860f90a6956e65e3a4af9e16a73c5dfe94a08c34ecb4eca364bf4485ac6bef1448f1748b1ac4b2f0fc3373f8fc194bb9435b1acda86a6d0a analitza-19.12.1.tar.xz"
diff --git a/user/anonymous-pro/APKBUILD b/user/anonymous-pro/APKBUILD
index 33466e792..2ea302452 100644
--- a/user/anonymous-pro/APKBUILD
+++ b/user/anonymous-pro/APKBUILD
@@ -17,9 +17,8 @@ source="https://www.marksimonson.com/assets/content/fonts/AnonymousPro-$_prev.zi
builddir="$srcdir/AnonymousPro-1.002.001"
package() {
- cd "$srcdir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ AnonymousPro-1.002.001/*.ttf
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ AnonymousProMinus-$pkgver/*.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/AnonymousPro-1.002.001/*.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/AnonymousProMinus-$pkgver/*.ttf
}
sha512sums="7606d520ad79fbf4e13d676c1aff61b764dce74e170f8783b8e606f7907c4b8db0871e5568504d15aa23ca26e925ada4eb6b60fcf27171dccee0d3d32d9a92a1 AnonymousPro-1.002.zip
diff --git a/user/ant/APKBUILD b/user/ant/APKBUILD
index 8afaf5929..ea5d40f04 100644
--- a/user/ant/APKBUILD
+++ b/user/ant/APKBUILD
@@ -9,12 +9,14 @@ pkgdesc="Java-based build tool"
url="http://ant.apache.org/"
arch="noarch"
license="Apache-2.0"
-makedepends=""
depends="openjdk8"
+makedepends=""
+subpackages=""
source="https://www-eu.apache.org/dist/ant/source/apache-$pkgname-$pkgver-src.tar.gz
ant.sh
imageio_fix_java_test.patch
- imageio_fix_test.patch"
+ imageio_fix_test.patch
+ "
builddir="$srcdir/apache-$pkgname-$pkgver"
_anthome="/usr/lib/java/$pkgname"
diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD
index 1588b844b..6488ffa9f 100644
--- a/user/apache-httpd/APKBUILD
+++ b/user/apache-httpd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=apache-httpd
_pkgreal=httpd
pkgver=2.4.41
@@ -21,7 +21,7 @@ subpackages="$pkgname-dev
$pkgname-ldap
$pkgname-openrc"
provides="apache2 apache2-ssl"
-source="$pkgname-$pkgver.tar.gz::https://github.com/apache/httpd/archive/$pkgver.tar.gz
+source="https://www-us.apache.org/dist//httpd/httpd-$pkgver.tar.gz
adelie.layout
apache-httpd.confd
apache-httpd.initd
@@ -143,7 +143,7 @@ ldap() {
"$subpkgdir"/usr/libexec/apache2
}
-sha512sums="447310a625c0aaff10777c70d178853536c010a376b7e27a137461e5b83e438bc0548b90f47c21f1d047f685d082db84920bc6b1365f6e1f16698ba059df927a apache-httpd-2.4.41.tar.gz
+sha512sums="02807a576ea29bd93e648c68e3ad853d5e4971177a0881d6a4873e9c4c5afd6d56877454b666429e70732488a258e0333a0f354d9dbbfd89fc3b38f12f0a0dce httpd-2.4.41.tar.gz
c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout
336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd
5762d53f39ce7ecd730e05ddf6c063ede65cd75b9e7d67217784c80366646491ef9474306e8eb119c8fb5b4358407b07636a4e9cd82325d8df4e3e00dabc3459 apache-httpd.initd
diff --git a/user/appres/APKBUILD b/user/appres/APKBUILD
index 49dcb6115..c0d655348 100644
--- a/user/appres/APKBUILD
+++ b/user/appres/APKBUILD
@@ -4,17 +4,15 @@ pkgname=appres
pkgver=1.0.5
pkgrel=0
pkgdesc="list X application resource database"
-url="https://xorg.freedesktop.org/"
+url="https://www.X.org/"
arch="all"
license="X11"
depends=""
makedepends="libx11-dev libxt-dev xproto"
-install=""
subpackages="$pkgname-doc"
-source="https://xorg.freedesktop.org/archive/individual/app/$pkgname-$pkgver.tar.bz2"
+source="https://www.x.org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/apr-util/APKBUILD b/user/apr-util/APKBUILD
index 36a8f4a59..6dd56ef3e 100644
--- a/user/apr-util/APKBUILD
+++ b/user/apr-util/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer:
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=apr-util
pkgver=1.6.1
pkgrel=0
@@ -6,16 +6,15 @@ pkgdesc="The Apache Portable Runtime Utility Library"
url="http://apr.apache.org/"
arch="all"
license="Apache-2.0"
-depends=
-subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql
- $pkgname-dbd_sqlite3 $pkgname-ldap"
+depends=""
depends_dev="db-dev expat-dev openldap-dev openssl-dev postgresql-dev
sqlite-dev"
makedepends="$depends_dev apr-dev bash chrpath openssl"
+subpackages="$pkgname-dev $pkgname-dbm_db $pkgname-dbd_pgsql
+ $pkgname-dbd_sqlite3 $pkgname-ldap"
source="http://www.apache.org/dist/apr/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,13 +32,11 @@ build() {
}
check() {
- cd "$builddir"
# testxlate fails because UTF-7 is unsupported
make check || return 0
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm "$pkgdir"/usr/lib/*.exp
chrpath -d "$pkgdir"/usr/lib/*.so.*
@@ -48,7 +45,7 @@ package() {
_mv_mod() {
pkgdesc="The Apache Portable Runtime Utility Library - $2 driver"
depends=
- local _moddir="usr/lib/apr-util-1"
+ _moddir="usr/lib/apr-util-1"
mkdir -p "$subpkgdir"/$_moddir
mv "$pkgdir"/$_moddir/apr_$1*.so "$subpkgdir"/$_moddir/
}
diff --git a/user/apr/APKBUILD b/user/apr/APKBUILD
index 5b973eeec..b527b73e4 100644
--- a/user/apr/APKBUILD
+++ b/user/apr/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer:
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=apr
pkgver=1.7.0
pkgrel=0
@@ -15,7 +15,6 @@ source="http://www.apache.org/dist/$pkgname/$pkgname-$pkgver.tar.bz2
"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make -j1 check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD
index dc31e30d4..b26a95632 100644
--- a/user/ark/APKBUILD
+++ b/user/ark/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ark
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Graphical file compression/decompression utility with support for multiple formats"
url="https://utils.kde.org/projects/ark/"
@@ -12,12 +12,11 @@ depends="lzop shared-mime-info unzip zip"
makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev
kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev kiconthemes-dev
kitemmodels-dev kio-dev kservice-dev kparts-dev kpty-dev libarchive-dev
- kwidgetsaddons-dev xz-dev"
+ kwidgetsaddons-dev libzip-dev xz-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ark-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/ark-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="c4ae42a68a9f00238de4dcfef066c3e20f9a896fe00473b4db4ca4aadc8db1f63c876a98833799c533962283fe3f64be36e563e5624e0dae1978452438392788 ark-19.08.2.tar.xz"
+sha512sums="6d0b5ea84f5b6b947bf040ed9b6b1c2f0a1f58f75957603481b47d90b4f5d911aa2331e46bd92b4b3a89307664bbf9726273a96bdd165b5bd108645127df1e8e ark-19.12.1.tar.xz"
diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD
index f114f16bb..eb2259091 100644
--- a/user/artikulate/APKBUILD
+++ b/user/artikulate/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=artikulate
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Pronunciation trainer for languages"
url="https://www.kde.org/applications/education/artikulate/"
@@ -12,9 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev
karchive-dev kconfig-dev kcrash-dev kdoctools-dev ki18n-dev
kirigami2-dev knewstuff-dev kxmlgui-dev qt5-qtmultimedia-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/artikulate-$pkgver.tar.xz
- inappropriate-qt.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/artikulate-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -28,7 +26,7 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_TESTING=OFF \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -41,5 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="72e4d0bfaa88b4133964f07fe2e20d9f2cc0bee718388fe56f1f1518f75acf31b4068fa87e652c370e18e6b53addce3414430ee43c9118782925c55bb2536dc6 artikulate-19.08.2.tar.xz
-dd9a912f7499fee5a7d737f987ba97856e373d48d944d45fb2cfaf192bc5c79f05dc530f0ca62d5982ef86dcf1479211186657ecef0450c07a43527bd66eb7c8 inappropriate-qt.patch"
+sha512sums="b0e648adc7ee390ee31a2259b2ef891cdf368e6dbdf57c397280447920fef853d443e6dbe7f557dbd6d50c52ce944ee9f87f0021f231af2f888c41480abfd476 artikulate-19.12.1.tar.xz"
diff --git a/user/artikulate/inappropriate-qt.patch b/user/artikulate/inappropriate-qt.patch
deleted file mode 100644
index fe88499bd..000000000
--- a/user/artikulate/inappropriate-qt.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- artikulate-19.08.0/CMakeLists.txt.old 2019-08-09 00:13:40.000000000 +0000
-+++ artikulate-19.08.0/CMakeLists.txt 2019-08-15 12:16:43.965261084 +0000
-@@ -42,7 +42,7 @@
- include(FeatureSummary)
- include(GenerateExportHeader)
-
--find_package(Qt5 5.10 REQUIRED COMPONENTS
-+find_package(Qt5 5.9.7 REQUIRED COMPONENTS
- Widgets
- Sql
- XmlPatterns
---- artikulate-19.08.0/CMakeLists.txt.old 2019-08-15 12:17:13.502105634 +0000
-+++ artikulate-19.08.0/CMakeLists.txt 2019-08-15 12:17:51.957997353 +0000
-@@ -51,7 +51,7 @@
- QuickWidgets
- Test
- )
--find_package(KF5 5.57 REQUIRED COMPONENTS
-+find_package(KF5 5.54 REQUIRED COMPONENTS
- Archive
- Config
- Crash
diff --git a/user/aspell-dict-af/APKBUILD b/user/aspell-dict-af/APKBUILD
index b06ffd33f..4aa8979d1 100644
--- a/user/aspell-dict-af/APKBUILD
+++ b/user/aspell-dict-af/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-af
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,21 +7,19 @@ pkgrel=0
pkgdesc="Afrikaans dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
+options="!check" # No test suite.
license="LGPL-2.1-only"
-options="!check" # no tests
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/af/aspell-af-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/af/aspell-af-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-af-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-am/APKBUILD b/user/aspell-dict-am/APKBUILD
index a4be5ad68..79e44d947 100644
--- a/user/aspell-dict-am/APKBUILD
+++ b/user/aspell-dict-am/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-am
pkgver=0.03.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,21 +7,19 @@ pkgrel=0
pkgdesc="Amharic dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="Public-Domain"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/am/aspell6-am-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/am/aspell6-am-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-am-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-ar/APKBUILD b/user/aspell-dict-ar/APKBUILD
index 34ffabad4..6880ae201 100644
--- a/user/aspell-dict-ar/APKBUILD
+++ b/user/aspell-dict-ar/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ar
pkgver=1.2.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,21 +7,19 @@ pkgrel=0
pkgdesc="Arabic dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/ar/aspell6-ar-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/ar/aspell6-ar-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-ar-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-ast/APKBUILD b/user/aspell-dict-ast/APKBUILD
index c8fdd5708..9e7c0320c 100644
--- a/user/aspell-dict-ast/APKBUILD
+++ b/user/aspell-dict-ast/APKBUILD
@@ -1,26 +1,24 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ast
pkgver=0.01
pkgrel=0
pkgdesc="Asturian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
+options="!check" # No test suite.
license="LGPL-2.1-only"
-options="!check" # no tests
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/ast/aspell6-ast-$pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/ast/aspell6-ast-$pkgver.tar.bz2"
builddir="$srcdir/aspell6-ast-$pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-az/APKBUILD b/user/aspell-dict-az/APKBUILD
index 62cc4508d..9854bcc48 100644
--- a/user/aspell-dict-az/APKBUILD
+++ b/user/aspell-dict-az/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-az
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,21 +7,19 @@ pkgrel=0
pkgdesc="Azerbaijani dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
+options="!check" # No test suite.
license="GPL-2.0-only"
-options="!check" # no tests
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/az/aspell6-az-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/az/aspell6-az-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-az-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-be/APKBUILD b/user/aspell-dict-be/APKBUILD
index a25306568..8c0c67349 100644
--- a/user/aspell-dict-be/APKBUILD
+++ b/user/aspell-dict-be/APKBUILD
@@ -1,26 +1,24 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-be
pkgver=0.01
pkgrel=0
pkgdesc="Belarusian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
+options="!check" # No test suite.
license="LGPL-2.1-only"
-options="!check" # no tests
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/be/aspell5-be-$pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/be/aspell5-be-$pkgver.tar.bz2"
builddir="$srcdir/aspell5-be-$pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-bg/APKBUILD b/user/aspell-dict-bg/APKBUILD
index 3af15fa3a..809c98aab 100644
--- a/user/aspell-dict-bg/APKBUILD
+++ b/user/aspell-dict-bg/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-bg
pkgver=4.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,21 +7,19 @@ pkgrel=0
pkgdesc="Bulgarian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
+options="!check" # No test suite.
license="GPL-2.0-only"
-options="!check" # no tests
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/bg/aspell6-bg-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/bg/aspell6-bg-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-bg-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-bn/APKBUILD b/user/aspell-dict-bn/APKBUILD
index a2a9c9eac..92b006733 100644
--- a/user/aspell-dict-bn/APKBUILD
+++ b/user/aspell-dict-bn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-bn
pkgver=0.01.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,21 +7,19 @@ pkgrel=0
pkgdesc="Bengali dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
+options="!check" # No test suite.
license="GPL-2.0-only"
-options="!check" # no tests
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/bn/aspell6-bn-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/bn/aspell6-bn-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-bn-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-br/APKBUILD b/user/aspell-dict-br/APKBUILD
index 60204987a..0cc1b2057 100644
--- a/user/aspell-dict-br/APKBUILD
+++ b/user/aspell-dict-br/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-br
pkgver=0.50.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,21 +7,19 @@ pkgrel=0
pkgdesc="Breton dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
+options="!check" # No test suite.
license="GPL-2.0-only"
-options="!check" # no tests
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/br/aspell-br-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/br/aspell-br-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-br-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-ca/APKBUILD b/user/aspell-dict-ca/APKBUILD
index 9facc23cf..98f3e14ac 100644
--- a/user/aspell-dict-ca/APKBUILD
+++ b/user/aspell-dict-ca/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ca
pkgver=2.1.5.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,21 +7,19 @@ pkgrel=0
pkgdesc="Catalan dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
+options="!check" # No test suite.
license="GPL-2.0-only"
-options="!check" # no tests
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/ca/aspell6-ca-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/ca/aspell6-ca-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-ca-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-cs/APKBUILD b/user/aspell-dict-cs/APKBUILD
index 768829bb9..31a59210c 100644
--- a/user/aspell-dict-cs/APKBUILD
+++ b/user/aspell-dict-cs/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-cs
pkgver=20040614.1
_pkgver=${pkgver%.*}-${pkgver#*.}
@@ -7,21 +7,19 @@ pkgrel=0
pkgdesc="Czech dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
+options="!check" # No test suite.
license="GPL-2.0-only"
-options="!check" # no tests
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/cs/aspell6-cs-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/cs/aspell6-cs-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-cs-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-csb/APKBUILD b/user/aspell-dict-csb/APKBUILD
index c2ceff90b..8e4be27dc 100644
--- a/user/aspell-dict-csb/APKBUILD
+++ b/user/aspell-dict-csb/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-csb
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,21 +7,19 @@ pkgrel=0
pkgdesc="Kashubian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
+options="!check" # No test suite.
license="GPL-2.0-only"
-options="!check" # no tests
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/csb/aspell6-csb-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/csb/aspell6-csb-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-csb-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/aspell-dict-cy/APKBUILD b/user/aspell-dict-cy/APKBUILD
index 4cdd1a287..e1f64d6c7 100644
--- a/user/aspell-dict-cy/APKBUILD
+++ b/user/aspell-dict-cy/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-cy
pkgver=0.50.3
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Welsh dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/cy/aspell-cy-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/cy/aspell-cy-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-cy-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="feb68ea9749788a45725a5bc706ea2c24e73bada4fbce907bbe3b884d16875458516dd53fe7f5d62179cafe40117416f7068c1e6e0292353447c2ed7a494ad6b aspell-cy-0.50-3.tar.bz2"
diff --git a/user/aspell-dict-da/APKBUILD b/user/aspell-dict-da/APKBUILD
index 230fabcdd..db515b3b9 100644
--- a/user/aspell-dict-da/APKBUILD
+++ b/user/aspell-dict-da/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-da
pkgver=1.4.42.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Danish dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/da/aspell5-da-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/da/aspell5-da-$_pkgver.tar.bz2"
builddir="$srcdir/aspell5-da-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="d431464b254670b56179ed19a03efe91e65e4dad3e3132f264830cde35f3da200179b39bd1ac21565287bbc1143fd74079c9082f2639fbc4573f2dfffbbecbc6 aspell5-da-1.4.42-1.tar.bz2"
diff --git a/user/aspell-dict-de-alt/APKBUILD b/user/aspell-dict-de-alt/APKBUILD
index 0d8effa19..8140d5f0a 100644
--- a/user/aspell-dict-de-alt/APKBUILD
+++ b/user/aspell-dict-de-alt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-de-alt
pkgver=2.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="German (Old Spelling) dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/de-alt/aspell6-de-alt-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/de-alt/aspell6-de-alt-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-de-alt-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="823324bc299e9adbbe5308681a5f74ee2a76a32816e8abc9d19c3da0c4eae756eaf1a3c76e2d75449b51010854ab869379073b1fe377e505662187d6c38230b4 aspell6-de-alt-2.1-1.tar.bz2"
diff --git a/user/aspell-dict-de/APKBUILD b/user/aspell-dict-de/APKBUILD
index 080984aa3..7c0f5f834 100644
--- a/user/aspell-dict-de/APKBUILD
+++ b/user/aspell-dict-de/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-de
pkgver=20161207
pkgrel=0
pkgdesc="German dictionaries for aspell"
url="http://j3e.de/ispell/igerman98/index.html"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
@@ -15,17 +15,17 @@ builddir="$srcdir/igerman98-$pkgver"
_langs="de_DE de_AT de_CH"
build() {
- cd "$builddir"
- for i in $_langs; do
- make aspell/${i}.rws
- done
+ for i in $_langs; do
+ make aspell/${i}.rws
+ done
}
package() {
- cd "$builddir"/aspell
- mkdir -p "$pkgdir"/usr/share/aspell
- for i in $_langs; do
- install -m644 ${i}.alias ${i}.dat ${i}_affix.dat ${i}.multi ${i}.rws "$pkgdir"/usr/share/aspell
- done
+ mkdir -p "$pkgdir"/usr/share/aspell
+ cd aspell
+ for i in $_langs; do
+ install -m644 ${i}.alias ${i}.dat ${i}_affix.dat ${i}.multi ${i}.rws "$pkgdir"/usr/share/aspell
+ done
}
+
sha512sums="62be84ac76fd2a0acc25439aa4c04339e54a1c7a2f619d76e0e01cfb53eeeca263c5cc335e315f9adeee9bab5cc392d4c473ca55cbed371c04c123d6fa2272aa igerman98-20161207.tar.bz2"
diff --git a/user/aspell-dict-el/APKBUILD b/user/aspell-dict-el/APKBUILD
index 37149af35..e0a194d90 100644
--- a/user/aspell-dict-el/APKBUILD
+++ b/user/aspell-dict-el/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-el
pkgver=0.08.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Greek dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/el/aspell6-el-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/el/aspell6-el-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-el-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="ea4ca962afc552e5525bbb84c7a8f980a2cc07265de748c68fb322c1dbfc52b0ba07b4a561966bb89e850ec60b11a3f21befa6ca8b66501e9ad8b5314ddd1f47 aspell6-el-0.08-0.tar.bz2"
diff --git a/user/aspell-dict-en/APKBUILD b/user/aspell-dict-en/APKBUILD
index c3a848440..bd3e44e93 100644
--- a/user/aspell-dict-en/APKBUILD
+++ b/user/aspell-dict-en/APKBUILD
@@ -1,28 +1,26 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-en
-pkgver=2018.04.16.0
+pkgver=2019.10.06.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
pkgrel=0
pkgdesc="English dictionaries for aspell"
url="http://aspell.net/"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="BSD-3-Clause AND Public-Domain"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/en/aspell6-en-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-en-$_pkgver"
build() {
- cd "$builddir"
./configure --vars DESTDIR="$pkgdir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="70447f5f11a6a2d96e58376ac06e78add59e4eb237ca40ed0752f481dabe1a6e9e227fd20ba95a5612de1bb4357cd65760a31c94efe66f8499b9ed031e9846c2 aspell6-en-2018.04.16-0.tar.bz2"
+sha512sums="e16c76bd2da4515af6f1e3dbbc1c5f26fc3be550e022cbb5b741b867be2acc1359a8902af1b359f6c8cff38de01b9aa43a02153a5a6bc618296e75bf86020a6e aspell6-en-2019.10.06-0.tar.bz2"
diff --git a/user/aspell-dict-eo/APKBUILD b/user/aspell-dict-eo/APKBUILD
index a03d2b2c8..cefd65d6d 100644
--- a/user/aspell-dict-eo/APKBUILD
+++ b/user/aspell-dict-eo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-eo
pkgver=2.1.20000225.a2
_pkgver=${pkgver%.*}${pkgver#*.*.*.}
@@ -8,20 +8,20 @@ pkgrel=0
pkgdesc="Esperanto dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/eo/aspell6-eo-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/eo/aspell6-eo-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-eo-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="172ff88745e36abccf47ed8526868e3c2fd1f41c6da15893e723ef70bb29fc0e4b4e614f1eae8b3db8206f971f9a9cd9ec627fce2dae611804a276118367dfda aspell6-eo-2.1.20000225a-2.tar.bz2"
diff --git a/user/aspell-dict-es/APKBUILD b/user/aspell-dict-es/APKBUILD
index 9216f3bec..80a8b2848 100644
--- a/user/aspell-dict-es/APKBUILD
+++ b/user/aspell-dict-es/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-es
pkgver=1.11.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Spanish dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/es/aspell6-es-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/es/aspell6-es-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-es-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="5d0159f24d6bff43db682a4beb25e82dd362c205acf7c9e0d728808c0e54a8a566befe26316f384099c72e6c429713f8ad7d2dc66a8f04a15e1d5a9cfe2290d8 aspell6-es-1.11-2.tar.bz2"
diff --git a/user/aspell-dict-et/APKBUILD b/user/aspell-dict-et/APKBUILD
index d352e745e..4e84a1f9c 100644
--- a/user/aspell-dict-et/APKBUILD
+++ b/user/aspell-dict-et/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-et
pkgver=0.1.21.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Estonian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/et/aspell6-et-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/et/aspell6-et-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-et-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="b3ed1249dbbb3caf12047407d85a3397f5e9561a59d71e33d6f29f18b9a83baa3f3c8d5a02a22cf0861212ff7b3ea1d33e38a943352e70be3703e0c42ff739ae aspell6-et-0.1.21-1.tar.bz2"
diff --git a/user/aspell-dict-fa/APKBUILD b/user/aspell-dict-fa/APKBUILD
index d08a32657..93def9869 100644
--- a/user/aspell-dict-fa/APKBUILD
+++ b/user/aspell-dict-fa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-fa
pkgver=0.11.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Persian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/fa/aspell6-fa-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/fa/aspell6-fa-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-fa-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="1ed97d3bf8397fe9b3c9215ca3ca6630a06ae5fa1c47b2bbdf9821fbe069b9c097d1e145a6303202cec85047f9cd50bef2bde3adbca0caeb05625932c5f3bfe4 aspell6-fa-0.11-0.tar.bz2"
diff --git a/user/aspell-dict-fi/APKBUILD b/user/aspell-dict-fi/APKBUILD
index 6a4666ded..78a4fa207 100644
--- a/user/aspell-dict-fi/APKBUILD
+++ b/user/aspell-dict-fi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-fi
pkgver=0.7.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Finnish dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/fi/aspell6-fi-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/fi/aspell6-fi-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-fi-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="d1f27bc8e36033cba6ddaa978f2facfe8d134ab70124ec80d5397dba2b533b512755312feaf2afa838f68e4449479953a8b951264fbbfc28cdfd9457f67f67f7 aspell6-fi-0.7-0.tar.bz2"
diff --git a/user/aspell-dict-fo/APKBUILD b/user/aspell-dict-fo/APKBUILD
index eef2193a8..d9631bffd 100644
--- a/user/aspell-dict-fo/APKBUILD
+++ b/user/aspell-dict-fo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-fo
pkgver=0.2.16.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Faroese dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/fo/aspell5-fo-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/fo/aspell5-fo-$_pkgver.tar.bz2"
builddir="$srcdir/aspell5-fo-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="7e99f105cff0e682e2761ba1f91646a3ce657858be819cc598775303d6c08f2c5bd524f72bc0c0b52383aeaf591af56e910e19796732be627d8ab11ad6149126 aspell5-fo-0.2.16-1.tar.bz2"
diff --git a/user/aspell-dict-fr/APKBUILD b/user/aspell-dict-fr/APKBUILD
index 0685c068f..bb0a14d2b 100644
--- a/user/aspell-dict-fr/APKBUILD
+++ b/user/aspell-dict-fr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-fr
pkgver=0.50.3
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="French dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/fr/aspell-fr-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/fr/aspell-fr-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-fr-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="bb5d1faada9283521096a19a8f5abada2a19cc02717f6dde57846ef46a4df253113b10a2bb72d2b0e32e4a3ab24b541a5acd9f4595b908d2f6cd2fc448d8bc3b aspell-fr-0.50-3.tar.bz2"
diff --git a/user/aspell-dict-fy/APKBUILD b/user/aspell-dict-fy/APKBUILD
index 6eee693fe..7331a46f9 100644
--- a/user/aspell-dict-fy/APKBUILD
+++ b/user/aspell-dict-fy/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-fy
pkgver=0.12.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Frisian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/fy/aspell6-fy-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/fy/aspell6-fy-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-fy-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="f63b5436c78a5c0ebec3be1d3c24dced09a264c68e8ad39716e0e9e6bd984aca627bdc875f88b521f87b7f4d147edfce3fc0f4dc4b22fc8ef8d1aa5090fb9bda aspell6-fy-0.12-0.tar.bz2"
diff --git a/user/aspell-dict-ga/APKBUILD b/user/aspell-dict-ga/APKBUILD
index 7ade44261..3ccdb1272 100644
--- a/user/aspell-dict-ga/APKBUILD
+++ b/user/aspell-dict-ga/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ga
pkgver=5.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="Irish dictionaries for aspell"
url="https://cadhan.com/gaelspell/"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
@@ -16,12 +16,12 @@ source="https://github.com/kscanne/gaelspell/releases/download/v$_pkgver2/aspell
builddir="$srcdir/aspell5-ga-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="15c4e3d85c1ad589300f7288af054d0574e849163816e5e5aec56d464a71fcd02eba129ed74ed7ec341bb19ad2578091c6701b36ac23cc5a7972026742e9bb57 aspell5-ga-5.0-0.tar.bz2"
diff --git a/user/aspell-dict-gd/APKBUILD b/user/aspell-dict-gd/APKBUILD
index fa14b77b8..aff399a6b 100644
--- a/user/aspell-dict-gd/APKBUILD
+++ b/user/aspell-dict-gd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-gd
pkgver=0.1.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Scottish Gaelic dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/gd/aspell5-gd-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/gd/aspell5-gd-$_pkgver.tar.bz2"
builddir="$srcdir/aspell5-gd-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="d388bf3476f440c7773a69a0758b8e9cdddf01b64579f6d92fde38e7363c5c3b321a76c7a4e4587b0810159a35eec8d33d1cd2de49068d73f9e0e4dfa60fbc5c aspell5-gd-0.1.1-1.tar.bz2"
diff --git a/user/aspell-dict-gl/APKBUILD b/user/aspell-dict-gl/APKBUILD
index e586b4682..4001fd9cb 100644
--- a/user/aspell-dict-gl/APKBUILD
+++ b/user/aspell-dict-gl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-gl
pkgver=0.5.a2
_pkgver=${pkgver%.*}${pkgver#*.*.}
@@ -8,20 +8,20 @@ pkgrel=0
pkgdesc="Galician dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/gl/aspell6-gl-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/gl/aspell6-gl-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-gl-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="9c8aae22d23e1cce9c5c94844c35ec3eaa5b76e5049712b714993e7c628a0b8ee250de2ad1b646a6ecffe32ebc0e4f0009a4db041b6f8bde5d021cf71c5cd714 aspell6-gl-0.5a-2.tar.bz2"
diff --git a/user/aspell-dict-grc/APKBUILD b/user/aspell-dict-grc/APKBUILD
index 39bd4b1b8..c5016e224 100644
--- a/user/aspell-dict-grc/APKBUILD
+++ b/user/aspell-dict-grc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-grc
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Ancient Greek dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/grc/aspell6-grc-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/grc/aspell6-grc-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-grc-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="17999e20621efc67ab42d83b0e149d19b18bcfd20966da35d217a3e5682c0728287bec4bce28af34f4e343943a1dac49f85077693ca30bd1ff7cbaaeda453ddd aspell6-grc-0.02-0.tar.bz2"
diff --git a/user/aspell-dict-gu/APKBUILD b/user/aspell-dict-gu/APKBUILD
index 04fac1de1..feeadf574 100644
--- a/user/aspell-dict-gu/APKBUILD
+++ b/user/aspell-dict-gu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-gu
pkgver=0.03.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Gujarati dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/gu/aspell6-gu-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/gu/aspell6-gu-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-gu-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="0cc252bd1112b8f06cb4ea9000b00d036dc405d8fbb9c380beff949ea138903b5807afa8f1419f4d8f57329a7bb1a4b7f4bd733170e5f09ac7786ac39beb87c6 aspell6-gu-0.03-0.tar.bz2"
diff --git a/user/aspell-dict-gv/APKBUILD b/user/aspell-dict-gv/APKBUILD
index a2aa1779e..513a9491d 100644
--- a/user/aspell-dict-gv/APKBUILD
+++ b/user/aspell-dict-gv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-gv
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Manx Gaelic dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/gv/aspell-gv-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/gv/aspell-gv-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-gv-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="6ec0893bb853c9600b49958802572edfed2127b749b2e4ee5ce051863526fefbae367cf2686ccae2f3c27fa168a8c3a8611eae3561853553594fb097fd78e37d aspell-gv-0.50-0.tar.bz2"
diff --git a/user/aspell-dict-he/APKBUILD b/user/aspell-dict-he/APKBUILD
index 99166d52a..cac888171 100644
--- a/user/aspell-dict-he/APKBUILD
+++ b/user/aspell-dict-he/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-he
pkgver=1.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Hebrew dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/he/aspell6-he-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/he/aspell6-he-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-he-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="4db335c1566432ac8e18bace1f1ab892e47765b9dfb342f981b52637ee6768f592b7d9793c229e7f67f7f4770e6ef4abb9b2dd66da0feef9cc42bfd316adad88 aspell6-he-1.0-0.tar.bz2"
diff --git a/user/aspell-dict-hi/APKBUILD b/user/aspell-dict-hi/APKBUILD
index 26223d8df..789b77dc2 100644
--- a/user/aspell-dict-hi/APKBUILD
+++ b/user/aspell-dict-hi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hi
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Hindi dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/hi/aspell6-hi-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/hi/aspell6-hi-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-hi-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="298743e1e5988e26081d89ee6cdea3b2f3185ad81b3449b5fa3f644a2beaf488320f9468fbeeb7e6c7bcb3ae4b7116bd02f64c4e6f4c60f80c1a7c3b84946a93 aspell6-hi-0.02-0.tar.bz2"
diff --git a/user/aspell-dict-hil/APKBUILD b/user/aspell-dict-hil/APKBUILD
index bc4d3af07..f634034b9 100644
--- a/user/aspell-dict-hil/APKBUILD
+++ b/user/aspell-dict-hil/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hil
pkgver=0.11.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Hiligaynon dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/hil/aspell5-hil-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/hil/aspell5-hil-$_pkgver.tar.bz2"
builddir="$srcdir/aspell5-hil-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="274c353f48da1a769a454cff0fa54d0e5cfd84a2da7ed979693335aa8e45c5c562b0f92cc5bdeb77a5ff54d0f79f747e792ff4e3f8a0427bbd131879659af432 aspell5-hil-0.11-0.tar.bz2"
diff --git a/user/aspell-dict-hr/APKBUILD b/user/aspell-dict-hr/APKBUILD
index 917f599cb..c4bc01e03 100644
--- a/user/aspell-dict-hr/APKBUILD
+++ b/user/aspell-dict-hr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hr
pkgver=0.51.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Croatian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/hr/aspell-hr-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/hr/aspell-hr-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-hr-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="d6d891f3e55252fdbc5e0534c623cc42311c25cd1219351ce8a8160c3c3c49a6f219706e02f2c1c27174ef77c64e17f8cc25844befb17a43802b0a09ab42b1ad aspell-hr-0.51-0.tar.bz2"
diff --git a/user/aspell-dict-hsb/APKBUILD b/user/aspell-dict-hsb/APKBUILD
index 95fc32a90..8c8c85b1b 100644
--- a/user/aspell-dict-hsb/APKBUILD
+++ b/user/aspell-dict-hsb/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hsb
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Upper Sorbian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/hsb/aspell6-hsb-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/hsb/aspell6-hsb-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-hsb-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="b8e49bf6d85e149365378a33b56ab61767c34ddfd4545eedeedad012b2b396dff54bb3dcba56fb4d3c0a92a0c3e13fddf0548591568295709d91f18c45ca1274 aspell6-hsb-0.02-0.tar.bz2"
diff --git a/user/aspell-dict-hu/APKBUILD b/user/aspell-dict-hu/APKBUILD
index 690fa6841..a118ce6a9 100644
--- a/user/aspell-dict-hu/APKBUILD
+++ b/user/aspell-dict-hu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hu
pkgver=0.99.4.2.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Hungarian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/hu/aspell6-hu-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/hu/aspell6-hu-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-hu-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="95922401f2a8aeac61b117c464b4b83b8101fbe1e0ee758b3284a67c188348db55d900c2898eaa8639ee2db99c3b27e85f9677fc6a4d54caae57dd72101cb320 aspell6-hu-0.99.4.2-0.tar.bz2"
diff --git a/user/aspell-dict-hus/APKBUILD b/user/aspell-dict-hus/APKBUILD
index 892165847..33e998e30 100644
--- a/user/aspell-dict-hus/APKBUILD
+++ b/user/aspell-dict-hus/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hus
pkgver=0.03.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Huastec Tenek dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/hus/aspell6-hus-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/hus/aspell6-hus-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-hus-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="2d1f8458f04bda64068ddd3c5017ed129c2b7549e2474acdcc39f76283dae1a0fe557ab67526fa31ce300f615bd5d2ded4aa0414f3a5b6ee8e59389c8ac20c70 aspell6-hus-0.03-1.tar.bz2"
diff --git a/user/aspell-dict-hy/APKBUILD b/user/aspell-dict-hy/APKBUILD
index 6cd26a147..a88dbb382 100644
--- a/user/aspell-dict-hy/APKBUILD
+++ b/user/aspell-dict-hy/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hy
pkgver=0.10.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Armenian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/hy/aspell6-hy-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/hy/aspell6-hy-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-hy-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="b2157c1d04e4d4726851fe4cda91fcc3cf0dba8d5cfaaea74deed77d9c5f94473e13784526f884ba483789a098dd3efee936c456606913a731a165ec3eb145a3 aspell6-hy-0.10.0-0.tar.bz2"
diff --git a/user/aspell-dict-ia/APKBUILD b/user/aspell-dict-ia/APKBUILD
index 722c08f15..fb8d26f62 100644
--- a/user/aspell-dict-ia/APKBUILD
+++ b/user/aspell-dict-ia/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ia
pkgver=0.50.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Interlingua dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/ia/aspell-ia-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/ia/aspell-ia-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-ia-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="5cdd7b91393043d7b537166c1df100aa76e911cf1c389b34b916839e907abc3cdbdc368f2876a5ecfbd625414b67858950e9d79af184560b9ddd667030dc608d aspell-ia-0.50-1.tar.bz2"
diff --git a/user/aspell-dict-id/APKBUILD b/user/aspell-dict-id/APKBUILD
index cda3e6217..75b2839b9 100644
--- a/user/aspell-dict-id/APKBUILD
+++ b/user/aspell-dict-id/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-id
pkgver=1.2.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Indonesian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/id/aspell5-id-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/id/aspell5-id-$_pkgver.tar.bz2"
builddir="$srcdir/aspell5-id-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="bc33c5d6c68027304b0dc299454f8dd221e0138b079bcc423e287fda5e9204b0d6dc14a5a0617b4d018259e011c979453ee13b9050be5516d2379e86ac9cb86a aspell5-id-1.2-0.tar.bz2"
diff --git a/user/aspell-dict-is/APKBUILD b/user/aspell-dict-is/APKBUILD
index 1bdaab2f5..83d58f2bc 100644
--- a/user/aspell-dict-is/APKBUILD
+++ b/user/aspell-dict-is/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-is
pkgver=0.51.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Icelandic dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/is/aspell-is-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/is/aspell-is-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-is-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="b96aeb407c1de700a20ca18bbd9e1bc1a4c086379ef7fbd0467178d11b9ed70e547a81a4659619e7385f89926638cb2a5e807cc701b444a7bf0d246905795bf2 aspell-is-0.51.1-0.tar.bz2"
diff --git a/user/aspell-dict-it/APKBUILD b/user/aspell-dict-it/APKBUILD
index 639d81c27..23b5cc043 100644
--- a/user/aspell-dict-it/APKBUILD
+++ b/user/aspell-dict-it/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-it
pkgver=2.4.20070901.0
_pkgver=${pkgver%.*.*}-${pkgver#*.*.}
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="Italian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
@@ -16,12 +16,12 @@ source="https://downloads.sourceforge.net/linguistico/aspell6-it-$_pkgver.tar.bz
builddir="$srcdir/aspell6-it-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="6a5014880e51103e70d57a6b01e2d4bb5d51ae939f72ee9270b46891804203399c817dd73c3a0b91c004744a4e66a1a5b402d19be0a53db952152cdd3c1741e9 aspell6-it-2.4-20070901-0.tar.bz2"
diff --git a/user/aspell-dict-kn/APKBUILD b/user/aspell-dict-kn/APKBUILD
index 560e222c3..6eefab144 100644
--- a/user/aspell-dict-kn/APKBUILD
+++ b/user/aspell-dict-kn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-kn
pkgver=0.01.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Kannada dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/kn/aspell6-kn-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/kn/aspell6-kn-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-kn-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="892f93c0ed33f4aedb240d8c673d7888318760ccb2ca0cfb8377a2770f757c5410583a7c18314f3fb7cd58704a531e8931bc8be44d9de80b1421d2238e4229c3 aspell6-kn-0.01-1.tar.bz2"
diff --git a/user/aspell-dict-ku/APKBUILD b/user/aspell-dict-ku/APKBUILD
index 5770b2ebb..042c91bca 100644
--- a/user/aspell-dict-ku/APKBUILD
+++ b/user/aspell-dict-ku/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ku
pkgver=0.20.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Kurdi dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/ku/aspell5-ku-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/ku/aspell5-ku-$_pkgver.tar.bz2"
builddir="$srcdir/aspell5-ku-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="b1aadc13e4cc494bb7b8bdb1ef96215abb72dfe2ec398d4c383984a2540323117d18a940c675ed0266cbbdf14958525975083a9fe35e93b7885c8f0216362d84 aspell5-ku-0.20-1.tar.bz2"
diff --git a/user/aspell-dict-ky/APKBUILD b/user/aspell-dict-ky/APKBUILD
index 86cb8c757..0ec8c8552 100644
--- a/user/aspell-dict-ky/APKBUILD
+++ b/user/aspell-dict-ky/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ky
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Kirghiz dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/ky/aspell6-ky-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/ky/aspell6-ky-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-ky-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="94389905505ffc0c469dd5f4ea31e2e76fed695e8cb7b903e248a57a8677e45311e525a07c43da0be87bfdc7825b1af4ae8dd1993d35948dd1ace4b1af9fa307 aspell6-ky-0.01-0.tar.bz2"
diff --git a/user/aspell-dict-la/APKBUILD b/user/aspell-dict-la/APKBUILD
index b2d3473b0..257624e08 100644
--- a/user/aspell-dict-la/APKBUILD
+++ b/user/aspell-dict-la/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-la
pkgver=20020503.0
_pkgver=${pkgver%.*}-${pkgver#*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Latin dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/la/aspell6-la-20020503-0.tar.bz2"
builddir="$srcdir/aspell6-la-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="b167541050546edfdb6148f06952eb07f67c8a5115d40ea777d566b722d4476147e986de06ebc8ffdfdadf1f201e3c1b5f000527ca489da96e2b3f764e487e5f aspell6-la-20020503-0.tar.bz2"
diff --git a/user/aspell-dict-lt/APKBUILD b/user/aspell-dict-lt/APKBUILD
index 8d31a0a30..1f0f0c657 100644
--- a/user/aspell-dict-lt/APKBUILD
+++ b/user/aspell-dict-lt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-lt
pkgver=1.3
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Lithuanian dictionaries for aspell"
url="https://launchpad.net/ispell-lt"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
@@ -15,12 +15,12 @@ source="https://launchpad.net/ispell-lt/main/$pkgver/+download/aspell6-lt-$pkgve
builddir="$srcdir/aspell6-lt-$pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="dd19994f703b78b1296644699df18ddcdfdcb2441003ed9edee03ee18601ff2e15e9b4ed8fbf844d72b31f0c0313a6755c89b67c44eea35485c30f2abc3b206f aspell6-lt-1.3.tar.bz2"
diff --git a/user/aspell-dict-lv/APKBUILD b/user/aspell-dict-lv/APKBUILD
index bd102c589..1640813f6 100644
--- a/user/aspell-dict-lv/APKBUILD
+++ b/user/aspell-dict-lv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-lv
pkgver=0.5.5.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Latvian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/lv/aspell6-lv-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/lv/aspell6-lv-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-lv-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="94a9c6da3fd29f17fbe5d02cd4764bf24379abef526725bb34c0726f7ff385fcb876df24b741bc66518295c3bb75c800aa6010130454c6dc1d6372d12d2eb98e aspell6-lv-0.5.5-1.tar.bz2"
diff --git a/user/aspell-dict-mg/APKBUILD b/user/aspell-dict-mg/APKBUILD
index 0a1963250..a93c2b691 100644
--- a/user/aspell-dict-mg/APKBUILD
+++ b/user/aspell-dict-mg/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mg
pkgver=0.03.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Malagasy dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/mg/aspell5-mg-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/mg/aspell5-mg-$_pkgver.tar.bz2"
builddir="$srcdir/aspell5-mg-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="a9c0861b925b40bf9bba5e1d02f3e225a516f929a2e72c6760ec5bedbc513e18e8bda0205e83e17c09b6a37256877e54576c8085e6000f67783147d4cd9ec6df aspell5-mg-0.03-0.tar.bz2"
diff --git a/user/aspell-dict-mi/APKBUILD b/user/aspell-dict-mi/APKBUILD
index dbcd853e0..aa6db01e1 100644
--- a/user/aspell-dict-mi/APKBUILD
+++ b/user/aspell-dict-mi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mi
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Maori dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/mi/aspell-mi-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/mi/aspell-mi-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-mi-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="cba0a646612f6cd24d1e1d91326dcf1c7a6ec01c04ad0661a95fcd745b4d1a3bb50aef84c382d3a6c9108d4e9589ee7661f4988930c7198950396eeb029062a0 aspell-mi-0.50-0.tar.bz2"
diff --git a/user/aspell-dict-mk/APKBUILD b/user/aspell-dict-mk/APKBUILD
index f620067e3..324ab0c10 100644
--- a/user/aspell-dict-mk/APKBUILD
+++ b/user/aspell-dict-mk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mk
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Macedonian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/mk/aspell-mk-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/mk/aspell-mk-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-mk-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="6bcd57338ce76b7daf22a4be28a2f583c6c1d73ff2d8d5db2e3d5122d89c41617d44a40019dfe647c8e1e07509bee20be6ba136e872710bd77871adbac29e947 aspell-mk-0.50-0.tar.bz2"
diff --git a/user/aspell-dict-ml/APKBUILD b/user/aspell-dict-ml/APKBUILD
index 8cd3ee5fc..03562f30c 100644
--- a/user/aspell-dict-ml/APKBUILD
+++ b/user/aspell-dict-ml/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ml
pkgver=0.04.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Malayalam dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
@@ -15,12 +15,12 @@ source="http://gnu.mirrors.pair.com/savannah/savannah/smc/Spellchecker/aspell6-m
builddir="$srcdir/aspell6-ml-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="a9b6e522f9a4b4d9034f9cd2e1546e0cdfc9bad9f9c7515c8144efb186fb164ab55d422e93da89f0cf7c2b7e6f7b5d439747cc8b7e211c5b09a3638573765563 aspell6-ml-0.04-1.tar.bz2"
diff --git a/user/aspell-dict-mn/APKBUILD b/user/aspell-dict-mn/APKBUILD
index cbaad148f..f71c509d1 100644
--- a/user/aspell-dict-mn/APKBUILD
+++ b/user/aspell-dict-mn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mn
pkgver=0.06.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Mongolian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/mn/aspell6-mn-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/mn/aspell6-mn-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-mn-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="c0cf603169eaf8b4b858fd7573374d1ec47b9794e2514cb241b8fc3b053bce715dad6a15bd73eeef443f0d6a4308ffb384acae825d33315ee983a69ceacf9201 aspell6-mn-0.06-2.tar.bz2"
diff --git a/user/aspell-dict-mr/APKBUILD b/user/aspell-dict-mr/APKBUILD
index 029d4001a..583a1fb49 100644
--- a/user/aspell-dict-mr/APKBUILD
+++ b/user/aspell-dict-mr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mr
pkgver=0.10.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Marathi dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-mr-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="4137a9d6f3dc67db81479a2df628c33c3989214a629f48fc9bb6421e4ce723bdf559eb2f0981c2172315ec140ccd160a10b9556a6618f2fd3383dec184352732 aspell6-mr-0.10-0.tar.bz2"
diff --git a/user/aspell-dict-ms/APKBUILD b/user/aspell-dict-ms/APKBUILD
index a8187eb00..25a29a229 100644
--- a/user/aspell-dict-ms/APKBUILD
+++ b/user/aspell-dict-ms/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ms
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Malay dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/ms/aspell-ms-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/ms/aspell-ms-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-ms-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="270a6ad18d9b317588e781eab84b59c83450383d703fab815856b3afa58a19ffa0eec3c7cbc418993302703d586cb92678878aea51fff753733f7583d8c2b0e9 aspell-ms-0.50-0.tar.bz2"
diff --git a/user/aspell-dict-mt/APKBUILD b/user/aspell-dict-mt/APKBUILD
index e7c3cef1c..5d22c27c3 100644
--- a/user/aspell-dict-mt/APKBUILD
+++ b/user/aspell-dict-mt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mt
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Maltese dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/mt/aspell-mt-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/mt/aspell-mt-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-mt-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="aadcc59b0dbbfdf4d715bfe6735bfa2a91e6fae382634a25c0cdf8367710050b2daeac1db18df3a71184720ff9339a852983c8a266f8c97e0ffba1e8be50eaa1 aspell-mt-0.50-0.tar.bz2"
diff --git a/user/aspell-dict-nb/APKBUILD b/user/aspell-dict-nb/APKBUILD
index 7dd694e35..6db6e6fb5 100644
--- a/user/aspell-dict-nb/APKBUILD
+++ b/user/aspell-dict-nb/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-nb
pkgver=0.50.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Norwegian (Bokmal) dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/nb/aspell-nb-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/nb/aspell-nb-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-nb-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="e30dcf7e757ab1ceb5de349927f9cfa4d9de4015bd9cc9449739fd2f17f6f033f698e71da0270b4e1ebd76be2195c42422630266ad9cadd2173184706d651c13 aspell-nb-0.50.1-0.tar.bz2"
diff --git a/user/aspell-dict-nds/APKBUILD b/user/aspell-dict-nds/APKBUILD
index 688ce1c4e..9e4e26201 100644
--- a/user/aspell-dict-nds/APKBUILD
+++ b/user/aspell-dict-nds/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-nds
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Low Saxon dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/nds/aspell6-nds-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/nds/aspell6-nds-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-nds-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="88ef6f6773e8699a5200ff8ae3ef9935fee21958fa35868bc10d37c22b55ea721ad9c59ab4843fdc6fedbf5a9ed10c7ea144548713742b8094b99c3c46a552a5 aspell6-nds-0.01-0.tar.bz2"
diff --git a/user/aspell-dict-nl/APKBUILD b/user/aspell-dict-nl/APKBUILD
index 3d288aa76..87ffadacf 100644
--- a/user/aspell-dict-nl/APKBUILD
+++ b/user/aspell-dict-nl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-nl
pkgver=0.50.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Dutch dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/nl/aspell-nl-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/nl/aspell-nl-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-nl-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="bee6218b476f8655fa325940ba5ea1035ff483b5b47b9b547f60fd63786e8ff08daa03a30dd0ccd988c2f01827bb06075021e1a1fa79c640db82e72a3ccd3152 aspell-nl-0.50-2.tar.bz2"
diff --git a/user/aspell-dict-nn/APKBUILD b/user/aspell-dict-nn/APKBUILD
index 14be7c042..cf8a0aa21 100644
--- a/user/aspell-dict-nn/APKBUILD
+++ b/user/aspell-dict-nn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-nn
pkgver=0.50.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Norwegian (Nynorsk) dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/nn/aspell-nn-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/nn/aspell-nn-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-nn-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="a4db6fe937a62758f51d713e246f70ea6e0b2726c8ddb23af084925394a2d8168442fccbd74378f4773db121f0d506d848c01573138e974efc79f295f3ebe551 aspell-nn-0.50.1-1.tar.bz2"
diff --git a/user/aspell-dict-ny/APKBUILD b/user/aspell-dict-ny/APKBUILD
index 258dcd0a7..f8f15a08d 100644
--- a/user/aspell-dict-ny/APKBUILD
+++ b/user/aspell-dict-ny/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ny
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Chichewa dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/ny/aspell5-ny-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/ny/aspell5-ny-$_pkgver.tar.bz2"
builddir="$srcdir/aspell5-ny-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="52f4526d605a2f0577217af1dc8e44da20484fe7f725ceee1f8fdf9ba0fc1457910d55567ea9287465cbf37955af9a11b2caba084cece59aec29755cb147cb05 aspell5-ny-0.01-0.tar.bz2"
diff --git a/user/aspell-dict-or/APKBUILD b/user/aspell-dict-or/APKBUILD
index 97703ffa8..4717c0f76 100644
--- a/user/aspell-dict-or/APKBUILD
+++ b/user/aspell-dict-or/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-or
pkgver=0.03.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Oriya dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/or/aspell6-or-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/or/aspell6-or-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-or-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="4f5c13e37054266a782cc9d9aa6a03de77ca383907ce05f23ab5812581b815276f4d79a2f8626226f30a59f8ab9ecf0f0186835f7f30881e4a358f99a75b708a aspell6-or-0.03-1.tar.bz2"
diff --git a/user/aspell-dict-pa/APKBUILD b/user/aspell-dict-pa/APKBUILD
index 83d4ae61f..67fc9ca9f 100644
--- a/user/aspell-dict-pa/APKBUILD
+++ b/user/aspell-dict-pa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-pa
pkgver=0.01.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Punjabi dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/pa/aspell6-pa-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/pa/aspell6-pa-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-pa-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="6a0d2d7f1b1a935b6ac4b373963e525083d16c26953cce5d7a29d391aaed36f5430d27ea69efe59f081230822830dc4d4143bc155049bb5384580ffd66b5ee61 aspell6-pa-0.01-1.tar.bz2"
diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD
index e7c364f02..a3bade532 100644
--- a/user/aspell-dict-pl/APKBUILD
+++ b/user/aspell-dict-pl/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-pl
pkgver=20190107
pkgrel=0
pkgdesc="Polish dictionaries for aspell"
url="https://sjp.pl/slownik/ort/"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
@@ -14,12 +14,12 @@ source="https://distfiles.adelielinux.org/source/sjp-aspell6-pl-6.0_$pkgver-0.ta
builddir="$srcdir/aspell6-pl-6.0_$pkgver-0"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="a898462495e4797173141f2f82ce74fadb80dfc469e7c4b44871f2622137d5958fad30fd0525ac9cf7a07c31b74d805bb789f022ccbcacadd0d4d1f172986665 sjp-aspell6-pl-6.0_20190107-0.tar.bz2"
diff --git a/user/aspell-dict-pt_BR/APKBUILD b/user/aspell-dict-pt_BR/APKBUILD
index 5ac5dc4e8..e83fb61b4 100644
--- a/user/aspell-dict-pt_BR/APKBUILD
+++ b/user/aspell-dict-pt_BR/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-pt_BR
pkgver=20090702.0
_pkgver=${pkgver%.*}-${pkgver#*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Brazilian Portuguese dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-pt_BR-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="4c2606dad177881db7b7996c707a8d5a087fc9ec6ac46fac08b2bbb9c7acb51c7f0b3cb936f46257d03dd8e4e7a23b0244331db68a8208f5b7625d79ea6522d1 aspell6-pt_BR-20090702-0.tar.bz2"
diff --git a/user/aspell-dict-pt_PT/APKBUILD b/user/aspell-dict-pt_PT/APKBUILD
index 72c92641b..e21621b72 100644
--- a/user/aspell-dict-pt_PT/APKBUILD
+++ b/user/aspell-dict-pt_PT/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-pt_PT
pkgver=20070510.0
_pkgver=${pkgver%.*}-${pkgver#*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Portuguese dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/pt_PT/aspell6-pt_PT-20070510-0.tar.bz2"
builddir="$srcdir/aspell6-pt_PT-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="eab60bfed51e4b044519e8e91fa2a4abb45d02431372310a45334c80abafd2022982331f3c0d39294d5029674d75536ad153877c23db01971f4b3d54b7b90cd6 aspell6-pt_PT-20070510-0.tar.bz2"
diff --git a/user/aspell-dict-qu/APKBUILD b/user/aspell-dict-qu/APKBUILD
index 4641181d7..10010ba13 100644
--- a/user/aspell-dict-qu/APKBUILD
+++ b/user/aspell-dict-qu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-qu
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Quechua dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/qu/aspell6-qu-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/qu/aspell6-qu-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-qu-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="aac1caea88e9bd896ec5a9a2e7fa4a569626fa5e6f6bf1188614db10ca2b34196b589c496027b3bc562ef9435245e215b428a49e91a8d0eb215801ae8c9bb512 aspell6-qu-0.02-0.tar.bz2"
diff --git a/user/aspell-dict-ro/APKBUILD b/user/aspell-dict-ro/APKBUILD
index f80bc913f..449bf9276 100644
--- a/user/aspell-dict-ro/APKBUILD
+++ b/user/aspell-dict-ro/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ro
pkgver=3.3.10
pkgrel=0
pkgdesc="Romanian dictionaries for aspell"
url="https://sourceforge.net/projects/rospell/"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
@@ -14,12 +14,12 @@ source="https://download.sourceforge.net/rospell/aspell5-ro-$pkgver.tar.bz2"
builddir="$srcdir/aspell5-ro-$pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="c535894d11ee168311a2cc0f799005639b21f3284a2a51db25d513d3e0494cf6d2fb7517bc79bc76f2d9ae89bb43c8bcbac7f451195ee22a7cce361aa09914ba aspell5-ro-3.3.10.tar.bz2"
diff --git a/user/aspell-dict-ru/APKBUILD b/user/aspell-dict-ru/APKBUILD
index cd2b6d5f5..29dbbf43e 100644
--- a/user/aspell-dict-ru/APKBUILD
+++ b/user/aspell-dict-ru/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ru
pkgver=0.99f7.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Russian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/ru/aspell6-ru-0.99f7-1.tar.bz2"
builddir="$srcdir/aspell6-ru-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="789fe15f5502b54008a41f2afb5635dcb7bb0a36e61b300ee48b2429c339793f5c4808d6063f13f1f8455ce251912433890e7d01ca59d8b0924ecd2987ceb430 aspell6-ru-0.99f7-1.tar.bz2"
diff --git a/user/aspell-dict-rw/APKBUILD b/user/aspell-dict-rw/APKBUILD
index accb77d6c..e9a28d063 100644
--- a/user/aspell-dict-rw/APKBUILD
+++ b/user/aspell-dict-rw/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-rw
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Kinyarwanda dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/rw/aspell-rw-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/rw/aspell-rw-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-rw-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="a987fe90b091c5f8d4c28713ad50ca917d2a8fd120df55bd413e3112913cb7e9e8fdc740994aa881bbfdd9ac38fa5ebe728c9e62e25a0e7cc8eac13c2380c56a aspell-rw-0.50-0.tar.bz2"
diff --git a/user/aspell-dict-sc/APKBUILD b/user/aspell-dict-sc/APKBUILD
index 8e447c831..8649e338f 100644
--- a/user/aspell-dict-sc/APKBUILD
+++ b/user/aspell-dict-sc/APKBUILD
@@ -1,25 +1,25 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sc
pkgver=1.0
pkgrel=0
pkgdesc="Sardinian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/sc/aspell5-sc-$pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/sc/aspell5-sc-$pkgver.tar.bz2"
builddir="$srcdir/aspell5-sc-$pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="3cad49510894645b9bc97bbae877641e64af0440a2abcb6f96197da95390d4dd59d1374008c0ade9dc17772a32c367b9b03e6be65e7f190268365f25069d2a23 aspell5-sc-1.0.tar.bz2"
diff --git a/user/aspell-dict-sk/APKBUILD b/user/aspell-dict-sk/APKBUILD
index ac036cc6e..466ee7cb7 100644
--- a/user/aspell-dict-sk/APKBUILD
+++ b/user/aspell-dict-sk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sk
pkgver=2.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Slovak dictionaries for aspell"
url="http://www.sk-spell.sk.cx/aspell-sk"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="http://www.sk-spell.sk.cx/file_download/103/aspell6-sk-$_pkgver.tar.bz2"
+source="https://distfiles.adelielinux.org/source/aspell6-sk-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-sk-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="fcdf5c043168c887f93dfad5b9c6e07d9edd0c6194139e61bee2ba3928798792d8e8b446754bc55a67acc6d333034ebed9655cc3c15ad638f834b5a9efcc63cd aspell6-sk-2.02-0.tar.bz2"
diff --git a/user/aspell-dict-sl/APKBUILD b/user/aspell-dict-sl/APKBUILD
index ab8dc8621..2665c4a17 100644
--- a/user/aspell-dict-sl/APKBUILD
+++ b/user/aspell-dict-sl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sl
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Slovenian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/sl/aspell-sl-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/sl/aspell-sl-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-sl-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="17b74bd3c6d7fbda0b4f6d14ee529f47f39c349642593312c160eb4e7eb6eb40f704e9c34e6fb33ef9e829b861e92a224196f55326fa4d02197d12912fd4b44f aspell-sl-0.50-0.tar.bz2"
diff --git a/user/aspell-dict-sr/APKBUILD b/user/aspell-dict-sr/APKBUILD
index 601515fcb..3535a244c 100644
--- a/user/aspell-dict-sr/APKBUILD
+++ b/user/aspell-dict-sr/APKBUILD
@@ -1,25 +1,25 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sr
pkgver=0.02
pkgrel=0
pkgdesc="Serbian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/sr/aspell6-sr-$pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/sr/aspell6-sr-$pkgver.tar.bz2"
builddir="$srcdir/aspell6-sr-$pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="3334d98779c9eff74ca85e5168e51375e38f831ff3f2b9164d0773cf220bd9ca0076d282086bed6258c643cfae70124d985931982db6c885b8d53fc35fb0c395 aspell6-sr-0.02.tar.bz2"
diff --git a/user/aspell-dict-sv/APKBUILD b/user/aspell-dict-sv/APKBUILD
index cbdf4dfc8..05c6da187 100644
--- a/user/aspell-dict-sv/APKBUILD
+++ b/user/aspell-dict-sv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sv
pkgver=0.51.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Swedish dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/sv/aspell-sv-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/sv/aspell-sv-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-sv-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="f995f3ae1a1380a5dbb171786c2cf3d46670c4bc012792a1d241ff0f3de61046766583e3704c57618eb0690aa0e915b64130114420358a3f46b5b59a37d45e5c aspell-sv-0.51-0.tar.bz2"
diff --git a/user/aspell-dict-sw/APKBUILD b/user/aspell-dict-sw/APKBUILD
index d904ac81a..b6da8032d 100644
--- a/user/aspell-dict-sw/APKBUILD
+++ b/user/aspell-dict-sw/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sw
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Swahili dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/sw/aspell-sw-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/sw/aspell-sw-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-sw-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="5d89a68c292b45a188f611a14bc355c955810f79c32c7784b2e3ba5a4307b48d572e5a7ca882a344b7635eabe6aa6c2f5d789e9506f3a3f4e69c93fd3675e423 aspell-sw-0.50-0.tar.bz2"
diff --git a/user/aspell-dict-ta/APKBUILD b/user/aspell-dict-ta/APKBUILD
index 50cbf030c..d9afb81d6 100644
--- a/user/aspell-dict-ta/APKBUILD
+++ b/user/aspell-dict-ta/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ta
pkgver=20040424.1
_pkgver=${pkgver%.*}-${pkgver#*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Tamil dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/ta/aspell6-ta-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/ta/aspell6-ta-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-ta-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="8809948f25bf197207c3cbd865bf4c7e73cee552fd1518533d48fcabdc79c95765df253d9ef6c7f904748f24898f04acdeb64800ce9856ced8ccab086ddb664e aspell6-ta-20040424-1.tar.bz2"
diff --git a/user/aspell-dict-te/APKBUILD b/user/aspell-dict-te/APKBUILD
index fbd2bbef9..9544673a1 100644
--- a/user/aspell-dict-te/APKBUILD
+++ b/user/aspell-dict-te/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-te
pkgver=0.01.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Telugu dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/te/aspell6-te-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/te/aspell6-te-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-te-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="09566d44de03e3e990f575d8e665bad9079f7bafec2474a6aa4a430a1ff71641dd4989d24bc5ecf3b19ca8c4f61b9365ea792b16f271c89bffaab159e8ed0129 aspell6-te-0.01-2.tar.bz2"
diff --git a/user/aspell-dict-tet/APKBUILD b/user/aspell-dict-tet/APKBUILD
index 392c24a62..fb58477b8 100644
--- a/user/aspell-dict-tet/APKBUILD
+++ b/user/aspell-dict-tet/APKBUILD
@@ -1,25 +1,25 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-tet
pkgver=0.1.1
pkgrel=0
pkgdesc="Tetum dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/tet/aspell5-tet-$pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/tet/aspell5-tet-$pkgver.tar.bz2"
builddir="$srcdir/aspell5-tet-$pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="6dc691b40cedd054a677197219f97ae5afc21bcf4820bf452d23963ae04a716bf7e38d1cff0eb050e13fd24fd2e8f3b0d24f9b19e7de3868faeca8aa16881802 aspell5-tet-0.1.1.tar.bz2"
diff --git a/user/aspell-dict-tk/APKBUILD b/user/aspell-dict-tk/APKBUILD
index f02b20fd0..11e465c99 100644
--- a/user/aspell-dict-tk/APKBUILD
+++ b/user/aspell-dict-tk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-tk
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Turkmen dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/tk/aspell5-tk-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/tk/aspell5-tk-$_pkgver.tar.bz2"
builddir="$srcdir/aspell5-tk-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="0a4a0c3be9b9322187677d47f56c091f6c3ae2662b8d6831e9fa2e18720277f76c79e9e0c65ee37474459a19dc5a99519af8492645b241cdc076775afc4a700f aspell5-tk-0.01-0.tar.bz2"
diff --git a/user/aspell-dict-tl/APKBUILD b/user/aspell-dict-tl/APKBUILD
index fefaf89ff..5e35eb565 100644
--- a/user/aspell-dict-tl/APKBUILD
+++ b/user/aspell-dict-tl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-tl
pkgver=0.4.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Tagalog dictionaries for aspell"
url=" " # no suitable website
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
@@ -15,12 +15,12 @@ source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.goo
builddir="$srcdir/aspell6-tl-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="e9ad3e7e619ed19ffde923a07553c4930c60292a0e5592a68cf0e09d6f6d3b3b7ff74adb8f53e9255528c319c12ef442eff4e3b2ce169156d1664b5d565a7f5a aspell6-tl-0.4-0.tar.bz2"
diff --git a/user/aspell-dict-tn/APKBUILD b/user/aspell-dict-tn/APKBUILD
index 4a404b4da..ae25e480b 100644
--- a/user/aspell-dict-tn/APKBUILD
+++ b/user/aspell-dict-tn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-tn
pkgver=1.0.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Setswana dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/tn/aspell5-tn-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/tn/aspell5-tn-$_pkgver.tar.bz2"
builddir="$srcdir/aspell5-tn-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="ff3258c3eec392f45b34ba7754bbd6af7ffa0ac812fc1743985fec301755be81387a3e567b36ff145a7a3f9b906e991efde8b4fafc33be14f07a581f4af111dc aspell5-tn-1.0.1-0.tar.bz2"
diff --git a/user/aspell-dict-tr/APKBUILD b/user/aspell-dict-tr/APKBUILD
index 6e32881a1..6bbb12b99 100644
--- a/user/aspell-dict-tr/APKBUILD
+++ b/user/aspell-dict-tr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-tr
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Turkish dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/tr/aspell-tr-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/tr/aspell-tr-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-tr-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="0054eef2089a916695b7501676d9cedb1d14defdea76deb01656a6a644b4e646db46470040227814f750e0d69dcc72b1023967eb7924b42ddcefd3d604709059 aspell-tr-0.50-0.tar.bz2"
diff --git a/user/aspell-dict-uk/APKBUILD b/user/aspell-dict-uk/APKBUILD
index d812753ad..d53c59b7c 100644
--- a/user/aspell-dict-uk/APKBUILD
+++ b/user/aspell-dict-uk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-uk
pkgver=1.4.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Ukrainian dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/uk/aspell6-uk-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/uk/aspell6-uk-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-uk-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="2e66465d17695dd3147241f13d611571f8a80a15886c69728d2f34019fb4834e56e4c0834d9e898927522b54d75f78a32dd3435b2c16eb86cf9cfa11070f0799 aspell6-uk-1.4.0-0.tar.bz2"
diff --git a/user/aspell-dict-uz/APKBUILD b/user/aspell-dict-uz/APKBUILD
index cc9e0b28a..801711845 100644
--- a/user/aspell-dict-uz/APKBUILD
+++ b/user/aspell-dict-uz/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-uz
pkgver=0.6.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Uzbek dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/uz/aspell6-uz-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/uz/aspell6-uz-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-uz-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="0542a83c149ad761d8bb964be556bfb2387404fce21e0e38d3c0fa8efef2d1587db0fa80140cf7de72da7f08bbb807ff931a95bb63c2a84771a197f5841e545b aspell6-uz-0.6-0.tar.bz2"
diff --git a/user/aspell-dict-vi/APKBUILD b/user/aspell-dict-vi/APKBUILD
index 12a23ae79..680cdd9c0 100644
--- a/user/aspell-dict-vi/APKBUILD
+++ b/user/aspell-dict-vi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-vi
pkgver=0.01.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Vietnamese dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/vi/aspell6-vi-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/vi/aspell6-vi-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-vi-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="d6b0a85ea3edf3193327f6df1b9c24947663fe711f060f10122e2c60aea2717d70277fd516fa685d9886c725baeebfc72d3f33e240ee8d182be669da716bb5c5 aspell6-vi-0.01.1-1.tar.bz2"
diff --git a/user/aspell-dict-wa/APKBUILD b/user/aspell-dict-wa/APKBUILD
index 35ed79b6b..8ac0dc480 100644
--- a/user/aspell-dict-wa/APKBUILD
+++ b/user/aspell-dict-wa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-wa
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Walloon dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/wa/aspell-wa-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/wa/aspell-wa-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-wa-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="67e8fbb80a2622b921e28a37b978fc998713f7e281beccc921afd8e289ac76094f589e905da2e9386c585fcfae53179ca1e9b24a39c8a021cb3f2685461e3a8c aspell-wa-0.50-0.tar.bz2"
diff --git a/user/aspell-dict-yi/APKBUILD b/user/aspell-dict-yi/APKBUILD
index f3b55aaaa..59f2eb444 100644
--- a/user/aspell-dict-yi/APKBUILD
+++ b/user/aspell-dict-yi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-yi
pkgver=0.01.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Yiddish dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/yi/aspell6-yi-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/yi/aspell6-yi-$_pkgver.tar.bz2"
builddir="$srcdir/aspell6-yi-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="a8d96ba192e61193469596ce1bf6e808bbb03e3fa3a75e545bdee4b6cfa607b681d0a9631465d004ce6e0e25453af732391e76b134138acc7c28991a3664f346 aspell6-yi-0.01.1-1.tar.bz2"
diff --git a/user/aspell-dict-zu/APKBUILD b/user/aspell-dict-zu/APKBUILD
index 6beb5fb89..7e4846103 100644
--- a/user/aspell-dict-zu/APKBUILD
+++ b/user/aspell-dict-zu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-zu
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
@@ -7,20 +7,20 @@ pkgrel=0
pkgdesc="Zulu dictionaries for aspell"
url="http://aspell.net"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="aspell"
makedepends="debianutils-which"
-source="ftp://ftp.gnu.org/gnu/aspell/dict/zu/aspell-zu-$_pkgver.tar.bz2"
+source="https://ftp.gnu.org/gnu/aspell/dict/zu/aspell-zu-$_pkgver.tar.bz2"
builddir="$srcdir/aspell-zu-$_pkgver"
build() {
- cd "$builddir"
- ./configure --vars DESTDIR="$pkgdir"
+ ./configure --vars DESTDIR="$pkgdir"
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
+
sha512sums="c79679a41e8aa1b80532c9eea0cf49c3a4bcdaa00f3d0d9e9f6eb7f4037992e40eaad0af711e5d5c29935afe6d0a2fb1c7b49dfdb2add07526a64cb2efac6ea9 aspell-zu-0.50-0.tar.bz2"
diff --git a/user/atkmm/APKBUILD b/user/atkmm/APKBUILD
index cbf9d21de..448b2c8bb 100644
--- a/user/atkmm/APKBUILD
+++ b/user/atkmm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=atkmm
pkgver=2.28.0
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/atkmm/${pkgver%.*}/atkmm-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/atril/APKBUILD b/user/atril/APKBUILD
index d36e45f69..259df376d 100644
--- a/user/atril/APKBUILD
+++ b/user/atril/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=atril
pkgver=1.22.2
pkgrel=0
diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD
index 46be8fec6..ea9b921ec 100644
--- a/user/attica/APKBUILD
+++ b/user/attica/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=attica
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Qt 5-based implementation of Open Collaboration Services"
url="https://www.kde.org/"
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ec2399baf721ba1553bf9ad44c6db0c77fe9b5dbdd4fdab3e27f0b496990179da346713b91ab96defc615474721644abf9d1819c04934b3b05191e540b86c94d attica-5.65.0.tar.xz"
+sha512sums="817a996cfd0a39584e38f8beb50ddcf891ad48d03d28691c256b3c632b22a1f9c4a0a32fb422147118e5ab5a468bf7ed721baff4ed212418a1b3447b5611845c attica-5.66.0.tar.xz"
diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD
index bd65db3b5..6a53e2d56 100644
--- a/user/audacious-plugins/APKBUILD
+++ b/user/audacious-plugins/APKBUILD
@@ -10,14 +10,14 @@ arch="all"
options="!check" # No test suite
license="ISC"
depends="audacious"
-install_if="audacious=$pkgver"
-makedepends="audacious-dev>=${pkgver%.*}
+makedepends="audacious-dev>=${pkgver%.*} autoconf automake
alsa-lib-dev curl-dev dbus-glib-dev faad2-dev ffmpeg-dev flac-dev
fluidsynth-dev lame-dev libcddb-dev libcdio-dev libcdio-paranoia-dev
libcue-dev libguess-dev libmodplug-dev libmms-dev libmowgli-dev
libnotify-dev libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev
libxcomposite-dev libxml2-dev mpg123-dev neon-dev pulseaudio-dev
qt5-qtmultimedia-dev sdl-dev wavpack-dev"
+install_if="audacious=$pkgver"
subpackages="$pkgname-lang"
source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2"
diff --git a/user/audacious/APKBUILD b/user/audacious/APKBUILD
index d671e395d..42e37fd98 100644
--- a/user/audacious/APKBUILD
+++ b/user/audacious/APKBUILD
@@ -9,6 +9,7 @@ url="https://audacious-media-player.org/"
arch="all"
options="!check" # No test suite.
license="ISC"
+depends=""
depends_dev="qt5-qtbase-dev dbus-glib-dev"
makedepends="$depends_dev libguess-dev>=1.2 libxml2-dev autoconf automake"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/user/audiofile/APKBUILD b/user/audiofile/APKBUILD
index 4744d3297..66b00d0c7 100644
--- a/user/audiofile/APKBUILD
+++ b/user/audiofile/APKBUILD
@@ -12,7 +12,8 @@ depends_dev="flac-dev"
makedepends="$depends_dev alsa-lib-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://audiofile.68k.org/audiofile-$pkgver.tar.gz
- tests-unsigned-gcc6.patch"
+ tests-unsigned-gcc6.patch
+ "
prepare() {
default_prepare
@@ -20,7 +21,6 @@ prepare() {
}
build() {
- cd "$builddir"
export CXXFLAGS="$CXXFLAGS -fpermissive"
./configure \
--build=$CBUILD \
@@ -33,12 +33,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/awesome/APKBUILD b/user/awesome/APKBUILD
index d3236b714..d6b140452 100644
--- a/user/awesome/APKBUILD
+++ b/user/awesome/APKBUILD
@@ -8,39 +8,35 @@ pkgrel=0
pkgdesc="lua-configurable window manager framework"
url="http://awesome.naquadah.org/"
arch="all"
-license="GPL-2.0+"
options="!check" # Tests require X and D-Bus
+license="GPL-2.0+"
depends="imagemagick lua-lgi cairo-gobject pango"
+checkdepends="xorg-server-xephyr"
makedepends="lua5.3 lua5.3-dev libxcb-dev pango-dev cairo-dev cmake gperf glib-dev
imlib2-dev libxdg-basedir-dev libev-dev startup-notification-dev
xcb-util-keysyms-dev xcb-util-image-dev xcb-util-dev xcb-util-wm-dev
dbus-dev gdk-pixbuf-dev xcb-util-cursor-dev libxkbcommon-dev
xcb-util-xrm-dev libexecinfo-dev xmlto"
-checkdepends="xorg-server-xephyr"
subpackages="$pkgname-doc"
source="https://github.com/awesomeWM/$pkgname-releases/raw/master/$pkgname-$pkgver.tar.xz"
build() {
# Awesome does not support in-tree builds
- mkdir -p "$builddir/build"
- cd "$builddir/build"
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DSYSCONFDIR=/etc \
- -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DLUA_INCLUDE_DIR=/usr/include/lua5.3 \
-DLUA_LIBRARIES=/usr/lib/lua5.3/liblua.so \
- ..
- make
+ -Bbuild
+ make -C build
}
check() {
- cd "$builddir/build"
- make check
+ make -C build check
}
package() {
- cd "$builddir/build"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="c5ef1e8dc593e7783b895d22143154aea8f211beeda24672a7ee4ed5112b4f4284043f848a151f3d3c4f569e91308670367a4353f705b20511b36495b22fa3f5 awesome-4.3.tar.xz"
diff --git a/user/ayatana-ido/APKBUILD b/user/ayatana-ido/APKBUILD
index dea352c42..fd0aaf9db 100644
--- a/user/ayatana-ido/APKBUILD
+++ b/user/ayatana-ido/APKBUILD
@@ -1,27 +1,27 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ayatana-ido
pkgver=0.4.4
-pkgrel=0
+pkgrel=1
pkgdesc="Indicator display object library for the Gnome desktop environment"
url="https://ayatanaindicators.github.io/"
arch="all"
license="GPL-3.0-only AND (LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0+"
depends=""
makedepends="glib-dev gobject-introspection-dev gtest-dev gtk+3.0-dev
- mate-common-dev vala-dev xorg-gtest-dev"
+ mate-common-dev vala-dev xorg-gtest-dev autoconf automake"
subpackages="$pkgname-dev"
source="ayatana-ido-$pkgver.tar.gz::https://github.com/AyatanaIndicators/ayatana-ido/archive/$pkgver.tar.gz
- gtk-doc-fix.patch"
+ gtk-doc-fix.patch
+ remove-private.patch
+ "
prepare() {
- cd "$builddir"
default_prepare
autoreconf -vif
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,14 +33,13 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" make install
}
sha512sums="ef04b0b6c959d209e88b1de322ac64ea33fdd043a73980bf3b043380603b6a448ea7bf43ba8e2750e1a0a9bef704a7099f7ae9b92a97d3ce0be2e9f48ba16703 ayatana-ido-0.4.4.tar.gz
-92ddc4f09c5ed7800357a76e2276c07db682408f259e22d6511696df032d6712ecd295d0775db36ad6ace5d3f352ce7d59cd9f1b24e899b7accaf680c0e4488d gtk-doc-fix.patch"
+92ddc4f09c5ed7800357a76e2276c07db682408f259e22d6511696df032d6712ecd295d0775db36ad6ace5d3f352ce7d59cd9f1b24e899b7accaf680c0e4488d gtk-doc-fix.patch
+a28c4cbfb5f386a9ee42ec50011bce603191b901760e6f9799a58b9ff2b223d03c15df00bd6fab6e13b9b9d5b70ecedef245665ebf4e240df1f1321e658b38fa remove-private.patch"
diff --git a/user/ayatana-ido/remove-private.patch b/user/ayatana-ido/remove-private.patch
new file mode 100644
index 000000000..848b1b026
--- /dev/null
+++ b/user/ayatana-ido/remove-private.patch
@@ -0,0 +1,2295 @@
+Required to build against newer GLib, else:
+
+idocalendarmenuitem.c: In function ‘ido_calendar_menu_item_init’:
+idocalendarmenuitem.c:109:13: error: G_ADD_PRIVATE [-Werror]
+ priv = item->priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item);
+ ^~~~~~~~~~~~~~~
+idocalendarmenuitem.c: In function ‘ido_calendar_menu_item_finalize’:
+idocalendarmenuitem.c:139:13: error: G_ADD_PRIVATE [-Werror]
+ IdoCalendarMenuItemPrivate *priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item);
+ ^~~~~~~~~~~~~~~
+
+
+From 0ab4079b28220f4051f8d0935a976e550514ad7f Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+Date: Tue, 3 Dec 2019 22:14:51 +0000
+Subject: [PATCH] Avoid deprecated g_type_class_add_private.
+
+---
+ src/idobasicmenuitem.c | 33 ++++-------
+ src/idobasicmenuitem.h | 2 -
+ src/idocalendarmenuitem.c | 116 +++++++++++++++++++++++--------------
+ src/idocalendarmenuitem.h | 3 -
+ src/idodetaillabel.c | 42 +++++++-------
+ src/idodetaillabel.h | 2 -
+ src/idoentrymenuitem.c | 61 ++++++++++++-------
+ src/idoentrymenuitem.h | 3 -
+ src/idolocationmenuitem.c | 34 +++++------
+ src/idolocationmenuitem.h | 2 -
+ src/idomessagedialog.c | 26 ++++-----
+ src/idorange.c | 20 +++----
+ src/idorange.h | 2 -
+ src/idoscalemenuitem.c | 75 +++++++++++++-----------
+ src/idoscalemenuitem.h | 3 -
+ src/idoswitchmenuitem.c | 33 +++++++----
+ src/idoswitchmenuitem.h | 3 -
+ src/idotimeline.c | 100 +++++++++++++++-----------------
+ src/idotimestampmenuitem.c | 65 ++++++++++-----------
+ src/idotimestampmenuitem.h | 2 -
+ src/idousermenuitem.c | 63 ++++++++++----------
+ src/idousermenuitem.h | 2 -
+ 22 files changed, 356 insertions(+), 336 deletions(-)
+
+diff --git a/src/idobasicmenuitem.c b/src/idobasicmenuitem.c
+index 382a150..cf57e7c 100644
+--- a/src/idobasicmenuitem.c
++++ b/src/idobasicmenuitem.c
+@@ -37,8 +37,7 @@ enum
+
+ static GParamSpec *properties[PROP_LAST];
+
+-struct _IdoBasicMenuItemPrivate
+-{
++typedef struct {
+ GIcon * icon;
+ char * text;
+ char * secondary_text;
+@@ -46,11 +45,9 @@ struct _IdoBasicMenuItemPrivate
+ GtkWidget * image;
+ GtkWidget * label;
+ GtkWidget * secondary_label;
+-};
+-
+-typedef IdoBasicMenuItemPrivate priv_t;
++} IdoBasicMenuItemPrivate;
+
+-G_DEFINE_TYPE (IdoBasicMenuItem, ido_basic_menu_item, GTK_TYPE_MENU_ITEM);
++G_DEFINE_TYPE_WITH_PRIVATE (IdoBasicMenuItem, ido_basic_menu_item, GTK_TYPE_MENU_ITEM);
+
+ /***
+ **** GObject Virtual Functions
+@@ -63,7 +60,7 @@ my_get_property (GObject * o,
+ GParamSpec * pspec)
+ {
+ IdoBasicMenuItem * self = IDO_BASIC_MENU_ITEM (o);
+- priv_t * p = self->priv;
++ IdoBasicMenuItemPrivate * p = ido_basic_menu_item_get_instance_private(self);
+
+ switch (property_id)
+ {
+@@ -117,7 +114,7 @@ static void
+ my_dispose (GObject * object)
+ {
+ IdoBasicMenuItem * self = IDO_BASIC_MENU_ITEM (object);
+- priv_t * p = self->priv;
++ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self);
+
+ g_clear_object (&p->icon);
+
+@@ -128,7 +125,7 @@ static void
+ my_finalize (GObject * object)
+ {
+ IdoBasicMenuItem * self = IDO_BASIC_MENU_ITEM (object);
+- priv_t * p = self->priv;
++ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self);
+
+ g_free (p->text);
+ g_free (p->secondary_text);
+@@ -139,7 +136,7 @@ my_finalize (GObject * object)
+ static void
+ ido_basic_menu_item_update_image (IdoBasicMenuItem *self)
+ {
+- IdoBasicMenuItemPrivate * p = self->priv;
++ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self);
+
+ gtk_image_clear (GTK_IMAGE (p->image));
+
+@@ -191,8 +188,6 @@ ido_basic_menu_item_class_init (IdoBasicMenuItemClass *klass)
+ GObjectClass * gobject_class = G_OBJECT_CLASS (klass);
+ GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+
+- g_type_class_add_private (klass, sizeof (IdoBasicMenuItemPrivate));
+-
+ gobject_class->get_property = my_get_property;
+ gobject_class->set_property = my_set_property;
+ gobject_class->dispose = my_dispose;
+@@ -228,15 +223,11 @@ ido_basic_menu_item_class_init (IdoBasicMenuItemClass *klass)
+ static void
+ ido_basic_menu_item_init (IdoBasicMenuItem *self)
+ {
+- priv_t * p;
++
+ GtkWidget * w;
+ GtkGrid * grid;
+
+- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+- IDO_TYPE_BASIC_MENU_ITEM,
+- IdoBasicMenuItemPrivate);
+-
+- p = self->priv;
++ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self);
+
+ p->image = gtk_image_new ();
+ gtk_misc_set_alignment(GTK_MISC(p->image), 0.0, 0.0);
+@@ -287,7 +278,7 @@ ido_basic_menu_item_new (void)
+ void
+ ido_basic_menu_item_set_icon (IdoBasicMenuItem * self, GIcon * icon)
+ {
+- IdoBasicMenuItemPrivate * p = self->priv;
++ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self);
+
+ if (p->icon != icon)
+ {
+@@ -314,7 +305,7 @@ ido_basic_menu_item_set_icon_from_file (IdoBasicMenuItem * self, const char * fi
+ void
+ ido_basic_menu_item_set_text (IdoBasicMenuItem * self, const char * text)
+ {
+- IdoBasicMenuItemPrivate * p = self->priv;
++ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self);
+
+ if (g_strcmp0 (p->text, text))
+ {
+@@ -331,7 +322,7 @@ ido_basic_menu_item_set_text (IdoBasicMenuItem * self, const char * text)
+ void
+ ido_basic_menu_item_set_secondary_text (IdoBasicMenuItem * self, const char * secondary_text)
+ {
+- IdoBasicMenuItemPrivate * p = self->priv;
++ IdoBasicMenuItemPrivate *p = ido_basic_menu_item_get_instance_private(self);
+
+ if (g_strcmp0 (p->secondary_text, secondary_text))
+ {
+diff --git a/src/idobasicmenuitem.h b/src/idobasicmenuitem.h
+index 6a4b83a..38ae830 100644
+--- a/src/idobasicmenuitem.h
++++ b/src/idobasicmenuitem.h
+@@ -30,7 +30,6 @@ G_BEGIN_DECLS
+
+ typedef struct _IdoBasicMenuItem IdoBasicMenuItem;
+ typedef struct _IdoBasicMenuItemClass IdoBasicMenuItemClass;
+-typedef struct _IdoBasicMenuItemPrivate IdoBasicMenuItemPrivate;
+
+ struct _IdoBasicMenuItemClass
+ {
+@@ -44,7 +43,6 @@ struct _IdoBasicMenuItem
+ {
+ /*< private >*/
+ GtkMenuItem parent;
+- IdoBasicMenuItemPrivate * priv;
+ };
+
+
+diff --git a/src/idocalendarmenuitem.c b/src/idocalendarmenuitem.c
+index 557d898..f3881bc 100644
+--- a/src/idocalendarmenuitem.c
++++ b/src/idocalendarmenuitem.c
+@@ -51,17 +51,14 @@ static void calendar_day_selected_double_click_cb (GtkWidget *widg
+ gpointer user_data);
+ static void calendar_day_selected_cb (GtkWidget *widget,
+ gpointer user_data);
+-struct _IdoCalendarMenuItemPrivate
+-{
++typedef struct {
+ GtkWidget *box;
+ GtkWidget *calendar;
+ GtkWidget *parent;
+ gboolean selected;
+-};
+-
+-G_DEFINE_TYPE (IdoCalendarMenuItem, ido_calendar_menu_item, GTK_TYPE_MENU_ITEM)
++} IdoCalendarMenuItemPrivate;
+
+-#define IDO_CALENDAR_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_CALENDAR_MENU_ITEM, IdoCalendarMenuItemPrivate))
++G_DEFINE_TYPE_WITH_PRIVATE (IdoCalendarMenuItem, ido_calendar_menu_item, GTK_TYPE_MENU_ITEM)
+
+ static void
+ ido_calendar_menu_item_class_init (IdoCalendarMenuItemClass *klass)
+@@ -84,8 +81,6 @@ ido_calendar_menu_item_class_init (IdoCalendarMenuItemClass *klass)
+
+ menu_item_class->hide_on_activate = TRUE;
+
+- g_type_class_add_private (gobject_class, sizeof (IdoCalendarMenuItemPrivate));
+-
+ g_signal_new("month-changed", G_TYPE_FROM_CLASS(klass),
+ G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+ g_cclosure_marshal_VOID__VOID,
+@@ -104,9 +99,7 @@ ido_calendar_menu_item_class_init (IdoCalendarMenuItemClass *klass)
+ static void
+ ido_calendar_menu_item_init (IdoCalendarMenuItem *item)
+ {
+- IdoCalendarMenuItemPrivate *priv;
+-
+- priv = item->priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item);
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(item);
+
+ /* Will be disposed automatically */
+ priv->calendar = g_object_new (gtk_calendar_get_type (),
+@@ -136,7 +129,7 @@ static void
+ ido_calendar_menu_item_finalize (GObject *object)
+ {
+ IdoCalendarMenuItem *item = IDO_CALENDAR_MENU_ITEM (object);
+- IdoCalendarMenuItemPrivate *priv = IDO_CALENDAR_MENU_ITEM_GET_PRIVATE (item);
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(item);
+
+ if (G_IS_OBJECT (priv->calendar))
+ {
+@@ -183,13 +176,14 @@ ido_calendar_menu_item_key_press (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data)
+ {
+- IdoCalendarMenuItem *menuitem = (IdoCalendarMenuItem *)data;
++ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (data);
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
+
+ g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM (menuitem), FALSE);
+
+- if (menuitem->priv->selected)
++ if (priv->selected)
+ {
+- GtkWidget *calendar = menuitem->priv->calendar;
++ GtkWidget *calendar = priv->calendar;
+
+ gtk_widget_event (calendar,
+ ((GdkEvent *)(void*)(event)));
+@@ -215,7 +209,10 @@ static gboolean
+ ido_calendar_menu_item_button_press (GtkWidget *widget,
+ GdkEventButton *event)
+ {
+- GtkWidget *calendar = IDO_CALENDAR_MENU_ITEM (widget)->priv->calendar;
++ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (widget);
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ GtkWidget *calendar = priv->calendar;
+
+ if (event->button == 1) {
+ if (gtk_widget_get_window (calendar) != NULL) {
+@@ -265,7 +262,10 @@ static gboolean
+ ido_calendar_menu_item_button_release (GtkWidget *widget,
+ GdkEventButton *event)
+ {
+- GtkWidget *calendar = IDO_CALENDAR_MENU_ITEM (widget)->priv->calendar;
++ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (widget);
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ GtkWidget *calendar = priv->calendar;
+ GTK_WIDGET_GET_CLASS(calendar)->button_release_event(GTK_WIDGET(calendar), event);
+
+ return TRUE;
+@@ -274,17 +274,23 @@ ido_calendar_menu_item_button_release (GtkWidget *widget,
+ static void
+ ido_calendar_menu_item_select (GtkMenuItem *item)
+ {
+- IDO_CALENDAR_MENU_ITEM (item)->priv->selected = TRUE;
++ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (item);
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ priv->selected = TRUE;
+
+- ido_calendar_menu_item_send_focus_change (GTK_WIDGET (IDO_CALENDAR_MENU_ITEM (item)->priv->calendar), TRUE);
++ ido_calendar_menu_item_send_focus_change (GTK_WIDGET (priv->calendar), TRUE);
+ }
+
+ static void
+ ido_calendar_menu_item_deselect (GtkMenuItem *item)
+ {
+- IDO_CALENDAR_MENU_ITEM (item)->priv->selected = FALSE;
++ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (item);
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
+
+- ido_calendar_menu_item_send_focus_change (GTK_WIDGET (IDO_CALENDAR_MENU_ITEM (item)->priv->calendar), FALSE);
++ priv->selected = FALSE;
++
++ ido_calendar_menu_item_send_focus_change (GTK_WIDGET (priv->calendar), FALSE);
+ }
+
+ static void
+@@ -296,25 +302,27 @@ calendar_realized_cb (GtkWidget *widget,
+ gdk_window_raise (gtk_widget_get_window (widget));
+ }
+
+- item->priv->parent = gtk_widget_get_parent (GTK_WIDGET (item));
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(item);
++
++ priv->parent = gtk_widget_get_parent (GTK_WIDGET (item));
+
+- g_object_add_weak_pointer (G_OBJECT (item->priv->parent),
+- (gpointer*) &item->priv->parent);
++ g_object_add_weak_pointer (G_OBJECT (priv->parent),
++ (gpointer*) &priv->parent);
+
+- g_signal_connect (item->priv->parent,
++ g_signal_connect (priv->parent,
+ "key-press-event",
+ G_CALLBACK (ido_calendar_menu_item_key_press),
+ item);
+
+- g_signal_connect (item->priv->calendar,
++ g_signal_connect (priv->calendar,
+ "month-changed",
+ G_CALLBACK (calendar_month_changed_cb),
+ item);
+- g_signal_connect (item->priv->calendar,
++ g_signal_connect (priv->calendar,
+ "day-selected",
+ G_CALLBACK (calendar_day_selected_cb),
+ item);
+- g_signal_connect (item->priv->calendar,
++ g_signal_connect (priv->calendar,
+ "day-selected-double-click",
+ G_CALLBACK (calendar_day_selected_double_click_cb),
+ item);
+@@ -327,7 +335,10 @@ calendar_move_focus_cb (GtkWidget *widget,
+ GtkDirectionType direction,
+ IdoCalendarMenuItem *item)
+ {
+- ido_calendar_menu_item_send_focus_change (GTK_WIDGET (IDO_CALENDAR_MENU_ITEM (item)->priv->calendar), FALSE);
++ IdoCalendarMenuItem *menuitem = IDO_CALENDAR_MENU_ITEM (widget);
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ ido_calendar_menu_item_send_focus_change (GTK_WIDGET (priv->calendar), FALSE);
+
+ g_signal_emit_by_name (item,
+ "move-focus",
+@@ -386,7 +397,9 @@ ido_calendar_menu_item_get_calendar (IdoCalendarMenuItem *menuitem)
+ {
+ g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM (menuitem), NULL);
+
+- return menuitem->priv->calendar;
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ return priv->calendar;
+ }
+
+ /**
+@@ -402,8 +415,10 @@ gboolean
+ ido_calendar_menu_item_mark_day (IdoCalendarMenuItem *menuitem, guint day)
+ {
+ g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE);
+-
+- gtk_calendar_mark_day(GTK_CALENDAR (menuitem->priv->calendar), day);
++
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ gtk_calendar_mark_day(GTK_CALENDAR (priv->calendar), day);
+ return TRUE;
+ }
+
+@@ -420,8 +435,10 @@ gboolean
+ ido_calendar_menu_item_unmark_day (IdoCalendarMenuItem *menuitem, guint day)
+ {
+ g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE);
+-
+- gtk_calendar_unmark_day(GTK_CALENDAR (menuitem->priv->calendar), day);
++
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ gtk_calendar_unmark_day(GTK_CALENDAR (priv->calendar), day);
+ return TRUE;
+ }
+
+@@ -435,8 +452,10 @@ void
+ ido_calendar_menu_item_clear_marks (IdoCalendarMenuItem *menuitem)
+ {
+ g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem));
+-
+- gtk_calendar_clear_marks(GTK_CALENDAR (menuitem->priv->calendar));
++
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ gtk_calendar_clear_marks(GTK_CALENDAR (priv->calendar));
+ }
+
+ /**
+@@ -450,8 +469,10 @@ void
+ ido_calendar_menu_item_set_display_options (IdoCalendarMenuItem *menuitem, GtkCalendarDisplayOptions flags)
+ {
+ g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem));
+-
+- gtk_calendar_set_display_options (GTK_CALENDAR (menuitem->priv->calendar), flags);
++
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ gtk_calendar_set_display_options (GTK_CALENDAR (priv->calendar), flags);
+ }
+
+ /**
+@@ -466,8 +487,10 @@ GtkCalendarDisplayOptions
+ ido_calendar_menu_item_get_display_options (IdoCalendarMenuItem *menuitem)
+ {
+ g_return_val_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem), 0);
+-
+- return gtk_calendar_get_display_options (GTK_CALENDAR (menuitem->priv->calendar));
++
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ return gtk_calendar_get_display_options (GTK_CALENDAR (priv->calendar));
+ }
+
+ /**
+@@ -484,9 +507,12 @@ ido_calendar_menu_item_get_date (IdoCalendarMenuItem *menuitem,
+ guint *year,
+ guint *month,
+ guint *day) {
+-
++
+ g_return_if_fail(IDO_IS_CALENDAR_MENU_ITEM(menuitem));
+- gtk_calendar_get_date (GTK_CALENDAR (menuitem->priv->calendar), year, month, day);
++
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
++ gtk_calendar_get_date (GTK_CALENDAR (priv->calendar), year, month, day);
+ }
+
+ /**
+@@ -510,13 +536,15 @@ ido_calendar_menu_item_set_date (IdoCalendarMenuItem *menuitem,
+
+ g_return_val_if_fail (IDO_IS_CALENDAR_MENU_ITEM(menuitem), FALSE);
+
++ IdoCalendarMenuItemPrivate *priv = ido_calendar_menu_item_get_instance_private(menuitem);
++
+ ido_calendar_menu_item_get_date (menuitem, &old_y, &old_m, &old_d);
+
+ if ((old_y != year) || (old_m != month))
+- gtk_calendar_select_month (GTK_CALENDAR (menuitem->priv->calendar), month, year);
++ gtk_calendar_select_month (GTK_CALENDAR (priv->calendar), month, year);
+
+ if (old_d != day)
+- gtk_calendar_select_day (GTK_CALENDAR (menuitem->priv->calendar), day);
++ gtk_calendar_select_day (GTK_CALENDAR (priv->calendar), day);
+
+ return TRUE;
+ }
+diff --git a/src/idocalendarmenuitem.h b/src/idocalendarmenuitem.h
+index 5cd913e..8c1528d 100644
+--- a/src/idocalendarmenuitem.h
++++ b/src/idocalendarmenuitem.h
+@@ -39,13 +39,10 @@ G_BEGIN_DECLS
+
+ typedef struct _IdoCalendarMenuItem IdoCalendarMenuItem;
+ typedef struct _IdoCalendarMenuItemClass IdoCalendarMenuItemClass;
+-typedef struct _IdoCalendarMenuItemPrivate IdoCalendarMenuItemPrivate;
+
+ struct _IdoCalendarMenuItem
+ {
+ GtkMenuItem parent_instance;
+-
+- IdoCalendarMenuItemPrivate *priv;
+ };
+
+ struct _IdoCalendarMenuItemClass
+diff --git a/src/idodetaillabel.c b/src/idodetaillabel.c
+index b36b222..c502f92 100644
+--- a/src/idodetaillabel.c
++++ b/src/idodetaillabel.c
+@@ -21,14 +21,11 @@
+
+ #include <math.h>
+
+-G_DEFINE_TYPE (IdoDetailLabel, ido_detail_label, GTK_TYPE_WIDGET)
+-
+-struct _IdoDetailLabelPrivate
+-{
++typedef struct {
+ gchar *text;
+ PangoLayout *layout;
+ gboolean draw_lozenge;
+-};
++} IdoDetailLabelPrivate;
+
+ enum
+ {
+@@ -39,6 +36,8 @@ enum
+
+ static GParamSpec *properties[NUM_PROPERTIES];
+
++G_DEFINE_TYPE_WITH_PRIVATE (IdoDetailLabel, ido_detail_label, GTK_TYPE_WIDGET)
++
+ static void
+ ido_detail_label_get_property (GObject *object,
+ guint property_id,
+@@ -46,11 +45,12 @@ ido_detail_label_get_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ IdoDetailLabel *self = IDO_DETAIL_LABEL (object);
++ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(self);
+
+ switch (property_id)
+ {
+ case PROP_TEXT:
+- g_value_set_string (value, self->priv->text);
++ g_value_set_string (value, priv->text);
+ break;
+
+ default:
+@@ -81,7 +81,7 @@ ido_detail_label_set_property (GObject *object,
+ static void
+ ido_detail_label_finalize (GObject *object)
+ {
+- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (object)->priv;
++ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (object));
+
+ g_free (priv->text);
+
+@@ -91,7 +91,7 @@ ido_detail_label_finalize (GObject *object)
+ static void
+ ido_detail_label_dispose (GObject *object)
+ {
+- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (object)->priv;
++ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (object));
+
+ g_clear_object (&priv->layout);
+
+@@ -101,7 +101,7 @@ ido_detail_label_dispose (GObject *object)
+ static void
+ ido_detail_label_ensure_layout (IdoDetailLabel *label)
+ {
+- IdoDetailLabelPrivate *priv = label->priv;
++ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label);
+
+ if (priv->layout == NULL)
+ {
+@@ -156,7 +156,8 @@ gtk_widget_get_font_metrics (GtkWidget *widget,
+ static gint
+ ido_detail_label_get_minimum_text_width (IdoDetailLabel *label)
+ {
+- IdoDetailLabelPrivate *priv = label->priv;
++ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label);
++
+ PangoContext *context;
+ PangoFontMetrics *metrics;
+ gint char_width;
+@@ -176,7 +177,8 @@ ido_detail_label_draw (GtkWidget *widget,
+ cairo_t *cr)
+ {
+ IdoDetailLabel *label = IDO_DETAIL_LABEL (widget);
+- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (widget)->priv;
++ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label);
++
+ PangoRectangle extents;
+ GtkAllocation allocation;
+ double x, w, h, radius;
+@@ -224,7 +226,8 @@ ido_detail_label_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+ {
+- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (widget)->priv;
++ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (widget));
++
+ PangoRectangle extents;
+ double radius;
+
+@@ -244,7 +247,7 @@ ido_detail_label_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
+ {
+- IdoDetailLabelPrivate *priv = IDO_DETAIL_LABEL (widget)->priv;
++ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(IDO_DETAIL_LABEL (widget));
+ PangoContext *context;
+ PangoFontMetrics *metrics;
+ PangoRectangle extents;
+@@ -277,8 +280,6 @@ ido_detail_label_class_init (IdoDetailLabelClass *klass)
+ widget_class->get_preferred_width = ido_detail_label_get_preferred_width;
+ widget_class->get_preferred_height = ido_detail_label_get_preferred_height;
+
+- g_type_class_add_private (klass, sizeof (IdoDetailLabelPrivate));
+-
+ properties[PROP_TEXT] = g_param_spec_string ("text",
+ "Text",
+ "The text of the label",
+@@ -292,10 +293,6 @@ ido_detail_label_class_init (IdoDetailLabelClass *klass)
+ static void
+ ido_detail_label_init (IdoDetailLabel *self)
+ {
+- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+- IDO_TYPE_DETAIL_LABEL,
+- IdoDetailLabelPrivate);
+-
+ gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
+ }
+
+@@ -311,7 +308,10 @@ const gchar *
+ ido_detail_label_get_text (IdoDetailLabel *label)
+ {
+ g_return_val_if_fail (IDO_IS_DETAIL_LABEL (label), NULL);
+- return label->priv->text;
++
++ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label);
++
++ return priv->text;
+ }
+
+ /* collapse_whitespace:
+@@ -362,7 +362,7 @@ ido_detail_label_set_text_impl (IdoDetailLabel *label,
+ const gchar *text,
+ gboolean draw_lozenge)
+ {
+- IdoDetailLabelPrivate * priv = label->priv;
++ IdoDetailLabelPrivate *priv = ido_detail_label_get_instance_private(label);
+
+ g_clear_object (&priv->layout);
+ g_free (priv->text);
+diff --git a/src/idodetaillabel.h b/src/idodetaillabel.h
+index 1995fee..6b6f57a 100644
+--- a/src/idodetaillabel.h
++++ b/src/idodetaillabel.h
+@@ -31,12 +31,10 @@
+
+ typedef struct _IdoDetailLabel IdoDetailLabel;
+ typedef struct _IdoDetailLabelClass IdoDetailLabelClass;
+-typedef struct _IdoDetailLabelPrivate IdoDetailLabelPrivate;
+
+ struct _IdoDetailLabel
+ {
+ GtkWidget parent;
+- IdoDetailLabelPrivate *priv;
+ };
+
+ struct _IdoDetailLabelClass
+diff --git a/src/idoentrymenuitem.c b/src/idoentrymenuitem.c
+index 5b5a3fb..d2948df 100644
+--- a/src/idoentrymenuitem.c
++++ b/src/idoentrymenuitem.c
+@@ -27,6 +27,7 @@
+ #include "idoentrymenuitem.h"
+ #include "config.h"
+
++static void ido_entry_menu_item_finalize (GObject *item);
+ static void ido_entry_menu_item_select (GtkMenuItem *item);
+ static void ido_entry_menu_item_deselect (GtkMenuItem *item);
+ static gboolean ido_entry_menu_item_button_release (GtkWidget *widget,
+@@ -44,16 +45,13 @@ static void entry_move_focus_cb (GtkWidget *widget,
+ GtkDirectionType direction,
+ IdoEntryMenuItem *item);
+
+-struct _IdoEntryMenuItemPrivate
+-{
++typedef struct {
+ GtkWidget *box;
+ GtkWidget *entry;
+ gboolean selected;
+-};
+-
+-G_DEFINE_TYPE (IdoEntryMenuItem, ido_entry_menu_item, GTK_TYPE_MENU_ITEM)
++} IdoEntryMenuItemPrivate;
+
+-#define IDO_ENTRY_MENU_ITEM_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_ENTRY_MENU_ITEM, IdoEntryMenuItemPrivate))
++G_DEFINE_TYPE_WITH_PRIVATE (IdoEntryMenuItem, ido_entry_menu_item, GTK_TYPE_MENU_ITEM)
+
+ static void
+ ido_entry_menu_item_class_init (IdoEntryMenuItemClass *klass)
+@@ -66,6 +64,8 @@ ido_entry_menu_item_class_init (IdoEntryMenuItemClass *klass)
+ widget_class = GTK_WIDGET_CLASS (klass);
+ menu_item_class = GTK_MENU_ITEM_CLASS (klass);
+
++ gobject_class->finalize = ido_entry_menu_item_finalize;
++
+ widget_class->button_release_event = ido_entry_menu_item_button_release;
+ widget_class->button_press_event = ido_entry_menu_item_button_press;
+
+@@ -73,8 +73,6 @@ ido_entry_menu_item_class_init (IdoEntryMenuItemClass *klass)
+ menu_item_class->deselect = ido_entry_menu_item_deselect;
+
+ menu_item_class->hide_on_activate = TRUE;
+-
+- g_type_class_add_private (gobject_class, sizeof (IdoEntryMenuItemPrivate));
+ }
+
+ static void
+@@ -88,7 +86,7 @@ ido_entry_menu_item_init (IdoEntryMenuItem *item)
+ border.top = 2;
+ border.bottom = 2;
+
+- priv = item->priv = IDO_ENTRY_MENU_ITEM_GET_PRIVATE (item);
++ priv = ido_entry_menu_item_get_instance_private(item);
+
+ priv->entry = g_object_new (gtk_entry_get_type (),
+ "inner-border", &border,
+@@ -135,12 +133,13 @@ ido_entry_menu_item_key_press (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer data)
+ {
+- IdoEntryMenuItem *menuitem = (IdoEntryMenuItem *)data;
++ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(data);
++ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem);
+
+- if (menuitem->priv->selected &&
++ if (priv->selected &&
+ is_key_press_valid (menuitem, event->keyval))
+ {
+- GtkWidget *entry = menuitem->priv->entry;
++ GtkWidget *entry = priv->entry;
+
+ gtk_widget_event (entry,
+ ((GdkEvent *)(void*)(event)));
+@@ -179,7 +178,10 @@ static gboolean
+ ido_entry_menu_item_button_press (GtkWidget *widget,
+ GdkEventButton *event)
+ {
+- GtkWidget *entry = IDO_ENTRY_MENU_ITEM (widget)->priv->entry;
++ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(widget);
++ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem);
++
++ GtkWidget *entry = priv->entry;
+
+ if (event->button == 1)
+ {
+@@ -206,7 +208,10 @@ static gboolean
+ ido_entry_menu_item_button_release (GtkWidget *widget,
+ GdkEventButton *event)
+ {
+- GtkWidget *entry = IDO_ENTRY_MENU_ITEM (widget)->priv->entry;
++ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(widget);
++ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem);
++
++ GtkWidget *entry = priv->entry;
+
+ gtk_widget_event (entry,
+ ((GdkEvent *)(void*)(event)));
+@@ -217,17 +222,23 @@ ido_entry_menu_item_button_release (GtkWidget *widget,
+ static void
+ ido_entry_menu_item_select (GtkMenuItem *item)
+ {
+- IDO_ENTRY_MENU_ITEM (item)->priv->selected = TRUE;
++ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(item);
++ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem);
++
++ priv->selected = TRUE;
+
+- ido_entry_menu_item_send_focus_change (GTK_WIDGET (IDO_ENTRY_MENU_ITEM (item)->priv->entry), TRUE);
++ ido_entry_menu_item_send_focus_change (GTK_WIDGET (priv->entry), TRUE);
+ }
+
+ static void
+ ido_entry_menu_item_deselect (GtkMenuItem *item)
+ {
+- IDO_ENTRY_MENU_ITEM (item)->priv->selected = FALSE;
++ IdoEntryMenuItem *menuitem = IDO_ENTRY_MENU_ITEM(item);
++ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem);
+
+- ido_entry_menu_item_send_focus_change (GTK_WIDGET (IDO_ENTRY_MENU_ITEM (item)->priv->entry), FALSE);
++ priv->selected = FALSE;
++
++ ido_entry_menu_item_send_focus_change (GTK_WIDGET (priv->entry), FALSE);
+ }
+
+
+@@ -253,7 +264,9 @@ entry_move_focus_cb (GtkWidget *widget,
+ GtkDirectionType direction,
+ IdoEntryMenuItem *item)
+ {
+- ido_entry_menu_item_send_focus_change (GTK_WIDGET (IDO_ENTRY_MENU_ITEM (item)->priv->entry), FALSE);
++ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(item);
++
++ ido_entry_menu_item_send_focus_change (GTK_WIDGET (priv->entry), FALSE);
+
+ g_signal_emit_by_name (item,
+ "move-focus",
+@@ -286,5 +299,13 @@ ido_entry_menu_item_get_entry (IdoEntryMenuItem *menuitem)
+ {
+ g_return_val_if_fail (IDO_IS_ENTRY_MENU_ITEM (menuitem), NULL);
+
+- return menuitem->priv->entry;
++ IdoEntryMenuItemPrivate *priv = ido_entry_menu_item_get_instance_private(menuitem);
++
++ return priv->entry;
++}
++
++static void
++ido_entry_menu_item_finalize (GObject *gobject)
++{
++ /* no-op */
+ }
+diff --git a/src/idoentrymenuitem.h b/src/idoentrymenuitem.h
+index 417e774..7c5da79 100644
+--- a/src/idoentrymenuitem.h
++++ b/src/idoentrymenuitem.h
+@@ -39,13 +39,10 @@ G_BEGIN_DECLS
+
+ typedef struct _IdoEntryMenuItem IdoEntryMenuItem;
+ typedef struct _IdoEntryMenuItemClass IdoEntryMenuItemClass;
+-typedef struct _IdoEntryMenuItemPrivate IdoEntryMenuItemPrivate;
+
+ struct _IdoEntryMenuItem
+ {
+ GtkMenuItem parent_instance;
+-
+- IdoEntryMenuItemPrivate *priv;
+ };
+
+ struct _IdoEntryMenuItemClass
+diff --git a/src/idolocationmenuitem.c b/src/idolocationmenuitem.c
+index 335422a..eb6b38b 100644
+--- a/src/idolocationmenuitem.c
++++ b/src/idolocationmenuitem.c
+@@ -37,16 +37,13 @@ enum
+
+ static GParamSpec *properties[PROP_LAST];
+
+-struct _IdoLocationMenuItemPrivate
+-{
++typedef struct {
+ char * timezone;
+
+ guint timestamp_timer;
+-};
++} IdoLocationMenuItemPrivate;
+
+-typedef IdoLocationMenuItemPrivate priv_t;
+-
+-G_DEFINE_TYPE (IdoLocationMenuItem, ido_location_menu_item, IDO_TYPE_TIME_STAMP_MENU_ITEM);
++G_DEFINE_TYPE_WITH_PRIVATE (IdoLocationMenuItem, ido_location_menu_item, IDO_TYPE_TIME_STAMP_MENU_ITEM);
+
+ /***
+ **** Timestamp Label
+@@ -58,7 +55,9 @@ update_timestamp (IdoLocationMenuItem * self)
+ GTimeZone * tz;
+ GDateTime * date_time;
+
+- tz = g_time_zone_new (self->priv->timezone);
++ IdoLocationMenuItemPrivate * priv = ido_location_menu_item_get_instance_private(self);
++
++ tz = g_time_zone_new (priv->timezone);
+ if (tz == NULL)
+ tz = g_time_zone_new_local ();
+ date_time = g_date_time_new_now (tz);
+@@ -73,7 +72,7 @@ update_timestamp (IdoLocationMenuItem * self)
+ static void
+ stop_timestamp_timer (IdoLocationMenuItem * self)
+ {
+- priv_t * p = self->priv;
++ IdoLocationMenuItemPrivate * p = ido_location_menu_item_get_instance_private(self);
+
+ if (p->timestamp_timer != 0)
+ {
+@@ -130,6 +129,7 @@ restart_timestamp_timer (IdoLocationMenuItem * self)
+ const char * fmt = ido_time_stamp_menu_item_get_format (IDO_TIME_STAMP_MENU_ITEM (self));
+ gboolean timestamp_shows_seconds;
+ int interval_sec;
++ IdoLocationMenuItemPrivate * priv = ido_location_menu_item_get_instance_private(self);
+
+ stop_timestamp_timer (self);
+
+@@ -142,7 +142,7 @@ restart_timestamp_timer (IdoLocationMenuItem * self)
+ else
+ interval_sec = calculate_seconds_until_next_minute();
+
+- self->priv->timestamp_timer = g_timeout_add_seconds (interval_sec,
++ priv->timestamp_timer = g_timeout_add_seconds (interval_sec,
+ on_timestamp_timer,
+ self);
+ }
+@@ -158,7 +158,7 @@ my_get_property (GObject * o,
+ GParamSpec * pspec)
+ {
+ IdoLocationMenuItem * self = IDO_LOCATION_MENU_ITEM (o);
+- priv_t * p = self->priv;
++ IdoLocationMenuItemPrivate * p = ido_location_menu_item_get_instance_private(self);
+
+ switch (property_id)
+ {
+@@ -204,8 +204,9 @@ static void
+ my_finalize (GObject * object)
+ {
+ IdoLocationMenuItem * self = IDO_LOCATION_MENU_ITEM (object);
++ IdoLocationMenuItemPrivate * priv = ido_location_menu_item_get_instance_private(self);
+
+- g_free (self->priv->timezone);
++ g_free (priv->timezone);
+
+ G_OBJECT_CLASS (ido_location_menu_item_parent_class)->finalize (object);
+ }
+@@ -219,8 +220,6 @@ ido_location_menu_item_class_init (IdoLocationMenuItemClass *klass)
+ {
+ GObjectClass * gobject_class = G_OBJECT_CLASS (klass);
+
+- g_type_class_add_private (klass, sizeof (IdoLocationMenuItemPrivate));
+-
+ gobject_class->get_property = my_get_property;
+ gobject_class->set_property = my_set_property;
+ gobject_class->dispose = my_dispose;
+@@ -239,10 +238,6 @@ ido_location_menu_item_class_init (IdoLocationMenuItemClass *klass)
+ static void
+ ido_location_menu_item_init (IdoLocationMenuItem *self)
+ {
+- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+- IDO_LOCATION_MENU_ITEM_TYPE,
+- IdoLocationMenuItemPrivate);
+-
+ /* Update the timer whenever the format string changes
+ because it determines whether we update once per second or per minute */
+ g_signal_connect (self, "notify::format",
+@@ -271,10 +266,11 @@ void
+ ido_location_menu_item_set_timezone (IdoLocationMenuItem * self,
+ const char * timezone)
+ {
+- priv_t * p;
++ IdoLocationMenuItemPrivate * p;
+
+ g_return_if_fail (IDO_IS_LOCATION_MENU_ITEM (self));
+- p = self->priv;
++
++ p = ido_location_menu_item_get_instance_private(self);
+
+ g_free (p->timezone);
+ p->timezone = g_strdup (timezone);
+diff --git a/src/idolocationmenuitem.h b/src/idolocationmenuitem.h
+index 2ae231f..5d1c660 100644
+--- a/src/idolocationmenuitem.h
++++ b/src/idolocationmenuitem.h
+@@ -31,7 +31,6 @@ G_BEGIN_DECLS
+
+ typedef struct _IdoLocationMenuItem IdoLocationMenuItem;
+ typedef struct _IdoLocationMenuItemClass IdoLocationMenuItemClass;
+-typedef struct _IdoLocationMenuItemPrivate IdoLocationMenuItemPrivate;
+
+ struct _IdoLocationMenuItemClass
+ {
+@@ -48,7 +47,6 @@ struct _IdoLocationMenuItem
+ {
+ /*< private >*/
+ IdoTimeStampMenuItem parent;
+- IdoLocationMenuItemPrivate * priv;
+ };
+
+
+diff --git a/src/idomessagedialog.c b/src/idomessagedialog.c
+index 5b73950..ef5f148 100644
+--- a/src/idomessagedialog.c
++++ b/src/idomessagedialog.c
+@@ -34,22 +34,18 @@
+ #include "idotimeline.h"
+ #include "config.h"
+
+-#define IDO_MESSAGE_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_MESSAGE_DIALOG, IdoMessageDialogPrivate))
+-
+ static GtkWidget *ido_message_dialog_get_secondary_label (IdoMessageDialog *dialog);
+ static GtkWidget *ido_message_dialog_get_primary_label (IdoMessageDialog *dialog);
+
+-typedef struct _IdoMessageDialogPrivate IdoMessageDialogPrivate;
+-typedef struct _IdoMessageDialogMorphContext IdoMessageDialogMorphContext;
+-
+-struct _IdoMessageDialogPrivate
+-{
++typedef struct {
+ GtkWidget *action_area;
+ GtkWidget *primary_label;
+ GtkWidget *secondary_label;
+
+ gboolean expanded;
+-};
++} IdoMessageDialogPrivate;
++
++typedef struct _IdoMessageDialogMorphContext IdoMessageDialogMorphContext;
+
+ struct _IdoMessageDialogMorphContext
+ {
+@@ -60,13 +56,13 @@ struct _IdoMessageDialogMorphContext
+ GtkRequisition end;
+ };
+
+-G_DEFINE_TYPE (IdoMessageDialog, ido_message_dialog, GTK_TYPE_MESSAGE_DIALOG)
++G_DEFINE_TYPE_WITH_PRIVATE (IdoMessageDialog, ido_message_dialog, GTK_TYPE_MESSAGE_DIALOG)
+
+ static void
+ ido_message_dialog_map (GtkWidget *widget)
+ {
+ IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (widget);
+- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (dialog);
++ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog);
+
+ GTK_WIDGET_CLASS (ido_message_dialog_parent_class)->map (widget);
+
+@@ -145,7 +141,7 @@ timeline_finished_cb (IdoTimeline *timeline,
+ gpointer user_data)
+ {
+ IdoMessageDialogMorphContext *context = user_data;
+- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (context->widget);
++ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (IDO_MESSAGE_DIALOG (context->widget));
+
+ gtk_widget_show (priv->action_area);
+ gtk_widget_show (priv->secondary_label);
+@@ -158,7 +154,7 @@ ido_message_dialog_focus_in_event (GtkWidget *widget,
+ GdkEventFocus *event)
+ {
+ IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (widget);
+- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (dialog);
++ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog);
+
+ if (!priv->expanded)
+ {
+@@ -203,7 +199,9 @@ ido_message_dialog_focus_in_event (GtkWidget *widget,
+ static void
+ ido_message_dialog_constructed (GObject *object)
+ {
+- IdoMessageDialogPrivate *priv = IDO_MESSAGE_DIALOG_GET_PRIVATE (object);
++
++ IdoMessageDialog *dialog = IDO_MESSAGE_DIALOG (object);
++ IdoMessageDialogPrivate *priv = ido_message_dialog_get_instance_private (dialog);
+ GtkWidget *vbox;
+ GtkWidget *event_box;
+
+@@ -231,8 +229,6 @@ ido_message_dialog_class_init (IdoMessageDialogClass *class)
+
+ widget_class->map = ido_message_dialog_map;
+ widget_class->focus_in_event = ido_message_dialog_focus_in_event;
+-
+- g_type_class_add_private (object_class, sizeof (IdoMessageDialogPrivate));
+ }
+
+ static void
+diff --git a/src/idorange.c b/src/idorange.c
+index acdfa5d..634b223 100644
+--- a/src/idorange.c
++++ b/src/idorange.c
+@@ -27,10 +27,9 @@
+ #include "idotypebuiltins.h"
+ #include "config.h"
+
+-struct _IdoRangePrivate
+-{
++typedef struct {
+ IdoRangeStyle style;
+-};
++} IdoRangePrivate;
+
+ static void ido_range_constructed (GObject *object);
+ static void ido_range_set_property (GObject *object,
+@@ -42,9 +41,7 @@ static void ido_range_get_property (GObject *object,
+ GValue *value,
+ GParamSpec *pspec);
+
+-#define IDO_RANGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_RANGE, IdoRangePrivate))
+-
+-G_DEFINE_TYPE (IdoRange, ido_range, GTK_TYPE_SCALE)
++G_DEFINE_TYPE_WITH_PRIVATE (IdoRange, ido_range, GTK_TYPE_SCALE)
+
+ enum {
+ PROP_0,
+@@ -87,8 +84,6 @@ ido_range_class_init (IdoRangeClass *class)
+ G_MAXINT,
+ 8,
+ G_PARAM_READABLE));
+-
+- g_type_class_add_private (class, sizeof (IdoRangePrivate));
+ }
+
+ static void
+@@ -97,7 +92,8 @@ ido_range_get_property (GObject *object,
+ GValue *value,
+ GParamSpec *pspec)
+ {
+- IdoRangePrivate *priv = IDO_RANGE (object)->priv;
++ IdoRange *range = IDO_RANGE (object);
++ IdoRangePrivate *priv = ido_range_get_instance_private (range);
+
+ switch (prop_id)
+ {
+@@ -117,7 +113,8 @@ ido_range_set_property (GObject *object,
+ const GValue *value,
+ GParamSpec *pspec)
+ {
+- IdoRangePrivate *priv = IDO_RANGE (object)->priv;
++ IdoRange *range = IDO_RANGE (object);
++ IdoRangePrivate *priv = ido_range_get_instance_private (range);
+
+ switch (prop_id)
+ {
+@@ -135,6 +132,7 @@ static void
+ ido_range_constructed (GObject *object)
+ {
+ IdoRange *range = IDO_RANGE (object);
++
+ IdoRangeStyle style;
+ char buf[1024];
+
+@@ -163,7 +161,7 @@ ido_range_constructed (GObject *object)
+ static void
+ ido_range_init (IdoRange *range)
+ {
+- range->priv = IDO_RANGE_GET_PRIVATE (range);
++ /* no-op */
+ }
+
+ /**
+diff --git a/src/idorange.h b/src/idorange.h
+index 7c2e79b..beef43f 100644
+--- a/src/idorange.h
++++ b/src/idorange.h
+@@ -44,13 +44,11 @@ typedef enum
+ } IdoRangeStyle;
+
+ typedef struct _IdoRange IdoRange;
+-typedef struct _IdoRangePrivate IdoRangePrivate;
+ typedef struct _IdoRangeClass IdoRangeClass;
+
+ struct _IdoRange
+ {
+ GtkScale parent_instance;
+- IdoRangePrivate *priv;
+ };
+
+ struct _IdoRangeClass
+diff --git a/src/idoscalemenuitem.c b/src/idoscalemenuitem.c
+index de9884f..9f5f29c 100644
+--- a/src/idoscalemenuitem.c
++++ b/src/idoscalemenuitem.c
+@@ -64,7 +64,7 @@ static void update_packing (IdoScaleMenuItem
+ static void default_primary_clicked_handler (IdoScaleMenuItem *self);
+ static void default_secondary_clicked_handler (IdoScaleMenuItem *self);
+
+-struct _IdoScaleMenuItemPrivate {
++typedef struct {
+ GtkWidget *scale;
+ GtkAdjustment *adjustment;
+ GtkWidget *primary_image;
+@@ -78,7 +78,7 @@ struct _IdoScaleMenuItemPrivate {
+ IdoRangeStyle range_style;
+ gboolean ignore_value_changed;
+ gboolean has_focus;
+-};
++} IdoScaleMenuItemPrivate;
+
+ enum {
+ SLIDER_GRABBED,
+@@ -99,15 +99,15 @@ enum {
+
+ static guint signals[LAST_SIGNAL] = { 0 };
+
+-G_DEFINE_TYPE (IdoScaleMenuItem, ido_scale_menu_item, GTK_TYPE_MENU_ITEM)
+-
+-#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), IDO_TYPE_SCALE_MENU_ITEM, IdoScaleMenuItemPrivate))
++G_DEFINE_TYPE_WITH_PRIVATE (IdoScaleMenuItem, ido_scale_menu_item, GTK_TYPE_MENU_ITEM)
+
+ static gboolean
+ ido_scale_menu_item_scroll_event (GtkWidget *menuitem,
+ GdkEventScroll *event)
+ {
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
++ IdoScaleMenuItem *item = IDO_SCALE_MENU_ITEM (menuitem);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item);
++
+ GtkWidget *scale = priv->scale;
+
+ if (priv->reverse_scroll)
+@@ -138,7 +138,7 @@ ido_scale_menu_item_scale_value_changed (GtkRange *range,
+ gpointer user_data)
+ {
+ IdoScaleMenuItem *self = user_data;
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self);
+
+ /* The signal is not sent when it was set through
+ * ido_scale_menu_item_set_value(). */
+@@ -151,7 +151,8 @@ static void
+ ido_scale_menu_item_constructed (GObject *object)
+ {
+ IdoScaleMenuItem *self = IDO_SCALE_MENU_ITEM (object);
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self);
++
+ GObject *adj = G_OBJECT (gtk_adjustment_new (0.0, 0.0, 100.0, 1.0, 10.0, 0.0));
+ IdoRangeStyle range_style;
+ GtkWidget *hbox;
+@@ -322,14 +323,13 @@ ido_scale_menu_item_class_init (IdoScaleMenuItemClass *item_class)
+ G_TYPE_NONE,
+ 1, G_TYPE_DOUBLE);
+
+-
+- g_type_class_add_private (item_class, sizeof (IdoScaleMenuItemPrivate));
+ }
+
+ static void
+ update_packing (IdoScaleMenuItem *self, IdoScaleMenuItemStyle style)
+ {
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self);
++
+ GtkBox * box = GTK_BOX (priv->hbox);
+ GtkContainer *container = GTK_CONTAINER (priv->hbox);
+
+@@ -366,7 +366,7 @@ update_packing (IdoScaleMenuItem *self, IdoScaleMenuItemStyle style)
+ static void
+ ido_scale_menu_item_init (IdoScaleMenuItem *self)
+ {
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (self);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (self);
+
+ priv->reverse_scroll = TRUE;
+
+@@ -380,7 +380,7 @@ ido_scale_menu_item_set_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (object);
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menu_item);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item);
+
+ switch (prop_id)
+ {
+@@ -413,7 +413,7 @@ ido_scale_menu_item_get_property (GObject *object,
+ GParamSpec *pspec)
+ {
+ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (object);
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menu_item);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item);
+ GtkAdjustment *adjustment;
+
+ switch (prop_id)
+@@ -442,7 +442,8 @@ ido_scale_menu_item_parent_key_press_event (GtkWidget *widget,
+ GdkEventKey *event,
+ gpointer user_data)
+ {
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (user_data);
++ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (user_data);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item);
+
+ /* only listen to events when the playback menu item is selected */
+ if (!priv->has_focus)
+@@ -469,7 +470,8 @@ ido_scale_menu_item_parent_key_press_event (GtkWidget *widget,
+ static void
+ ido_scale_menu_item_select (GtkMenuItem *item)
+ {
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item);
++ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (item);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item);
+
+ priv->has_focus = TRUE;
+ gtk_widget_set_state_flags (priv->scale, GTK_STATE_FLAG_FOCUSED, FALSE);
+@@ -480,7 +482,8 @@ ido_scale_menu_item_select (GtkMenuItem *item)
+ static void
+ ido_scale_menu_item_deselect (GtkMenuItem *item)
+ {
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item);
++ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (item);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item);
+
+ priv->has_focus = FALSE;
+ gtk_widget_unset_state_flags (priv->scale, GTK_STATE_FLAG_FOCUSED);
+@@ -492,7 +495,9 @@ static gboolean
+ ido_scale_menu_item_button_press_event (GtkWidget *menuitem,
+ GdkEventButton *event)
+ {
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
++ IdoScaleMenuItem *item = IDO_SCALE_MENU_ITEM (menuitem);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item);
++
+ GtkAllocation alloc;
+ gint x, y;
+
+@@ -516,7 +521,8 @@ ido_scale_menu_item_button_release_event (GtkWidget *menuitem,
+ GdkEventButton *event)
+ {
+ IdoScaleMenuItem *item = IDO_SCALE_MENU_ITEM (menuitem);
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item);
++
+ GtkWidget *scale = priv->scale;
+ GtkAllocation alloc;
+ gint x, y;
+@@ -569,7 +575,9 @@ static gboolean
+ ido_scale_menu_item_motion_notify_event (GtkWidget *menuitem,
+ GdkEventMotion *event)
+ {
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (menuitem);
++ IdoScaleMenuItem *menu_item = IDO_SCALE_MENU_ITEM (menuitem);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (menu_item);
++
+ GtkAllocation alloc;
+ gint x, y;
+
+@@ -596,7 +604,7 @@ static void
+ menu_hidden (GtkWidget *menu,
+ IdoScaleMenuItem *scale)
+ {
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (scale);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (scale);
+
+ if (priv->grabbed)
+ {
+@@ -718,7 +726,7 @@ ido_scale_menu_item_get_scale (IdoScaleMenuItem *menuitem)
+
+ g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL);
+
+- priv = GET_PRIVATE (menuitem);
++ priv = ido_scale_menu_item_get_instance_private (menuitem);
+
+ return priv->scale;
+ }
+@@ -739,7 +747,7 @@ ido_scale_menu_item_get_style (IdoScaleMenuItem *menuitem)
+
+ g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), IDO_SCALE_MENU_ITEM_STYLE_NONE);
+
+- priv = GET_PRIVATE (menuitem);
++ priv = ido_scale_menu_item_get_instance_private (menuitem);
+
+ return priv->style;
+ }
+@@ -760,7 +768,7 @@ ido_scale_menu_item_set_style (IdoScaleMenuItem *menuitem,
+
+ g_return_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem));
+
+- priv = GET_PRIVATE (menuitem);
++ priv = ido_scale_menu_item_get_instance_private (menuitem);
+
+ priv->style = style;
+
+@@ -784,7 +792,7 @@ ido_scale_menu_item_get_primary_image (IdoScaleMenuItem *menuitem)
+
+ g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL);
+
+- priv = GET_PRIVATE (menuitem);
++ priv = ido_scale_menu_item_get_instance_private (menuitem);
+
+ return priv->primary_image;
+ }
+@@ -806,7 +814,7 @@ ido_scale_menu_item_get_secondary_image (IdoScaleMenuItem *menuitem)
+
+ g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL);
+
+- priv = GET_PRIVATE (menuitem);
++ priv = ido_scale_menu_item_get_instance_private (menuitem);
+
+ return priv->secondary_image;
+ }
+@@ -859,7 +867,7 @@ ido_scale_menu_item_get_primary_label (IdoScaleMenuItem *menuitem)
+
+ g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL);
+
+- priv = GET_PRIVATE (menuitem);
++ priv = ido_scale_menu_item_get_instance_private (menuitem);
+
+ return gtk_label_get_text (GTK_LABEL (priv->primary_label));
+ }
+@@ -881,7 +889,7 @@ ido_scale_menu_item_get_secondary_label (IdoScaleMenuItem *menuitem)
+
+ g_return_val_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem), NULL);
+
+- priv = GET_PRIVATE (menuitem);
++ priv = ido_scale_menu_item_get_instance_private (menuitem);
+
+ return gtk_label_get_text (GTK_LABEL (priv->secondary_label));
+ }
+@@ -903,7 +911,7 @@ ido_scale_menu_item_set_primary_label (IdoScaleMenuItem *menuitem,
+
+ g_return_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem));
+
+- priv = GET_PRIVATE (menuitem);
++ priv = ido_scale_menu_item_get_instance_private (menuitem);
+
+ if (priv->primary_label)
+ {
+@@ -928,7 +936,7 @@ ido_scale_menu_item_set_secondary_label (IdoScaleMenuItem *menuitem,
+
+ g_return_if_fail (IDO_IS_SCALE_MENU_ITEM (menuitem));
+
+- priv = GET_PRIVATE (menuitem);
++ priv = ido_scale_menu_item_get_instance_private (menuitem);
+
+ if (priv->secondary_label)
+ {
+@@ -954,7 +962,8 @@ static void
+ default_primary_clicked_handler (IdoScaleMenuItem * item)
+ {
+ g_debug ("%s: setting scale to lower bound", G_STRFUNC);
+- IdoScaleMenuItemPrivate * priv = GET_PRIVATE (item);
++ IdoScaleMenuItemPrivate * priv = ido_scale_menu_item_get_instance_private (item);
++
+ GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale));
+ gtk_adjustment_set_value (adj, gtk_adjustment_get_lower (adj));
+ }
+@@ -977,7 +986,7 @@ static void
+ default_secondary_clicked_handler (IdoScaleMenuItem * item)
+ {
+ g_debug ("%s: setting scale to upper bound", G_STRFUNC);
+- IdoScaleMenuItemPrivate * priv = GET_PRIVATE (item);
++ IdoScaleMenuItemPrivate * priv = ido_scale_menu_item_get_instance_private (item);
+ GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (priv->scale));
+ gtk_adjustment_set_value (adj, gtk_adjustment_get_upper (adj));
+ }
+@@ -991,7 +1000,7 @@ static void
+ ido_scale_menu_item_set_value (IdoScaleMenuItem *item,
+ gdouble value)
+ {
+- IdoScaleMenuItemPrivate *priv = GET_PRIVATE (item);
++ IdoScaleMenuItemPrivate *priv = ido_scale_menu_item_get_instance_private (item);
+
+ /* set ignore_value_changed to signify to the scale menu item that it
+ * should not emit its own value-changed signal, as that should only
+diff --git a/src/idoscalemenuitem.h b/src/idoscalemenuitem.h
+index 2c32a49..de6968e 100644
+--- a/src/idoscalemenuitem.h
++++ b/src/idoscalemenuitem.h
+@@ -47,13 +47,10 @@ typedef enum
+
+ typedef struct _IdoScaleMenuItem IdoScaleMenuItem;
+ typedef struct _IdoScaleMenuItemClass IdoScaleMenuItemClass;
+-typedef struct _IdoScaleMenuItemPrivate IdoScaleMenuItemPrivate;
+
+ struct _IdoScaleMenuItem
+ {
+ GtkMenuItem parent_instance;
+-
+- IdoScaleMenuItemPrivate *priv;
+ };
+
+ struct _IdoScaleMenuItemClass
+diff --git a/src/idoswitchmenuitem.c b/src/idoswitchmenuitem.c
+index d47392f..bd00e1d 100644
+--- a/src/idoswitchmenuitem.c
++++ b/src/idoswitchmenuitem.c
+@@ -23,24 +23,25 @@
+ #include "idoswitchmenuitem.h"
+ #include "idoactionhelper.h"
+
++static void ido_switch_menu_finalize (GObject * item);
+ static gboolean ido_switch_menu_button_release_event (GtkWidget * widget,
+ GdkEventButton * event);
+
+
+-struct _IdoSwitchMenuItemPrivate
++typedef struct
+ {
+ GtkWidget * box;
+ GtkWidget * content_area;
+ GtkWidget * label;
+ GtkWidget * image;
+ GtkWidget * switch_w;
+-};
++} IdoSwitchMenuItemPrivate;
+
+ /***
+ **** Life Cycle
+ ***/
+
+-G_DEFINE_TYPE (IdoSwitchMenuItem, ido_switch_menu_item, GTK_TYPE_CHECK_MENU_ITEM)
++G_DEFINE_TYPE_WITH_PRIVATE (IdoSwitchMenuItem, ido_switch_menu_item, GTK_TYPE_CHECK_MENU_ITEM)
+
+ static void
+ ido_switch_menu_item_class_init (IdoSwitchMenuItemClass *klass)
+@@ -50,7 +51,8 @@ ido_switch_menu_item_class_init (IdoSwitchMenuItemClass *klass)
+ GtkCheckMenuItemClass * check_class;
+
+ gobject_class = G_OBJECT_CLASS (klass);
+- g_type_class_add_private (gobject_class, sizeof (IdoSwitchMenuItemPrivate));
++
++ gobject_class->finalize = ido_switch_menu_finalize;
+
+ widget_class = GTK_WIDGET_CLASS (klass);
+ widget_class->button_release_event = ido_switch_menu_button_release_event;
+@@ -62,9 +64,8 @@ ido_switch_menu_item_class_init (IdoSwitchMenuItemClass *klass)
+ static void
+ ido_switch_menu_item_init (IdoSwitchMenuItem *item)
+ {
+- IdoSwitchMenuItemPrivate *priv;
++ IdoSwitchMenuItemPrivate *priv = ido_switch_menu_item_get_instance_private(item);
+
+- priv = item->priv = G_TYPE_INSTANCE_GET_PRIVATE (item, IDO_TYPE_SWITCH_MENU_ITEM, IdoSwitchMenuItemPrivate);
+ priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ priv->content_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ priv->switch_w = gtk_switch_new ();
+@@ -134,6 +135,8 @@ ido_switch_menu_item_get_content_area (IdoSwitchMenuItem * item)
+
+ g_return_val_if_fail (IDO_IS_SWITCH_MENU_ITEM(item), NULL);
+
++ IdoSwitchMenuItemPrivate *priv = ido_switch_menu_item_get_instance_private(item);
++
+ if (!warned)
+ {
+ g_warning ("%s is deprecated. Please don't use it, especially if you're using"
+@@ -141,7 +144,7 @@ ido_switch_menu_item_get_content_area (IdoSwitchMenuItem * item)
+ warned = TRUE;
+ }
+
+- return GTK_CONTAINER (item->priv->content_area);
++ return GTK_CONTAINER (priv->content_area);
+ }
+
+ /**
+@@ -160,7 +163,7 @@ ido_switch_menu_item_set_label (IdoSwitchMenuItem *item,
+ g_return_if_fail (IDO_IS_SWITCH_MENU_ITEM (item));
+ g_return_if_fail (label != NULL);
+
+- priv = item->priv;
++ priv = ido_switch_menu_item_get_instance_private(item);
+
+ if (priv->label == NULL)
+ {
+@@ -189,7 +192,7 @@ ido_switch_menu_item_set_icon (IdoSwitchMenuItem *item,
+ g_return_if_fail (IDO_IS_SWITCH_MENU_ITEM (item));
+ g_return_if_fail (icon == NULL || G_IS_ICON (icon));
+
+- priv = item->priv;
++ priv = ido_switch_menu_item_get_instance_private(item);
+
+ if (icon)
+ {
+@@ -213,10 +216,11 @@ ido_source_menu_item_state_changed (IdoActionHelper *helper,
+ GVariant *state,
+ gpointer user_data)
+ {
+- IdoSwitchMenuItem *item = user_data;
++ IdoSwitchMenuItem *item = IDO_SWITCH_MENU_ITEM (user_data);
++ IdoSwitchMenuItemPrivate *priv = ido_switch_menu_item_get_instance_private(item);
+
+ if (g_variant_is_of_type (state, G_VARIANT_TYPE_BOOLEAN))
+- gtk_switch_set_active (GTK_SWITCH (item->priv->switch_w),
++ gtk_switch_set_active (GTK_SWITCH (priv->switch_w),
+ g_variant_get_boolean (state));
+ }
+
+@@ -269,3 +273,10 @@ ido_switch_menu_item_new_from_menu_model (GMenuItem *menuitem,
+
+ return item;
+ }
++
++static void
++ido_switch_menu_finalize (GObject * item)
++{
++ /* no-op */
++}
++
+diff --git a/src/idoswitchmenuitem.h b/src/idoswitchmenuitem.h
+index 222b473..de218d1 100644
+--- a/src/idoswitchmenuitem.h
++++ b/src/idoswitchmenuitem.h
+@@ -34,13 +34,10 @@ G_BEGIN_DECLS
+
+ typedef struct _IdoSwitchMenuItem IdoSwitchMenuItem;
+ typedef struct _IdoSwitchMenuItemClass IdoSwitchMenuItemClass;
+-typedef struct _IdoSwitchMenuItemPrivate IdoSwitchMenuItemPrivate;
+
+ struct _IdoSwitchMenuItem
+ {
+ GtkCheckMenuItem parent_instance;
+-
+- IdoSwitchMenuItemPrivate *priv;
+ };
+
+ struct _IdoSwitchMenuItemClass
+diff --git a/src/idotimeline.c b/src/idotimeline.c
+index 8eea4b5..4929ba3 100644
+--- a/src/idotimeline.c
++++ b/src/idotimeline.c
+@@ -25,15 +25,11 @@
+ #include <gtk/gtk.h>
+ #include <math.h>
+
+-#define IDO_TIMELINE_GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), IDO_TYPE_TIMELINE, IdoTimelinePriv))
+ #define MSECS_PER_SEC 1000
+ #define FRAME_INTERVAL(nframes) (MSECS_PER_SEC / nframes)
+ #define DEFAULT_FPS 30
+
+-typedef struct IdoTimelinePriv IdoTimelinePriv;
+-
+-struct IdoTimelinePriv
+-{
++typedef struct {
+ guint duration;
+ guint fps;
+ guint source_id;
+@@ -48,7 +44,7 @@ struct IdoTimelinePriv
+ guint animations_enabled : 1;
+ guint loop : 1;
+ guint direction : 1;
+-};
++} IdoTimelinePrivate;
+
+ enum {
+ PROP_0,
+@@ -81,7 +77,7 @@ static void ido_timeline_get_property (GObject *object,
+ static void ido_timeline_finalize (GObject *object);
+
+
+-G_DEFINE_TYPE (IdoTimeline, ido_timeline, G_TYPE_OBJECT)
++G_DEFINE_TYPE_WITH_PRIVATE (IdoTimeline, ido_timeline, G_TYPE_OBJECT)
+
+
+ static void
+@@ -193,16 +189,12 @@ ido_timeline_class_init (IdoTimelineClass *klass)
+ g_cclosure_marshal_VOID__DOUBLE,
+ G_TYPE_NONE, 1,
+ G_TYPE_DOUBLE);
+-
+- g_type_class_add_private (klass, sizeof (IdoTimelinePriv));
+ }
+
+ static void
+ ido_timeline_init (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
+-
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline);
+
+ priv->fps = DEFAULT_FPS;
+ priv->duration = 0.0;
+@@ -251,11 +243,8 @@ ido_timeline_get_property (GObject *object,
+ GValue *value,
+ GParamSpec *pspec)
+ {
+- IdoTimeline *timeline;
+- IdoTimelinePriv *priv;
+-
+- timeline = IDO_TIMELINE (object);
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ IdoTimeline *timeline = IDO_TIMELINE (object);
++ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline);
+
+ switch (prop_id)
+ {
+@@ -282,9 +271,8 @@ ido_timeline_get_property (GObject *object,
+ static void
+ ido_timeline_finalize (GObject *object)
+ {
+- IdoTimelinePriv *priv;
+-
+- priv = IDO_TIMELINE_GET_PRIV (object);
++ IdoTimeline *timeline = IDO_TIMELINE (object);
++ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline);
+
+ if (priv->source_id)
+ {
+@@ -301,11 +289,10 @@ ido_timeline_finalize (GObject *object)
+ static gboolean
+ ido_timeline_run_frame (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
+ gdouble delta_progress, progress;
+ guint elapsed_time;
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ IdoTimelinePrivate *priv = ido_timeline_get_instance_private (timeline);
+
+ elapsed_time = (guint) (g_timer_elapsed (priv->timer, NULL) * 1000);
+ g_timer_start (priv->timer);
+@@ -395,12 +382,12 @@ ido_timeline_new_for_screen (guint duration,
+ void
+ ido_timeline_start (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+ gboolean enable_animations = FALSE;
+
+ g_return_if_fail (IDO_IS_TIMELINE (timeline));
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ if (!priv->source_id)
+ {
+@@ -446,11 +433,11 @@ ido_timeline_start (IdoTimeline *timeline)
+ void
+ ido_timeline_pause (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_if_fail (IDO_IS_TIMELINE (timeline));
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ if (priv->source_id)
+ {
+@@ -470,11 +457,11 @@ ido_timeline_pause (IdoTimeline *timeline)
+ void
+ ido_timeline_rewind (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_if_fail (IDO_IS_TIMELINE (timeline));
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ if (ido_timeline_get_direction(timeline) != IDO_TIMELINE_DIRECTION_FORWARD)
+ priv->progress = priv->last_progress = 1.;
+@@ -502,11 +489,11 @@ ido_timeline_rewind (IdoTimeline *timeline)
+ gboolean
+ ido_timeline_is_running (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_val_if_fail (IDO_IS_TIMELINE (timeline), FALSE);
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ return (priv->source_id != 0);
+ }
+@@ -522,11 +509,12 @@ ido_timeline_is_running (IdoTimeline *timeline)
+ guint
+ ido_timeline_get_fps (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_val_if_fail (IDO_IS_TIMELINE (timeline), 1);
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
++
+ return priv->fps;
+ }
+
+@@ -542,12 +530,12 @@ void
+ ido_timeline_set_fps (IdoTimeline *timeline,
+ guint fps)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_if_fail (IDO_IS_TIMELINE (timeline));
+ g_return_if_fail (fps > 0);
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ /* Coverity CID: 12650/12651: guard against division by 0. */
+ priv->fps = fps > 0 ? fps : priv->fps;
+@@ -575,11 +563,12 @@ ido_timeline_set_fps (IdoTimeline *timeline,
+ gboolean
+ ido_timeline_get_loop (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_val_if_fail (IDO_IS_TIMELINE (timeline), FALSE);
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
++
+ return priv->loop;
+ }
+
+@@ -595,11 +584,11 @@ void
+ ido_timeline_set_loop (IdoTimeline *timeline,
+ gboolean loop)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_if_fail (IDO_IS_TIMELINE (timeline));
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ if (loop != priv->loop)
+ {
+@@ -619,11 +608,11 @@ void
+ ido_timeline_set_duration (IdoTimeline *timeline,
+ guint duration)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_if_fail (IDO_IS_TIMELINE (timeline));
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ if (duration != priv->duration)
+ {
+@@ -643,11 +632,11 @@ ido_timeline_set_duration (IdoTimeline *timeline,
+ guint
+ ido_timeline_get_duration (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_val_if_fail (IDO_IS_TIMELINE (timeline), 0);
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ return priv->duration;
+ }
+@@ -663,11 +652,11 @@ void
+ ido_timeline_set_direction (IdoTimeline *timeline,
+ IdoTimelineDirection direction)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_if_fail (IDO_IS_TIMELINE (timeline));
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ if (direction != priv->direction)
+ {
+@@ -687,11 +676,12 @@ ido_timeline_set_direction (IdoTimeline *timeline,
+ IdoTimelineDirection
+ ido_timeline_get_direction (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_val_if_fail (IDO_IS_TIMELINE (timeline), IDO_TIMELINE_DIRECTION_FORWARD);
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
++
+ return priv->direction;
+ }
+
+@@ -706,12 +696,12 @@ void
+ ido_timeline_set_screen (IdoTimeline *timeline,
+ GdkScreen *screen)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_if_fail (IDO_IS_TIMELINE (timeline));
+ g_return_if_fail (GDK_IS_SCREEN (screen));
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ if (priv->screen)
+ g_object_unref (priv->screen);
+@@ -732,11 +722,12 @@ ido_timeline_set_screen (IdoTimeline *timeline,
+ GdkScreen *
+ ido_timeline_get_screen (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_val_if_fail (IDO_IS_TIMELINE (timeline), NULL);
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
++
+ return priv->screen;
+ }
+
+@@ -751,11 +742,12 @@ ido_timeline_get_screen (IdoTimeline *timeline)
+ gdouble
+ ido_timeline_get_progress (IdoTimeline *timeline)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_val_if_fail (IDO_IS_TIMELINE (timeline), 0.);
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
++
+ return priv->progress;
+ }
+
+@@ -769,11 +761,11 @@ ido_timeline_get_progress (IdoTimeline *timeline)
+ void
+ ido_timeline_set_progress (IdoTimeline *timeline, gdouble progress)
+ {
+- IdoTimelinePriv *priv;
++ IdoTimelinePrivate *priv;
+
+ g_return_if_fail (IDO_IS_TIMELINE (timeline));
+
+- priv = IDO_TIMELINE_GET_PRIV (timeline);
++ priv = ido_timeline_get_instance_private (timeline);
+
+ if (priv->source_id)
+ {
+diff --git a/src/idotimestampmenuitem.c b/src/idotimestampmenuitem.c
+index 0d33deb..0c9c086 100644
+--- a/src/idotimestampmenuitem.c
++++ b/src/idotimestampmenuitem.c
+@@ -39,17 +39,14 @@ enum
+
+ static GParamSpec *properties[PROP_LAST];
+
+-struct _IdoTimeStampMenuItemPrivate
+-{
++typedef struct {
+ char * format;
+ GDateTime * date_time;
+-};
+-
+-typedef IdoTimeStampMenuItemPrivate priv_t;
++} IdoTimeStampMenuItemPrivate;
+
+-G_DEFINE_TYPE (IdoTimeStampMenuItem,
+- ido_time_stamp_menu_item,
+- IDO_TYPE_BASIC_MENU_ITEM);
++G_DEFINE_TYPE_WITH_PRIVATE (IdoTimeStampMenuItem,
++ ido_time_stamp_menu_item,
++ IDO_TYPE_BASIC_MENU_ITEM);
+
+ /***
+ **** GObject Virtual Functions
+@@ -62,16 +59,16 @@ my_get_property (GObject * o,
+ GParamSpec * pspec)
+ {
+ IdoTimeStampMenuItem * self = IDO_TIME_STAMP_MENU_ITEM (o);
+- priv_t * p = self->priv;
++ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self);
+
+ switch (property_id)
+ {
+ case PROP_FORMAT:
+- g_value_set_string (v, p->format);
++ g_value_set_string (v, priv->format);
+ break;
+
+ case PROP_DATE_TIME:
+- g_value_set_boxed (v, p->date_time);
++ g_value_set_boxed (v, priv->date_time);
+ break;
+
+ default:
+@@ -108,9 +105,9 @@ static void
+ my_dispose (GObject * object)
+ {
+ IdoTimeStampMenuItem * self = IDO_TIME_STAMP_MENU_ITEM (object);
+- priv_t * p = self->priv;
++ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self);
+
+- g_clear_pointer (&p->date_time, g_date_time_unref);
++ g_clear_pointer (&priv->date_time, g_date_time_unref);
+
+ G_OBJECT_CLASS (ido_time_stamp_menu_item_parent_class)->dispose (object);
+ }
+@@ -119,9 +116,9 @@ static void
+ my_finalize (GObject * object)
+ {
+ IdoTimeStampMenuItem * self = IDO_TIME_STAMP_MENU_ITEM (object);
+- priv_t * p = self->priv;
++ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self);
+
+- g_free (p->format);
++ g_free (priv->format);
+
+ G_OBJECT_CLASS (ido_time_stamp_menu_item_parent_class)->finalize (object);
+ }
+@@ -136,8 +133,6 @@ ido_time_stamp_menu_item_class_init (IdoTimeStampMenuItemClass *klass)
+ GParamFlags prop_flags;
+ GObjectClass * gobject_class = G_OBJECT_CLASS (klass);
+
+- g_type_class_add_private (klass, sizeof (IdoTimeStampMenuItemPrivate));
+-
+ gobject_class->get_property = my_get_property;
+ gobject_class->set_property = my_set_property;
+ gobject_class->dispose = my_dispose;
+@@ -167,20 +162,18 @@ ido_time_stamp_menu_item_class_init (IdoTimeStampMenuItemClass *klass)
+ static void
+ ido_time_stamp_menu_item_init (IdoTimeStampMenuItem *self)
+ {
+- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+- IDO_TYPE_TIME_STAMP_MENU_ITEM,
+- IdoTimeStampMenuItemPrivate);
+-
++ /* no-op */
+ }
+
+ static void
+ update_timestamp_label (IdoTimeStampMenuItem * self)
+ {
+ char * str;
+- priv_t * p = self->priv;
+
+- if (p->date_time && p->format)
+- str = g_date_time_format (p->date_time, p->format);
++ IdoTimeStampMenuItemPrivate * priv = ido_time_stamp_menu_item_get_instance_private(self);
++
++ if (priv->date_time && priv->format)
++ str = g_date_time_format (priv->date_time, priv->format);
+ else
+ str = NULL;
+
+@@ -210,14 +203,15 @@ void
+ ido_time_stamp_menu_item_set_date_time (IdoTimeStampMenuItem * self,
+ GDateTime * date_time)
+ {
+- priv_t * p;
++ IdoTimeStampMenuItemPrivate * priv;
+
+ g_return_if_fail (IDO_IS_TIME_STAMP_MENU_ITEM (self));
+- p = self->priv;
+
+- g_clear_pointer (&p->date_time, g_date_time_unref);
++ priv = ido_time_stamp_menu_item_get_instance_private(self);
++
++ g_clear_pointer (&priv->date_time, g_date_time_unref);
+ if (date_time != NULL)
+- p->date_time = g_date_time_ref (date_time);
++ priv->date_time = g_date_time_ref (date_time);
+ update_timestamp_label (self);
+ }
+
+@@ -234,20 +228,25 @@ void
+ ido_time_stamp_menu_item_set_format (IdoTimeStampMenuItem * self,
+ const char * strftime_fmt)
+ {
+- priv_t * p;
++ IdoTimeStampMenuItemPrivate * priv;
+
+ g_return_if_fail (IDO_IS_TIME_STAMP_MENU_ITEM (self));
+- p = self->priv;
+
+- g_free (p->format);
+- p->format = g_strdup (strftime_fmt);
++ priv = ido_time_stamp_menu_item_get_instance_private(self);
++
++ g_free (priv->format);
++ priv->format = g_strdup (strftime_fmt);
+ update_timestamp_label (self);
+ }
+
+ const gchar *
+ ido_time_stamp_menu_item_get_format (IdoTimeStampMenuItem * self)
+ {
++ IdoTimeStampMenuItemPrivate * priv;
++
+ g_return_val_if_fail (IDO_IS_TIME_STAMP_MENU_ITEM (self), NULL);
+
+- return self->priv->format;
++ priv = ido_time_stamp_menu_item_get_instance_private(self);
++
++ return priv->format;
+ }
+diff --git a/src/idotimestampmenuitem.h b/src/idotimestampmenuitem.h
+index 5847ba8..b596fad 100644
+--- a/src/idotimestampmenuitem.h
++++ b/src/idotimestampmenuitem.h
+@@ -31,7 +31,6 @@ G_BEGIN_DECLS
+
+ typedef struct _IdoTimeStampMenuItem IdoTimeStampMenuItem;
+ typedef struct _IdoTimeStampMenuItemClass IdoTimeStampMenuItemClass;
+-typedef struct _IdoTimeStampMenuItemPrivate IdoTimeStampMenuItemPrivate;
+
+ struct _IdoTimeStampMenuItemClass
+ {
+@@ -49,7 +48,6 @@ struct _IdoTimeStampMenuItem
+ {
+ /*< private >*/
+ IdoBasicMenuItem parent;
+- IdoTimeStampMenuItemPrivate * priv;
+ };
+
+
+diff --git a/src/idousermenuitem.c b/src/idousermenuitem.c
+index 8d8673e..bbb7916 100644
+--- a/src/idousermenuitem.c
++++ b/src/idousermenuitem.c
+@@ -42,8 +42,7 @@ enum
+
+ static GParamSpec *properties[PROP_LAST];
+
+-struct _IdoUserMenuItemPrivate
+-{
++typedef struct {
+ GtkWidget* user_image;
+ GtkWidget* user_name;
+ GtkWidget* container;
+@@ -52,9 +51,9 @@ struct _IdoUserMenuItemPrivate
+ gboolean is_current_user;
+ gchar * label;
+ GIcon * icon;
+-};
++} IdoUserMenuItemPrivate;
+
+-G_DEFINE_TYPE (IdoUserMenuItem, ido_user_menu_item, GTK_TYPE_MENU_ITEM);
++G_DEFINE_TYPE_WITH_PRIVATE (IdoUserMenuItem, ido_user_menu_item, GTK_TYPE_MENU_ITEM);
+
+ /* Prototypes */
+ static gboolean ido_user_menu_item_primitive_draw_cb_gtk_3 (GtkWidget * image,
+@@ -72,23 +71,24 @@ my_get_property (GObject * o,
+ GParamSpec * pspec)
+ {
+ IdoUserMenuItem * self = IDO_USER_MENU_ITEM (o);
++ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self);
+
+ switch (property_id)
+ {
+ case PROP_LABEL:
+- g_value_set_string (value, self->priv->label);
++ g_value_set_string (value, priv->label);
+ break;
+
+ case PROP_ICON:
+- g_value_set_object (value, self->priv->icon);
++ g_value_set_object (value, priv->icon);
+ break;
+
+ case PROP_IS_LOGGED_IN:
+- g_value_set_boolean (value, self->priv->is_logged_in);
++ g_value_set_boolean (value, priv->is_logged_in);
+ break;
+
+ case PROP_IS_CURRENT_USER:
+- g_value_set_boolean (value, self->priv->is_current_user);
++ g_value_set_boolean (value, priv->is_current_user);
+ break;
+
+ default:
+@@ -104,6 +104,7 @@ my_set_property (GObject * o,
+ GParamSpec * pspec)
+ {
+ IdoUserMenuItem * self = IDO_USER_MENU_ITEM (o);
++ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self);
+
+ switch (property_id)
+ {
+@@ -120,7 +121,7 @@ my_set_property (GObject * o,
+ break;
+
+ case PROP_IS_CURRENT_USER:
+- self->priv->is_current_user = g_value_get_boolean (value);
++ priv->is_current_user = g_value_get_boolean (value);
+ gtk_widget_queue_draw (GTK_WIDGET(self));
+ break;
+
+@@ -134,8 +135,9 @@ static void
+ my_dispose (GObject *object)
+ {
+ IdoUserMenuItem * self = IDO_USER_MENU_ITEM (object);
++ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self);
+
+- g_clear_object (&self->priv->icon);
++ g_clear_object (&priv->icon);
+
+ G_OBJECT_CLASS (ido_user_menu_item_parent_class)->dispose (object);
+ }
+@@ -144,8 +146,9 @@ static void
+ my_finalize (GObject *object)
+ {
+ IdoUserMenuItem * self = IDO_USER_MENU_ITEM (object);
++ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self);
+
+- g_free (self->priv->label);
++ g_free (priv->label);
+
+ G_OBJECT_CLASS (ido_user_menu_item_parent_class)->finalize (object);
+ }
+@@ -156,8 +159,6 @@ ido_user_menu_item_class_init (IdoUserMenuItemClass *klass)
+ GParamFlags prop_flags;
+ GObjectClass * gobject_class = G_OBJECT_CLASS (klass);
+
+- g_type_class_add_private (klass, sizeof (IdoUserMenuItemPrivate));
+-
+ gobject_class->get_property = my_get_property;
+ gobject_class->set_property = my_set_property;
+ gobject_class->dispose = my_dispose;
+@@ -197,13 +198,7 @@ ido_user_menu_item_class_init (IdoUserMenuItemClass *klass)
+ static void
+ ido_user_menu_item_init (IdoUserMenuItem *self)
+ {
+- IdoUserMenuItemPrivate * priv;
+-
+- self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
+- IDO_USER_MENU_ITEM_TYPE,
+- IdoUserMenuItemPrivate);
+-
+- priv = self->priv;
++ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self);
+
+ // Create the UI elements.
+ priv->user_image = gtk_image_new ();
+@@ -260,7 +255,7 @@ ido_user_menu_item_primitive_draw_cb_gtk_3 (GtkWidget * widget,
+
+ g_return_val_if_fail(IS_IDO_USER_MENU_ITEM(user_data), FALSE);
+
+- priv = IDO_USER_MENU_ITEM(user_data)->priv;
++ priv = ido_user_menu_item_get_instance_private(IDO_USER_MENU_ITEM(user_data));
+
+ /* Draw dot only when user is the current user. */
+ if (priv->is_current_user)
+@@ -303,6 +298,8 @@ ido_user_menu_item_set_icon_from_file_icon (IdoUserMenuItem *self,
+ gint height;
+ GdkPixbuf *pixbuf;
+
++ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self);
++
+ file = g_file_icon_get_file (G_FILE_ICON (icon));
+ path = g_file_get_path (file);
+
+@@ -316,7 +313,7 @@ ido_user_menu_item_set_icon_from_file_icon (IdoUserMenuItem *self,
+
+ if (pixbuf)
+ {
+- gtk_image_set_from_pixbuf (GTK_IMAGE (self->priv->user_image), pixbuf);
++ gtk_image_set_from_pixbuf (GTK_IMAGE (priv->user_image), pixbuf);
+ g_object_unref (pixbuf);
+ return TRUE;
+ }
+@@ -331,15 +328,15 @@ ido_user_menu_item_set_icon_from_file_icon (IdoUserMenuItem *self,
+ void
+ ido_user_menu_item_set_icon (IdoUserMenuItem * self, GIcon * icon)
+ {
+- IdoUserMenuItemPrivate * p = self->priv;
++ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self);
+
+- if (p->icon == icon)
++ if (priv->icon == icon)
+ return;
+
+- g_clear_object (&p->icon);
++ g_clear_object (&priv->icon);
+
+ if (icon)
+- p->icon = g_object_ref (icon);
++ priv->icon = g_object_ref (icon);
+
+ /* Avatars are always loaded from disk. Show the fallback when no icon
+ * is set, the icon is not a file icon, or the file could not be
+@@ -349,7 +346,7 @@ ido_user_menu_item_set_icon (IdoUserMenuItem * self, GIcon * icon)
+ !G_IS_FILE_ICON (icon) ||
+ !ido_user_menu_item_set_icon_from_file_icon (self, G_FILE_ICON (icon)))
+ {
+- gtk_image_set_from_icon_name (GTK_IMAGE (p->user_image),
++ gtk_image_set_from_icon_name (GTK_IMAGE (priv->user_image),
+ FALLBACK_ICON_NAME,
+ GTK_ICON_SIZE_MENU);
+ }
+@@ -370,20 +367,26 @@ ido_user_menu_item_set_icon_from_file (IdoUserMenuItem * self, const char * file
+ void
+ ido_user_menu_item_set_logged_in (IdoUserMenuItem * self, gboolean is_logged_in)
+ {
+- gtk_widget_set_visible (self->priv->tick_icon, is_logged_in);
++ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self);
++
++ gtk_widget_set_visible (priv->tick_icon, is_logged_in);
+ }
+
+ void
+ ido_user_menu_item_set_current_user (IdoUserMenuItem * self, gboolean is_current_user)
+ {
+- self->priv->is_current_user = is_current_user;
++ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self);
++
++ priv->is_current_user = is_current_user;
+ gtk_widget_queue_draw (GTK_WIDGET (self));
+ }
+
+ void
+ ido_user_menu_item_set_label (IdoUserMenuItem * self, const char * label)
+ {
+- gtk_label_set_label (GTK_LABEL(self->priv->user_name), label);
++ IdoUserMenuItemPrivate * priv = ido_user_menu_item_get_instance_private(self);
++
++ gtk_label_set_label (GTK_LABEL(priv->user_name), label);
+ }
+
+ GtkWidget*
+diff --git a/src/idousermenuitem.h b/src/idousermenuitem.h
+index d1d5729..093078d 100644
+--- a/src/idousermenuitem.h
++++ b/src/idousermenuitem.h
+@@ -32,7 +32,6 @@ G_BEGIN_DECLS
+
+ typedef struct _IdoUserMenuItem IdoUserMenuItem;
+ typedef struct _IdoUserMenuItemClass IdoUserMenuItemClass;
+-typedef struct _IdoUserMenuItemPrivate IdoUserMenuItemPrivate;
+
+ /* property keys */
+ #define IDO_USER_MENU_ITEM_PROP_LABEL "label"
+@@ -49,7 +48,6 @@ struct _IdoUserMenuItem
+ {
+ /*< private >*/
+ GtkMenuItem parent;
+- IdoUserMenuItemPrivate * priv;
+ };
+
+ GType ido_user_menu_item_get_type (void) G_GNUC_CONST;
diff --git a/user/baekmuk-ttf/APKBUILD b/user/baekmuk-ttf/APKBUILD
index 28b840f6b..2f885f9eb 100644
--- a/user/baekmuk-ttf/APKBUILD
+++ b/user/baekmuk-ttf/APKBUILD
@@ -14,8 +14,7 @@ subpackages=""
source="http://kldp.net/baekmuk/release/865-baekmuk-ttf-$pkgver.tar.gz"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ ttf/*.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/ttf/*.ttf
}
sha512sums="779e0bef5fe17e08e0e08ccdad9ad0e91123a5d5cbcb3d66256d517a0903c5fd91c4a8c75eb42f82fcb0d82e26455cf13aeec5ba3a04002133dbbaf1357ec14b 865-baekmuk-ttf-2.2.tar.gz"
diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD
index e3004a553..83edfc57f 100644
--- a/user/baloo-widgets/APKBUILD
+++ b/user/baloo-widgets/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=baloo-widgets
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Widgets that utilise the Baloo desktop indexing engine"
url="https://www.KDE.org/"
@@ -13,10 +13,7 @@ depends_dev="qt5-qtbase-dev baloo-dev kio-dev"
makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev
kfilemetadata-dev ki18n-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/baloo-widgets-$pkgver.tar.xz
- frameworks.patch
- revert.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/baloo-widgets-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -29,7 +26,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -41,6 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="08cd7e6ed8655fed179d6ff0f7b9981c386baa914e9b5d0f48ced74eee95fd41cc7b339e831310eba0bb563bed636b0869f4f121a5f413f1d525f2f05aa8f513 baloo-widgets-19.08.2.tar.xz
-4a89ef01e6b8cbea694745e99b53c9d85a0d4da05e33dd77603312df36e6ee058a9d551e99de831a7e3099699b376cf2caccffd3339a21acc6a8b8170aaaeb05 frameworks.patch
-291f7f99ad6b9d98dafe5e35c9e18ef46d45d5e3b5a5e9aaefa96983519db7306c73815e1ef80b51f69f56802b6fac39532718eb2867a3faee7f1bdfa2c7f64f revert.patch"
+sha512sums="8a59cfa97c7770341efd1b49f784f3f621b9b5ef6f5c3e51fcae62c24f56c805c1bfaaab4537e868613caaf9ab5bd0bdc304e30ab4f540fdf82de07c3f9427c5 baloo-widgets-19.12.1.tar.xz"
diff --git a/user/baloo-widgets/frameworks.patch b/user/baloo-widgets/frameworks.patch
deleted file mode 100644
index f0f993bb5..000000000
--- a/user/baloo-widgets/frameworks.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- baloo-widgets-19.04.0/CMakeLists.txt.old 2019-04-12 00:13:39.000000000 +0000
-+++ baloo-widgets-19.04.0/CMakeLists.txt 2019-04-19 07:30:31.523838076 +0000
-@@ -8,7 +8,7 @@
- project(baloo-widgets VERSION ${KDE_APPLICATIONS_VERSION})
-
- set(QT_MIN_VERSION "5.8.0")
--set(KF5_MIN_VERSION "5.58.0")
-+set(KF5_MIN_VERSION "5.54.0")
-
- find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${ECM_MODULE_PATH})
---- baloo-widgets-19.08.0/CMakeLists.txt.old 2019-08-15 12:25:44.456788542 +0000
-+++ baloo-widgets-19.08.0/CMakeLists.txt 2019-08-15 15:26:31.843791794 +0000
-@@ -28,8 +28,6 @@
- include(ECMAddTests)
- include(CMakePackageConfigHelpers)
-
--add_definitions(-DQT_NO_FOREACH)
--
- ecm_setup_version(PROJECT
- VARIABLE_PREFIX BALOO_WIDGETS
- SOVERSION 5
---- baloo-widgets-19.08.0/autotests/filemetadatadatedisplaytest.cpp.old 2019-08-09 00:09:30.000000000 +0000
-+++ baloo-widgets-19.08.0/autotests/filemetadatadatedisplaytest.cpp 2019-08-15 15:37:50.301115034 +0000
-@@ -53,7 +53,8 @@
- #if QT_VERSION < QT_VERSION_CHECK(5, 10, 0)
- struct stat fileStat;
- struct utimbuf newTimes;
-- const QByteArray file = QFile::encodeName(filePath);
-+ const QByteArray q_file = QFile::encodeName(filePath);
-+ const char *file = q_file.constData();
- stat(file, &fileStat);
-
- newTimes.actime = fileStat.st_atime;
diff --git a/user/baloo-widgets/revert.patch b/user/baloo-widgets/revert.patch
deleted file mode 100644
index cc54adf6f..000000000
--- a/user/baloo-widgets/revert.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- baloo-widgets-19.08.0/src/filemetadatautil.cpp.old 2019-08-09 00:09:30.000000000 +0000
-+++ baloo-widgets-19.08.0/src/filemetadatautil.cpp 2019-08-15 15:31:58.938750148 +0000
-@@ -58,30 +58,10 @@
- QVariantMap toNamedVariantMap(const KFileMetaData::PropertyMap& propMap)
- {
- QVariantMap map;
-- if (propMap.isEmpty()) {
-- return map;
-- }
--
-- using entry = std::pair<const KFileMetaData::Property::Property&, const QVariant&>;
--
-- auto begin = propMap.constKeyValueBegin();
--
-- while (begin != propMap.constKeyValueEnd()) {
-- auto key = (*begin).first;
-- KFileMetaData::PropertyInfo property(key);
-- auto rangeEnd = std::find_if(begin, propMap.constKeyValueEnd(),
-- [key](const entry& e) { return e.first != key; });
--
-- auto distance = std::distance(begin, rangeEnd);
-- if (distance > 1) {
-- QVariantList list;
-- list.reserve(static_cast<int>(distance));
-- std::for_each(begin, rangeEnd, [&list](const entry& s) { list.append(s.second); });
-- map.insert(property.name(), list);
-- } else {
-- map.insert(property.name(), (*begin).second);
-- }
-- begin = rangeEnd;
-+ KFileMetaData::PropertyMap::const_iterator it = propMap.constBegin();
-+ for (; it != propMap.constEnd(); it++) {
-+ KFileMetaData::PropertyInfo pi(it.key());
-+ map.insertMulti(pi.name(), it.value());
- }
-
- return map;
diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD
index b0a147dd0..f8c74db41 100644
--- a/user/baloo/APKBUILD
+++ b/user/baloo/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=baloo
-pkgver=5.54.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Semantic desktop search framework"
url="https://www.kde.org/"
@@ -27,10 +27,10 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz
ki18n-dev kidletime-dev kio-dev lmdb-dev solid-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/frameworks/${pkgver%.*}/baloo-$pkgver.tar.xz
- initialise-variable.patch"
+ initialise-variable.patch
+ "
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -42,19 +42,17 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_QCH:BOOL=ON \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="ec610aa2ab6409cf206623e08eb78d7ccc3b278ca94d6f8ba79d6d705459eb5cb9d74ed9ffc4cc20c337582b12517fb59da1570aa689111c0f105746234333de baloo-5.54.0.tar.xz
-5622f1eb7a692c0ebd5d904b421612292375d3ea3f4ffdc4624fa8e2dc4a5fe56e5636f11a388224642be03c8fc28a678cffb9b167eb3de48ff4ae2979e6435e initialise-variable.patch"
+sha512sums="b402dda13e7b1972e32d673e837280745a57b39cd0bd54efff9ef20252f0114dae86816f7cb81c1e62bd5b324c9b539543e235cc8ef59080fd67d79cd024981a baloo-5.66.0.tar.xz
+a65c36808c56dff4bc3bb91e791fcc9cba3cdaca686a214adf51e4d87d86ef7ee07d9dd8e0634dfc53a732b77668c6942322c993be5054bc4fc51e7bd69908ac initialise-variable.patch"
diff --git a/user/baloo/initialise-variable.patch b/user/baloo/initialise-variable.patch
index 836e26ff0..c50c110b1 100644
--- a/user/baloo/initialise-variable.patch
+++ b/user/baloo/initialise-variable.patch
@@ -1,6 +1,6 @@
--- baloo-5.38.0/src/engine/postingdb.cpp.old 2017-09-03 02:58:12.000000000 -0500
+++ baloo-5.38.0/src/engine/postingdb.cpp 2017-10-04 21:44:30.019139903 -0500
-@@ -274,7 +274,7 @@
+@@ -278,7 +278,7 @@
mdb_cursor_open(m_txn, m_dbi, &cursor);
MDB_val key = {0, nullptr};
diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD
index 535db976b..44df1d5b1 100644
--- a/user/bash-completion/APKBUILD
+++ b/user/bash-completion/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Contributor: zlg <zlg+adelie@zlg.space>
# Maintainer:
pkgname=bash-completion
@@ -10,8 +10,8 @@ url="https://github.com/scop/bash-completion"
arch="noarch"
license="GPL-2.0+"
depends="bash"
-makedepends=""
checkdepends="py3-pexpect py3-pytest"
+makedepends=""
subpackages="$pkgname-doc"
source="https://github.com/scop/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz
fix-tests.patch
diff --git a/user/bearssl/APKBUILD b/user/bearssl/APKBUILD
index ad6e8b20a..868c043af 100644
--- a/user/bearssl/APKBUILD
+++ b/user/bearssl/APKBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
+# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=bearssl
pkgver=0.6
pkgrel=1
@@ -7,18 +7,25 @@ pkgdesc="The BearSSL implementation of the SSL/TLS protocol"
url="https://bearssl.org/"
arch="all"
license="MIT"
-builddir="$srcdir/$pkgname-$pkgver"
+depends=""
+makedepends=""
subpackages="$pkgname-dev"
-source="https://bearssl.org/$pkgname-$pkgver.tar.gz bearssl-brssl-dynamic.patch"
+source="https://bearssl.org/$pkgname-$pkgver.tar.gz
+ bearssl-brssl-dynamic.patch
+ "
build() {
- cd "$builddir"
make \
- CC=gcc \
- LD=gcc \
- LDDLL=gcc \
- LDDLLFLAGS="-shared -Wl,-soname,libbearssl.so.${pkgver%%.*}" \
- D=".so.$pkgver"
+ CC=gcc \
+ LD=gcc \
+ LDDLL=gcc \
+ LDDLLFLAGS="-shared -Wl,-soname,libbearssl.so.${pkgver%%.*}" \
+ D=".so.$pkgver"
+}
+
+check() {
+ build/testx509
+ build/testcrypto all
}
package() {
@@ -31,10 +38,5 @@ package() {
ln -sf "libbearssl.so.${pkgver%%.*}" "$pkgdir/lib/libbearssl.so"
}
-check() {
- cd "$builddir/build"
- ./testx509 && ./testcrypto all
-}
-
sha512sums="f9ed25683cfc6c4abe7f1203a2b82ed101ee4c9e0f9ab60755b6a09c8d1e8e4f64d413624e7bb9c4b0033f909a2e4568a1d916cc6ce4736222900691e1f8359a bearssl-0.6.tar.gz
f5fe047862eb355a662ccb1b95c2ca4a870ac0f8d3f4cada5396d2f6a6635647db53fbeb038f9a7651b84d6cda32b6415ce0f69a8da92636d3b3b76578114d5c bearssl-brssl-dynamic.patch"
diff --git a/user/beforelight/APKBUILD b/user/beforelight/APKBUILD
index 88fef1821..4cb502c9d 100644
--- a/user/beforelight/APKBUILD
+++ b/user/beforelight/APKBUILD
@@ -13,14 +13,12 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/beforelight-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
chmod a+w config.sub
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/bengali-fonts/APKBUILD b/user/bengali-fonts/APKBUILD
index 974e0971a..1a2b7590a 100644
--- a/user/bengali-fonts/APKBUILD
+++ b/user/bengali-fonts/APKBUILD
@@ -19,14 +19,12 @@ source="https://savannah.nongnu.org/download/freebangfont/Akaash-0.8.5.tar.gz
builddir="$srcdir"
prepare() {
- cd "$builddir"
default_prepare
# don't capitalise extension
mv Ani/mitra.TTF Ani/mitra.ttf
}
package() {
- cd "$builddir"
install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF \
$(find . -name *.ttf)
}
diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD
index 4945c0222..9eef3c5b6 100644
--- a/user/bind/APKBUILD
+++ b/user/bind/APKBUILD
@@ -4,7 +4,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=bind
-pkgver=9.14.7
+pkgver=9.14.9
_p=${pkgver#*_p}
_ver=${pkgver%_p*}
_major=${pkgver%%.*}
@@ -24,9 +24,10 @@ options="!check"
license="ISC AND Apache-2.0 AND OpenSSL AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause"
pkgusers="named"
pkggroups="named"
+depends=""
makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev py3-ply"
-install="$pkgname.pre-install"
subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc $pkgname-tools"
+install="$pkgname.pre-install"
source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz
bind.so_bsdcompat.patch
named.initd
@@ -150,7 +151,7 @@ tools() {
done
}
-sha512sums="e1837ebfbbc60487f5f0e67fb9e935588fd6e5ffe55cdc9dc77e3ce63cd6fc4f076f4eb282cc4f51701ddda3e51e8f15255db5a3841f9fe92a4fb4207d806740 bind-9.14.7.tar.gz
+sha512sums="aa6b1273f06fc16c842b7012a4d09cb65325a44ee88fea8bea8264ffa907ef4a6f8d5e09384599b2d6f5cea66c0dc220765c245814f54b2f09a5b6e65f97964b bind-9.14.9.tar.gz
7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6 bind.so_bsdcompat.patch
196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015 named.initd
127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf named.confd
diff --git a/user/bitlbee/APKBUILD b/user/bitlbee/APKBUILD
index c61c98095..fbe734b75 100644
--- a/user/bitlbee/APKBUILD
+++ b/user/bitlbee/APKBUILD
@@ -1,20 +1,21 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=bitlbee
pkgver=3.5.1
pkgrel=0
pkgdesc="IRC gateway server to IM services"
url="https://www.bitlbee.org"
arch="all"
+options="!check" # Tests are not compatible with new check.
license="GPL-2.0+ AND LGPL-2.1-only AND BSD-2-Clause AND GPL-2.0-only AND ISC"
depends=""
-makedepends="glib-dev gnutls-dev libgcrypt-dev linux-pam-dev python3"
checkdepends="check-dev"
+makedepends="glib-dev gnutls-dev libgcrypt-dev linux-pam-dev python3"
subpackages="$pkgname-dev $pkgname-doc"
source="http://get.bitlbee.org/src/bitlbee-$pkgver.tar.gz"
build() {
- ./configure \
+ PYTHON=python3 ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD
index 11c679c00..ef63ece1b 100644
--- a/user/blinken/APKBUILD
+++ b/user/blinken/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=blinken
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Memory enhancement game"
url="https://www.kde.org/applications/education/blinken/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev ki18n-dev
kxmlgui-dev kguiaddons-dev kdoctools-dev kdbusaddons-dev kcrash-dev
phonon-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/blinken-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/blinken-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="5a78e8677aa0f2796b6177e60b387bdb0af580f4a1231f89c90c8e58b224c7d7162c6f2d0830005fb6059cdb2a5463cb51a8c7162e1bb54c2d52dcd81e22850a blinken-19.08.2.tar.xz"
+sha512sums="e38444715b47fffa3e2c59832c1de72e45664bb3c585a6fb751154865a567717ee3c0954a90cd3ace807d7903c79d3af94422ece58b3c411c9707da470b158ff blinken-19.12.1.tar.xz"
diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD
index a2f0760c8..89065fee8 100644
--- a/user/bomber/APKBUILD
+++ b/user/bomber/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=bomber
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Arcade bombing game"
url="https://www.kde.org/applications/games/bomber/"
@@ -12,9 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev
kcoreaddons-dev kdbusaddons-dev kdoctools-dev ki18n-dev kxmlgui-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/bomber-$pkgver.tar.xz
- ridiculous-qt.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/bomber-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -27,7 +25,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -39,5 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="242b4f7485f023bbb73dbfcd1077393d623f584f7c0d33af77f55fda36d59fbed3f74f9ef5c7883a7c86fb409f65794742dd002200f9a7ddbf2400595b5037c5 bomber-19.08.2.tar.xz
-160ae239dae8ad3504b622660bb92a3b08dd1abf37161ce2d1c23ada5558f763a64a8fd9cbc25fd4a8946e274bde97df91fcb39742ba9a551ea397e1f81c51d4 ridiculous-qt.patch"
+sha512sums="1b7a42430768fb697ce98ce9f58fc348d8bdb9a9156960987f4b054e3be3cb9b892f9201f9278a772908e28cffd2e91e9442ca9a4ac92748dd3f4946beb3e170 bomber-19.12.1.tar.xz"
diff --git a/user/bomber/ridiculous-qt.patch b/user/bomber/ridiculous-qt.patch
deleted file mode 100644
index bad38045a..000000000
--- a/user/bomber/ridiculous-qt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bomber-19.08.0/CMakeLists.txt.old 2019-08-09 00:27:09.000000000 +0000
-+++ bomber-19.08.0/CMakeLists.txt 2019-08-15 13:01:55.633395788 +0000
-@@ -7,7 +7,7 @@
- cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
- project(bomber VERSION ${KDE_APPLICATIONS_VERSION})
-
--set (QT_MIN_VERSION "5.10.0")
-+set (QT_MIN_VERSION "5.9.7")
- set (KF5_MIN_VERSION "5.46.0")
-
- find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG)
diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD
index 90019442b..121b1e928 100644
--- a/user/bovo/APKBUILD
+++ b/user/bovo/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=bovo
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Gomoku or Connect Five game"
url="https://www.kde.org/applications/games/bovo/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kcrash-dev
kcoreaddons-dev kdbusaddons-dev kdoctools-dev kxmlgui-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/bovo-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/bovo-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="c6072b2a86135bb6eac6e654e3af82cf783a602bb9b9e45ac8aea9de6479e5ba0958ecff42172ab9c356f5d7ea8a7b4805e3a11094b3cafb887d947347216529 bovo-19.08.2.tar.xz"
+sha512sums="5d4f6dcd9ff1d43ba06f968a153113a8094669711ed82e4a17e9b216704e6288f51c53d2d388eb56bf87f4a832133efd2abf35ae78ca8b22bb17ba6d05b8c335 bovo-19.12.1.tar.xz"
diff --git a/user/breeze-gtk/APKBUILD b/user/breeze-gtk/APKBUILD
index 431553cb6..3d04239ce 100644
--- a/user/breeze-gtk/APKBUILD
+++ b/user/breeze-gtk/APKBUILD
@@ -1,17 +1,17 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=breeze-gtk
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="GTK+ style that matches KDE Breeze"
url="https://www.kde.org/"
arch="all"
license="LGPL-2.1-only"
-depends="gtk+2.0"
-makedepends="cmake extra-cmake-modules qt5-qtbase-dev"
+depends="breeze gtk+2.0"
+makedepends="breeze-dev cmake extra-cmake-modules py3-pycairo qt5-qtbase-dev sassc"
# XXX should be installed if breeze and gtk+3.0 are installed, as well
install_if="breeze~$pkgver gtk+2.0"
-source="https://download.kde.org/stable/plasma/$pkgver/breeze-gtk-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/breeze-gtk-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -24,7 +24,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7c9602161cf77e263a84e7fd5f5780a8bc84b4b747356eace7c05768c9cb6a7a39691ba800db654ea1a058209906b1ed762f211a063f8d05596d32fd1dbc867f breeze-gtk-5.12.8.tar.xz"
+sha512sums="1b7326a2ad7789b3afd5a5dbe80dbcd65ba871b2b691f617c26c569d0f623de8d4094acda011144d3a733b2b32e5b16a1dd3272a455f7a31f66d981a583dccc8 breeze-gtk-5.17.90.tar.xz"
diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD
index 3a51cbf03..5e18edbc7 100644
--- a/user/breeze-icons/APKBUILD
+++ b/user/breeze-icons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=breeze-icons
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Modern, coherent icon set for desktops"
url="https://www.kde.org/"
@@ -43,4 +43,4 @@ dark() {
mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/
}
-sha512sums="1eef8f0dc4176275eb877f213178b40b2575e2474fb70b41f5ba2168be3ec7a860d0a6f32e62947838387c3c74dfd8671b2b6242d9c8a1e6d23d0f246d649aaf breeze-icons-5.65.0.tar.xz"
+sha512sums="3113dafe338b18a234b8b520d768b8d3e9d5773757f19abe2edda03353e44803cbaff54a67176dcf4b69658d7741dddd6300e3c660980b6d0b52725d862d725f breeze-icons-5.66.0.tar.xz"
diff --git a/user/breeze/APKBUILD b/user/breeze/APKBUILD
index e040ec01e..88819fbc7 100644
--- a/user/breeze/APKBUILD
+++ b/user/breeze/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=breeze
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Default KDE Plasma 5 style"
url="https://www.kde.org/"
@@ -13,7 +13,7 @@ makedepends="$depends_dev cmake extra-cmake-modules python3 kcmutils-dev
kconfigwidgets-dev kcoreaddons-dev kdecoration-dev kguiaddons-dev
ki18n-dev kpackage-dev frameworkintegration-dev kwindowsystem-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/breeze-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/breeze-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -26,7 +26,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="135c431c979cfb82833c6525f72167e0e334519b8c10c57e97e96f8a15a8b2b141c4b94c37985a5a53f1ccc19ab3be9121e55bfe3412fad06122b2927e9e3cbc breeze-5.12.8.tar.xz"
+sha512sums="13d601003764bc600bb78262034f8c02d8984e6e79fea16cfc85b62da08967b96c6614c0d52dbd4ad2bcfd2d1a252fd241f371a0d4c92bd3a1f00ddb43ff032e breeze-5.17.90.tar.xz"
diff --git a/user/bsdwhois/APKBUILD b/user/bsdwhois/APKBUILD
index d5222238d..7fe28519f 100644
--- a/user/bsdwhois/APKBUILD
+++ b/user/bsdwhois/APKBUILD
@@ -15,13 +15,10 @@ source="http://utenti.gufi.org/~drizzt/codes/bsdwhois-$pkgver.tar.bz2"
builddir="$srcdir/$pkgname"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
-
install -D -m755 "$builddir"/whois "$pkgdir"/usr/bin/whois
install -D -m644 "$builddir"/whois.1 "$pkgdir"/usr/share/man/man1/whois.1
}
diff --git a/user/btrfs-progs/APKBUILD b/user/btrfs-progs/APKBUILD
index ffc0d10e7..079282295 100644
--- a/user/btrfs-progs/APKBUILD
+++ b/user/btrfs-progs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=btrfs-progs
-pkgver=5.2.2
+pkgver=5.4.1
pkgrel=0
pkgdesc="File system utilities for Btrfs"
url="https://btrfs.wiki.kernel.org/index.php/Main_Page"
@@ -31,4 +31,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="97eaf3dd8ce1629f0acace23f3eedc7c6942299ddb65cdc3b0a7b623026db1063d72f3c1b6297782705e08dfc4c361384e17b5e27a16e756cd0a81e35e79aa9c btrfs-progs-v5.2.2.tar.xz"
+sha512sums="56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f btrfs-progs-v5.4.1.tar.xz"
diff --git a/user/bugzilla/APKBUILD b/user/bugzilla/APKBUILD
index 5e0f6f31d..9217601b0 100644
--- a/user/bugzilla/APKBUILD
+++ b/user/bugzilla/APKBUILD
@@ -10,7 +10,7 @@ options="!check" # "Cannot determine your time zone"; all other tests pass
license="MPL-2.0"
# First section are required deps. Second section are optional features we use.
depends="perl-cgi perl-datetime perl-datetime-timezone perl-dbi perl-email-mime
- perl-email-sender perl-json-xs perl-list-moreutils
+ perl-email-sender perl-json-xs perl-list-moreutils perl
perl-math-random-isaac perl-template-toolkit perl-timedate perl-uri
patchutils perl-authen-sasl perl-chart perl-encode-detect
@@ -24,20 +24,17 @@ subpackages=""
source="https://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-$pkgver.tar.gz"
build() {
- cd "$builddir"
perl Build.PL installdirs=vendor
./Build
}
check() {
- cd "$builddir"
./Build test
}
package() {
- cd "$srcdir"
mkdir -p "$pkgdir"/usr/share/webapps
- mv bugzilla-$pkgver "$pkgdir"/usr/share/webapps/
+ mv "$srcdir"/bugzilla-$pkgver "$pkgdir"/usr/share/webapps/
}
sha512sums="8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de bugzilla-5.0.6.tar.gz"
diff --git a/user/bzflag/APKBUILD b/user/bzflag/APKBUILD
index 3e4b8be76..41ebe01f6 100644
--- a/user/bzflag/APKBUILD
+++ b/user/bzflag/APKBUILD
@@ -11,10 +11,10 @@ depends=""
makedepends="c-ares-dev curl-dev glew-dev ncurses-dev sdl2-dev zlib-dev"
subpackages="$pkgname-doc"
source="https://download.bzflag.org/bzflag/source/$pkgver/$pkgname-$pkgver.tar.bz2
- defineAddrLen.patch"
+ defineAddrLen.patch
+ "
build() {
- cd "$builddir"
LIBS="-ltinfo" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/cairomm/APKBUILD b/user/cairomm/APKBUILD
index f79d27580..7e22d21fd 100644
--- a/user/cairomm/APKBUILD
+++ b/user/cairomm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=cairomm
pkgver=1.12.2
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://www.cairographics.org/releases/cairomm-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/caja-dropbox/APKBUILD b/user/caja-dropbox/APKBUILD
index 938d76160..27221bbc7 100644
--- a/user/caja-dropbox/APKBUILD
+++ b/user/caja-dropbox/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=caja-dropbox
pkgver=1.22.1
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/caja-dropbox-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm "$pkgdir"/usr/lib/caja/extensions-2.0/libcaja-dropbox.a
}
diff --git a/user/caja-extensions/APKBUILD b/user/caja-extensions/APKBUILD
index 6eadf0f67..36d939ae6 100644
--- a/user/caja-extensions/APKBUILD
+++ b/user/caja-extensions/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=caja-extensions
pkgver=1.22.1
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/caja-extensions-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/caja/APKBUILD b/user/caja/APKBUILD
index a4ffe1c01..9bab74a53 100644
--- a/user/caja/APKBUILD
+++ b/user/caja/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=caja
pkgver=1.22.2
pkgrel=0
@@ -13,10 +13,8 @@ makedepends="gobject-introspection-dev intltool libexif-dev libnotify-dev
libxml2-dev mate-desktop-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/caja-$pkgver.tar.xz"
-builddir="$srcdir/caja-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
for i in icons globs globs2 XMLnamespaces magic aliases subclasses types treemagic mime.cache version generic-icons; do
diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD
index fdaf6e4fe..60d8a0e8e 100644
--- a/user/calligra/APKBUILD
+++ b/user/calligra/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=calligra
pkgver=3.1.0
-pkgrel=3
+pkgrel=4
pkgdesc="KDE Office suite"
url="https://www.calligra.org/"
arch="all"
@@ -25,31 +25,34 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev
libwpd-dev libwpg-dev libwps-dev marble-dev poppler-dev poppler-qt5-dev
qca-dev
- kcalcore-dev kcontacts-dev kdiagram-dev"
+ kcalendarcore-dev kcontacts-dev kdiagram-dev"
subpackages="$pkgname-dev $pkgname-lang"
source="https://download.kde.org/stable/calligra/$pkgver/calligra-$pkgver.tar.xz
https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz
c99-math.patch
+ kcalcore.patch
+ kf5.patch
+ plan.patch
poppler.patch
poppler2.patch
poppler3.patch
poppler4.patch
poppler-73.patch
+ poppler-81.patch
+ poppler-83.patch
+ qt5.patch
"
prepare() {
- default_prepare
-
- cd "$builddir"
+ # Run this *before* default_prepare so patches can work on plan!
mv ../calligraplan-$pkgver plan
+ default_prepare
sed -e "/add_subdirectory(plan)/s/#//" \
-e "/^calligra_disable_product(APP_PLAN/s/^/#/" \
-i CMakeLists.txt
- mkdir build
}
build() {
- cd "$builddir"/build
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -64,25 +67,29 @@ build() {
-DPRODUCTSET="KARBON PLAN SHEETS STAGE WORDS" \
-DBUILD_UNMAINTAINED=True \
${CMAKE_CROSSOPTS} \
- ..
- make
+ -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b calligra-3.1.0.tar.xz
a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 calligraplan-3.1.0.tar.xz
b03d2f33a0233638be06b4219328404eac4a77c508619c4037b3b53556b257fc4888cd690bb3755562040a198cbd51a323d13553fed3f2082398556a49482c6e c99-math.patch
+7c7c0dbf0603e1ff1dba640364c58922e1f59f0c60ef4a1afbd330e454259a2ef767d94d54e8c0ef5c228c6972e91cbdc32cb6242a27e5374ddf0c5d4ea983d6 kcalcore.patch
+0edb2b9ef6c9aad374d3e25bbc637f9a3447a6e70d153fbec4ab87dc213e96076a6c8df5a65fb020d7f232269ee8cf4561f5d13724df827247379c321c15401d kf5.patch
+7d4654810d0aa1bcbd3609e0d9067e357284a9cd97d50aa3782ef8e341478c3c16acba85428595ddb1d5b22397703f2383304d2c39c48d3fd5e2cfa2768bc6bc plan.patch
960614eb2d367443810cc356d004d43867a4fa4085b054ffd1522b94ef09e9338e723117c91148383d33d54104729750a199ab1b75569aaa7164a908afd3cd4c poppler.patch
53296af0b1ad39c523bc93a0040f1316dfb52e2077d277a83841a741c5cb48d81efb1f6328b2af2c8f1dc92db12c4d771a9a65028498d7802b2c30dd702b9455 poppler2.patch
a22b78d9664284ee5de7a4299907ec37a7835cb6ae3af8e7c1ee0202cea8c1e544fbad7395e56115fb5fe13ec06aeff22e381431e20c6c151c93003cf8a45446 poppler3.patch
df0e592f8c314581b1811776f8aa1c3dd32f05f966f23ef4dd023c41dad759aea8b674b32e2bd7bee36efe4ba0ce0bdd08f3fc30d10115330605d09d46883a28 poppler4.patch
-8440f1c36aba9cb54efa36fae73d605f57e78d055225c776791b14554d6be6f081f8cdc3fa65fb9c0b600a3b030d7776b45f631b9bc00d495ab16bfc35bd66f4 poppler-73.patch"
+8440f1c36aba9cb54efa36fae73d605f57e78d055225c776791b14554d6be6f081f8cdc3fa65fb9c0b600a3b030d7776b45f631b9bc00d495ab16bfc35bd66f4 poppler-73.patch
+354d1ceab55dfd036c94aa0f9cd6792e58714011b2ef23f104f45fc46cd6d005a242ba18f47337dc1ead79fbeb1e3075062fc9d63d50a4058ca845ac9ec7810c poppler-81.patch
+b65384ddc4be747907d17b1eb944130dd27155034156faa4d3e3b704507fff03331535e875cb9dec929d5cba2f0a317ba1a7e7978336e3b57f28807f5ad5b383 poppler-83.patch
+440a5297ad0e1542c2892e6c84a6acf5cd61da3160dcf56163791ef4ade35d90f71c3bb3df28988deea60e9f68c292ce8ffa23150ddaa08d262b256dd91481f1 qt5.patch"
diff --git a/user/calligra/kcalcore.patch b/user/calligra/kcalcore.patch
new file mode 100644
index 000000000..8124192db
--- /dev/null
+++ b/user/calligra/kcalcore.patch
@@ -0,0 +1,74 @@
+From 2d484fda1b31a72659088a4bfce5c3708e923cb0 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 23 Jul 2019 12:20:29 +0200
+Subject: Fix compilation after recent KCalCore API changes
+
+---
+ .../filters/icalendar/export/icalendarexport.cpp | 19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+diff --git a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp
+index 757d693..daf1c2d 100644
+--- a/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp
++++ b/plan/src/plugins/filters/icalendar/export/icalendarexport.cpp
+@@ -31,6 +31,7 @@
+ #include <kcalcore/attachment.h>
+ #include <kcalcore/icalformat.h>
+ #include <kcalcore/memorycalendar.h>
++#include <kcalcore_version.h>
+
+ #include <QTextCodec>
+ #include <QByteArray>
+@@ -140,9 +141,15 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
+ todo->setOrganizer(node->projectNode()->leader());
+ }
+ if ( node->type() != Node::Type_Project && ! node->leader().isEmpty()) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++ KCalCore::Person p = KCalCore::Person::fromFullName(node->leader());
++ KCalCore::Attendee a(p.name(), p.email());
++ a.setRole(KCalCore::Attendee::NonParticipant);
++#else
+ KCalCore::Person::Ptr p = KCalCore::Person::fromFullName(node->leader());
+ KCalCore::Attendee::Ptr a(new KCalCore::Attendee(p->name(), p->email()));
+ a->setRole(KCalCore::Attendee::NonParticipant);
++#endif
+ todo->addAttendee(a);
+ }
+ DateTime st = node->startTime(id);
+@@ -161,13 +168,21 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
+ const QList<Resource*> lst = task->requestedResources();
+ foreach(const Resource *r, lst) {
+ if (r->type() == Resource::Type_Work) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++ todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
++#else
+ todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
++#endif
+ }
+ }
+ } else {
+ foreach(const Resource *r, s->resources()) {
+ if (r->type() == Resource::Type_Work) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++ todo->addAttendee(KCalCore::Attendee(r->name(), r->email()));
++#else
+ todo->addAttendee(KCalCore::Attendee::Ptr(new KCalCore::Attendee(r->name(), r->email())));
++#endif
+ }
+ }
+
+@@ -178,7 +193,11 @@ void ICalendarExport::createTodos(KCalCore::Calendar::Ptr cal, const Node *node,
+ todo->setPercentComplete(task->completion().percentFinished());
+ }
+ foreach(const Document *doc, node->documents().documents()) {
++#if KCALCORE_VERSION >= QT_VERSION_CHECK(5, 11, 90)
++ todo->addAttachment(KCalCore::Attachment(doc->url().url()));
++#else
+ todo->addAttachment(KCalCore::Attachment::Ptr(new KCalCore::Attachment(doc->url().url())));
++#endif
+ }
+ if (! parent.isNull()) {
+ todo->setRelatedTo(parent->uid(), KCalCore::Incidence::RelTypeParent);
+--
+cgit v1.1
+
diff --git a/user/calligra/kf5.patch b/user/calligra/kf5.patch
new file mode 100644
index 000000000..1a424ef98
--- /dev/null
+++ b/user/calligra/kf5.patch
@@ -0,0 +1,38 @@
+From 9611a8b3e09f7ae4b53640c11a2196274f39d60f Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 10 Nov 2019 14:28:36 +0100
+Subject: port away from deprecated methods in KWindowSystem >= 5.62
+
+(this is in order to make KWindowSystem independent from QtWidgets)
+---
+ plan/src/workpackage/commandlineparser.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/plan/src/workpackage/commandlineparser.cpp b/plan/src/workpackage/commandlineparser.cpp
+index 432f99a..f9be208 100644
+--- a/plan/src/workpackage/commandlineparser.cpp
++++ b/plan/src/workpackage/commandlineparser.cpp
+@@ -28,6 +28,7 @@
+ #include <KStartupInfo>
+ #include <KWindowSystem>
+ #include <KMessageBox>
++#include <kwindowsystem_version.h>
+
+ #include <QApplication>
+ #include <QDir>
+@@ -65,7 +66,12 @@ void CommandLineParser::handleActivateRequest(const QStringList &arguments, cons
+ handleCommandLine(QDir(workingDirectory));
+
+ // terminate startup notification and activate the mainwindow
++#if KWINDOWSYSTEM_VERSION >= QT_VERSION_CHECK(5,62,0)
++ m_mainwindow->setAttribute(Qt::WA_NativeWindow, true);
++ KStartupInfo::setNewStartupId(m_mainwindow->windowHandle(), KStartupInfo::startupId());
++#else
+ KStartupInfo::setNewStartupId(m_mainwindow, KStartupInfo::startupId());
++#endif
+ KWindowSystem::forceActiveWindow(m_mainwindow->winId());
+
+ }
+--
+cgit v1.1
+
diff --git a/user/calligra/plan.patch b/user/calligra/plan.patch
new file mode 100644
index 000000000..c8f8c91fb
--- /dev/null
+++ b/user/calligra/plan.patch
@@ -0,0 +1,48 @@
+From 36ec68024620211edbcdb31a5ef6021545fe9451 Mon Sep 17 00:00:00 2001
+From: Dag Andersen <danders@get2net.dk>
+Date: Fri, 9 Feb 2018 08:40:34 +0100
+Subject: Plan: Fix crash in tj scheduler if a resource does not have a
+ calendar
+
+This can happen when there is no default calendar and no calendar has been set for a resource.
+---
+ plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp b/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp
+index 4f4e825..548969e 100644
+--- a/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp
++++ b/plan/src/plugins/schedulers/tj/PlanTJScheduler.cpp
+@@ -259,6 +259,9 @@ bool PlanTJScheduler::kplatoToTJ()
+ addRequests();
+ addStartEndJob();
+
++ if (result != -1) {
++ return false;
++ }
+ return check();
+ }
+
+@@ -596,6 +599,7 @@ TJ::Resource *PlanTJScheduler::addResource( KPlato::Resource *r)
+ res->setEfficiency( (double)(r->units()) / 100. );
+ }
+ Calendar *cal = r->calendar();
++ Q_ASSERT(cal);
+ DateTime start = qMax( r->availableFrom(), m_project->constraintStartTime() );
+ DateTime end = m_project->constraintEndTime();
+ if ( r->availableUntil().isValid() && end > r->availableUntil() ) {
+@@ -887,6 +891,11 @@ void PlanTJScheduler::addRequest( TJ::Task *job, Task *task )
+ return;
+ }
+ foreach ( ResourceRequest *rr, task->requests().resourceRequests( true /*resolveTeam*/ ) ) {
++ if (!rr->resource()->calendar()) {
++ result = 1; // stops scheduling
++ logError(task, 0, i18n("No working hours defined for resource: %1",rr->resource()->name()));
++ continue; // may happen if no calendar is set, and no default calendar
++ }
+ TJ::Resource *tjr = addResource( rr->resource() );
+ TJ::Allocation *a = new TJ::Allocation();
+ a->setSelectionMode( TJ::Allocation::order );
+--
+cgit v1.1
+
diff --git a/user/calligra/poppler-81.patch b/user/calligra/poppler-81.patch
new file mode 100644
index 000000000..3211b7b8e
--- /dev/null
+++ b/user/calligra/poppler-81.patch
@@ -0,0 +1,70 @@
+diff --git a/filters/karbon/pdf/CMakeLists.txt b/filters/karbon/pdf/CMakeLists.txt
+index 8f462b7b597..945eebbe676 100644
+--- a/filters/karbon/pdf/CMakeLists.txt
++++ b/filters/karbon/pdf/CMakeLists.txt
+@@ -1,4 +1,8 @@
+
++if(Poppler_VERSION VERSION_LESS "0.82.0")
++ add_definitions("-DHAVE_POPPLER_PRE_0_82")
++endif()
++
+ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
+
+ add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
+diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp
+index 18c6fbb4a44..3ebb2281bf3 100644
+--- a/filters/karbon/pdf/SvgOutputDev.cpp
++++ b/filters/karbon/pdf/SvgOutputDev.cpp
+@@ -405,7 +405,11 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ const char * p = s->c_str();
+ int len = s->getLength();
+ CharCode code;
++#ifdef HAVE_POPPLER_PRE_0_82
+ Unicode *u = nullptr;
++#else
++ const Unicode *u = nullptr;
++#endif
+ int uLen;
+ double dx, dy, originX, originY;
+ while (len > 0) {
+@@ -474,9 +478,15 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s)
+ *d->body << "</text>" << endl;
+ }
+
+-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
++#ifdef HAVE_POPPLER_PRE_0_82
++ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
++ int width, int height, GfxImageColorMap *colorMap,
++ bool /*interpolate*/, int *maskColors, bool /*inlineImg*/)
++#else
++ void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+- bool /*interpolate*/, int *maskColors, bool inlineImg)
++ bool /*interpolate*/, const int *maskColors, bool inlineImg)
++#endif
+ {
+ ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());
+ imgStr->reset();
+diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h
+index 2c161ce50af..2b0ea41e30c 100644
+--- a/filters/karbon/pdf/SvgOutputDev.h
++++ b/filters/karbon/pdf/SvgOutputDev.h
+@@ -61,9 +61,17 @@ public:
+ void drawString(GfxState * state, const GooString * s) override;
+
++#ifdef HAVE_POPPLER_PRE_0_82
++ // images
++ void drawImage(GfxState *state, Object *ref, Stream *str,
++ int width, int height, GfxImageColorMap *colorMap,
++ bool interpolate, int *maskColors, bool inlineImg) override;
++#else
+ // images
+ void drawImage(GfxState *state, Object *ref, Stream *str,
+ int width, int height, GfxImageColorMap *colorMap,
+- bool interpolate, int *maskColors, bool inlineImg) override;
++ bool interpolate, const int *maskColors, bool inlineImg) override;
++#endif
++
+
+ // styles
+ void updateAll(GfxState *state) override;
diff --git a/user/calligra/poppler-83.patch b/user/calligra/poppler-83.patch
new file mode 100644
index 000000000..e158ac4ff
--- /dev/null
+++ b/user/calligra/poppler-83.patch
@@ -0,0 +1,102 @@
+--- calligra-3.1.0/filters/karbon/pdf/CMakeLists.txt.old 2020-01-13 11:57:23.529485941 +0000
++++ calligra-3.1.0/filters/karbon/pdf/CMakeLists.txt 2020-01-13 12:08:05.610601265 +0000
+@@ -3,6 +3,10 @@
+ add_definitions("-DHAVE_POPPLER_PRE_0_82")
+ endif()
+
++if(Poppler_VERSION VERSION_LESS "0.83.0")
++ add_definitions("-DHAVE_POPPLER_PRE_0_83")
++endif()
++
+ set(pdf2svg_PART_SRCS PdfImportDebug.cpp PdfImport.cpp SvgOutputDev.cpp )
+
+ add_library(calligra_filter_pdf2svg MODULE ${pdf2svg_PART_SRCS})
+--- calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp.old 2020-01-13 10:34:30.622852616 +0000
++++ calligra-3.1.0/filters/karbon/pdf/PdfImport.cpp 2020-01-13 12:26:57.029441237 +0000
+@@ -60,19 +60,31 @@
+ }
+
+ // read config file
++#ifdef HAVE_POPPLER_PRE_0_83
+ globalParams = new GlobalParams();
++#else
++ globalParams = std::unique_ptr<GlobalParams>(new GlobalParams());
++#endif
+ if (! globalParams)
+ return KoFilter::NotImplemented;
+
+ GooString * fname = new GooString(QFile::encodeName(m_chain->inputFile()).data());
+ PDFDoc * pdfDoc = new PDFDoc(fname, 0, 0, 0);
+ if (! pdfDoc) {
++#ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;
++#else
++ globalParams.reset();
++#endif
+ return KoFilter::StupidError;
+ }
+
+ if (! pdfDoc->isOk()) {
++#ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;
++#else
++ globalParams.reset();
++#endif
+ delete pdfDoc;
+ return KoFilter::StupidError;
+ }
+@@ -99,8 +111,12 @@
+
+ delete dev;
+ delete pdfDoc;
++#ifdef HAVE_POPPLER_PRE_0_83
+ delete globalParams;
+ globalParams = 0;
++#else
++ globalParams.reset();
++#endif
+
+ return KoFilter::OK;
+ }
+--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2020-01-13 11:57:43.537339118 +0000
++++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2020-01-13 12:18:49.211663293 +0000
+@@ -172,7 +172,11 @@
+ *d->body << "/>" << endl;
+ }
+
++#ifdef HAVE_POPPLER_PRE_0_83
+ QString SvgOutputDev::convertPath(GfxPath *path)
++#else
++QString SvgOutputDev::convertPath(const GfxPath *path)
++#endif
+ {
+ if (! path)
+ return QString();
+@@ -180,7 +184,12 @@
+ QString output;
+
+ for (int i = 0; i < path->getNumSubpaths(); ++i) {
+- GfxSubpath * subpath = path->getSubpath(i);
++#ifdef HAVE_POPPLER_PRE_0_83
++ GfxSubpath * subpath;
++#else
++ const GfxSubpath * subpath;
++#endif
++ subpath = path->getSubpath(i);
+ if (subpath->getNumPoints() > 0) {
+ output += QString("M%1 %2").arg(subpath->getX(0)).arg(subpath->getY(0));
+ int j = 1;
+--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h.old 2020-01-13 11:57:23.529485941 +0000
++++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.h 2020-01-13 12:11:30.918610131 +0000
+@@ -87,7 +87,11 @@
+ /// Dumps content to svg file
+ void dumpContent();
+ private:
++#ifdef HAVE_POPPLER_PRE_0_83
+ QString convertPath(GfxPath *path);
++#else
++ QString convertPath(const GfxPath *path);
++#endif
+ QString convertMatrix(const QMatrix &matrix);
+ QString convertMatrix(const double * matrix);
+ QString printFill();
diff --git a/user/calligra/qt5.patch b/user/calligra/qt5.patch
new file mode 100644
index 000000000..a40d92127
--- /dev/null
+++ b/user/calligra/qt5.patch
@@ -0,0 +1,293 @@
+From a7ebecb9fbee2190e649c44ed53f1299013baa30 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 18 Mar 2018 11:56:57 +0100
+Subject: Fix build with Qt 5.11 (missing headers)
+
+Reviewers: #calligra:_3.0, anthonyfieroni, danders
+
+Reviewed By: #calligra:_3.0, anthonyfieroni, danders
+
+Subscribers: anthonyfieroni, danders
+
+Tags: #calligra:_3.0
+
+Differential Revision: https://phabricator.kde.org/D11454
+---
+ libs/widgets/KoCsvImportDialog.cpp | 1 +
+ libs/widgets/KoPageLayoutWidget.cpp | 2 ++
+ plan/src/kptview.h | 1 +
+ plan/src/kptviewlist.cpp | 1 +
+ plan/src/libs/ui/kptaccountseditor.cpp | 1 +
+ plan/src/libs/ui/kptdocumentspanel.h | 1 +
+ plan/src/libs/ui/kptitemviewsettup.cpp | 2 +-
+ plan/src/libs/ui/kpttaskeditor.cpp | 1 +
+ plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp | 1 +
+ plan/src/libs/widgets/KoPageLayoutWidget.cpp | 2 ++
+ plugins/chartshape/dialogs/TableEditorDialog.cpp | 1 +
+ plugins/formulashape/FormulaToolWidget.cpp | 1 +
+ sheets/dialogs/LayoutDialog.cpp | 1 +
+ words/part/dialogs/KWAnchoringProperties.cpp | 1 +
+ words/part/dialogs/KWRunAroundProperties.cpp | 2 ++
+ 15 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/libs/widgets/KoCsvImportDialog.cpp b/libs/widgets/KoCsvImportDialog.cpp
+index 0ffdcf6..cdca006 100644
+--- a/libs/widgets/KoCsvImportDialog.cpp
++++ b/libs/widgets/KoCsvImportDialog.cpp
+@@ -21,6 +21,7 @@
+ #include "KoCsvImportDialog.h"
+
+ // Qt
++#include <QButtonGroup>
+ #include <QTextCodec>
+ #include <QTextStream>
+
+diff --git a/libs/widgets/KoPageLayoutWidget.cpp b/libs/widgets/KoPageLayoutWidget.cpp
+index f91555c..a3816f9 100644
+--- a/libs/widgets/KoPageLayoutWidget.cpp
++++ b/libs/widgets/KoPageLayoutWidget.cpp
+@@ -23,6 +23,8 @@
+
+ #include <KoUnit.h>
+
++#include <QButtonGroup>
++
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
+diff --git a/plan/src/kptview.h b/plan/src/kptview.h
+index 44d1193..a98e553 100644
+--- a/plan/src/kptview.h
++++ b/plan/src/kptview.h
+@@ -28,6 +28,7 @@
+ #include "kptcontext.h"
+ #include "kptviewbase.h"
+
++#include <QActionGroup>
+ #include <QDockWidget>
+ #include <QMap>
+
+diff --git a/plan/src/kptviewlist.cpp b/plan/src/kptviewlist.cpp
+index f34e702..0e6db7b 100644
+--- a/plan/src/kptviewlist.cpp
++++ b/plan/src/kptviewlist.cpp
+@@ -25,6 +25,7 @@
+ #include <QStyle>
+ #include <QBrush>
+ #include <QContextMenuEvent>
++#include <QHeaderView>
+ #include <QMenu>
+
+ #include <kmessagebox.h>
+diff --git a/plan/src/libs/ui/kptaccountseditor.cpp b/plan/src/libs/ui/kptaccountseditor.cpp
+index 7991faf..54e3a87 100644
+--- a/plan/src/libs/ui/kptaccountseditor.cpp
++++ b/plan/src/libs/ui/kptaccountseditor.cpp
+@@ -40,6 +40,7 @@
+ #include <QContextMenuEvent>
+ #include <QMenu>
+ #include <QAction>
++#include <QHeaderView>
+
+ #include <KLocalizedString>
+ #include <kactioncollection.h>
+diff --git a/plan/src/libs/ui/kptdocumentspanel.h b/plan/src/libs/ui/kptdocumentspanel.h
+index 00ea3af..491cb1e 100644
+--- a/plan/src/libs/ui/kptdocumentspanel.h
++++ b/plan/src/libs/ui/kptdocumentspanel.h
+@@ -26,6 +26,7 @@
+
+ #include "kptdocuments.h"
+
++#include <QModelIndexList>
+ #include <QWidget>
+ #include <kundo2qstack.h>
+
+diff --git a/plan/src/libs/ui/kptitemviewsettup.cpp b/plan/src/libs/ui/kptitemviewsettup.cpp
+index d1c3b1f..7c97a07 100644
+--- a/plan/src/libs/ui/kptitemviewsettup.cpp
++++ b/plan/src/libs/ui/kptitemviewsettup.cpp
+@@ -25,9 +25,9 @@
+
+ #include "KoPageLayoutWidget.h"
+
++#include <QHeaderView>
+ #include <QPushButton>
+
+-
+ namespace KPlato
+ {
+
+diff --git a/plan/src/libs/ui/kpttaskeditor.cpp b/plan/src/libs/ui/kpttaskeditor.cpp
+index 2154611..91db5ac 100644
+--- a/plan/src/libs/ui/kpttaskeditor.cpp
++++ b/plan/src/libs/ui/kpttaskeditor.cpp
+@@ -45,6 +45,7 @@
+ #include <QVBoxLayout>
+ #include <QDragMoveEvent>
+ #include <QAction>
++#include <QHeaderView>
+ #include <QMenu>
+
+ #include <kactionmenu.h>
+diff --git a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
+index 344ebc2..9146f06 100644
+--- a/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
++++ b/plan/src/libs/ui/reportsgenerator/ReportsGeneratorView.cpp
+@@ -31,6 +31,7 @@
+ #include <KFile>
+
+ #include <QAction>
++#include <QHeaderView>
+ #include <QTreeView>
+ #include <QStandardItemModel>
+ #include <QModelIndex>
+diff --git a/plan/src/libs/widgets/KoPageLayoutWidget.cpp b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
+index c9e17b7..b67e984 100644
+--- a/plan/src/libs/widgets/KoPageLayoutWidget.cpp
++++ b/plan/src/libs/widgets/KoPageLayoutWidget.cpp
+@@ -23,6 +23,8 @@
+
+ #include <KoUnit.h>
+
++#include <QButtonGroup>
++
+ class Q_DECL_HIDDEN KoPageLayoutWidget::Private
+ {
+ public:
+diff --git a/plugins/chartshape/dialogs/TableEditorDialog.cpp b/plugins/chartshape/dialogs/TableEditorDialog.cpp
+index c0d5136..d2a772e 100644
+--- a/plugins/chartshape/dialogs/TableEditorDialog.cpp
++++ b/plugins/chartshape/dialogs/TableEditorDialog.cpp
+@@ -24,6 +24,7 @@
+
+ // Qt
+ #include <QAbstractItemModel>
++#include <QAction>
+
+ // Calligra
+ #include <KoIcon.h>
+diff --git a/plugins/formulashape/FormulaToolWidget.cpp b/plugins/formulashape/FormulaToolWidget.cpp
+index ed10919..8f52177 100644
+--- a/plugins/formulashape/FormulaToolWidget.cpp
++++ b/plugins/formulashape/FormulaToolWidget.cpp
+@@ -30,6 +30,7 @@
+ #include <QWidgetAction>
+ #include <QTableWidget>
+ #include <QAction>
++#include <QHeaderView>
+ #include <QMenu>
+
+ FormulaToolWidget::FormulaToolWidget( KoFormulaTool* tool, QWidget* parent )
+diff --git a/sheets/dialogs/LayoutDialog.cpp b/sheets/dialogs/LayoutDialog.cpp
+index a0a9832..7d7db53 100644
+--- a/sheets/dialogs/LayoutDialog.cpp
++++ b/sheets/dialogs/LayoutDialog.cpp
+@@ -36,6 +36,7 @@
+ #include <math.h>
+
+ #include <QIntValidator>
++#include <QButtonGroup>
+ #include <QCheckBox>
+ #include <QFrame>
+ #include <QLabel>
+diff --git a/words/part/dialogs/KWAnchoringProperties.cpp b/words/part/dialogs/KWAnchoringProperties.cpp
+index d64208c..bfddb3a 100644
+--- a/words/part/dialogs/KWAnchoringProperties.cpp
++++ b/words/part/dialogs/KWAnchoringProperties.cpp
+@@ -35,6 +35,7 @@
+
+ #include <kundo2command.h>
+
++#include <QButtonGroup>
+ #include <QComboBox>
+
+ const int KWAnchoringProperties::vertRels[4][20] = {
+diff --git a/words/part/dialogs/KWRunAroundProperties.cpp b/words/part/dialogs/KWRunAroundProperties.cpp
+index e38599a..7e8b2d5 100644
+--- a/words/part/dialogs/KWRunAroundProperties.cpp
++++ b/words/part/dialogs/KWRunAroundProperties.cpp
+@@ -28,6 +28,8 @@
+
+ #include <kundo2command.h>
+
++#include <QButtonGroup>
++
+ KWRunAroundProperties::KWRunAroundProperties(FrameConfigSharedState *state)
+ : m_state(state)
+ {
+--
+cgit v1.1
+
+From ee83e0f2c251072e47a2799619cdc79efe67e651 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 3 Apr 2018 00:31:19 +0200
+Subject: Fix compilation with Qt 5.11 (missing include)
+
+---
+ stage/part/KPrPresentationTool.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/stage/part/KPrPresentationTool.cpp b/stage/part/KPrPresentationTool.cpp
+index ae743da..3007f91 100644
+--- a/stage/part/KPrPresentationTool.cpp
++++ b/stage/part/KPrPresentationTool.cpp
+@@ -32,6 +32,7 @@
+ #include <QDesktopServices>
+ #include <QUrl>
+ #include <QDBusConnection>
++#include <QFrame>
+
+ #include <KoShape.h>
+ #include <KoShapeManager.h>
+--
+cgit v1.1
+
+From acd0ef39e3c945d066d2902de0e19fa2d020c7f8 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 23 Jul 2019 12:20:03 +0200
+Subject: Fix compilation with Qt 5.13 (missing include)
+
+---
+ plan/src/workpackage/view.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/plan/src/workpackage/view.h b/plan/src/workpackage/view.h
+index b10547e..c5231e59 100644
+--- a/plan/src/workpackage/view.h
++++ b/plan/src/workpackage/view.h
+@@ -24,6 +24,7 @@
+ #include <KoView.h>
+
+ #include <QStackedWidget>
++#include <QMap>
+
+ class QPrinter;
+ class QPrintDialog;
+--
+cgit v1.1
+
+From 0c5430697bdcf41a45046107b28014e40c49a11a Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Tue, 23 Jul 2019 13:02:34 +0200
+Subject: Fix compilation with Qt 5.13 (missing include)
+
+---
+ sheets/plugins/calendar/CalendarToolWidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sheets/plugins/calendar/CalendarToolWidget.cpp b/sheets/plugins/calendar/CalendarToolWidget.cpp
+index b10b230..0c5eeb6 100644
+--- a/sheets/plugins/calendar/CalendarToolWidget.cpp
++++ b/sheets/plugins/calendar/CalendarToolWidget.cpp
+@@ -30,6 +30,7 @@
+ #include <kdatepicker.h>
+
+ #include <QPushButton>
++#include <QDate>
+
+ namespace Calligra
+ {
+--
+cgit v1.1
+
diff --git a/user/cantarell-fonts/APKBUILD b/user/cantarell-fonts/APKBUILD
index b5fec057f..16b5ef3f6 100644
--- a/user/cantarell-fonts/APKBUILD
+++ b/user/cantarell-fonts/APKBUILD
@@ -15,8 +15,7 @@ replaces="ttf-cantarell"
source="https://download.gnome.org/sources/cantarell-fonts/$pkgver/cantarell-fonts-$pkgver.tar.xz"
package() {
- cd "$builddir"/prebuilt
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/prebuilt/*.otf
}
sha512sums="638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e cantarell-fonts-0.111.tar.xz"
diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD
index 5814e9cfc..cda704b02 100644
--- a/user/cantor/APKBUILD
+++ b/user/cantor/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=cantor
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KDE worksheet interface for popular mathematical applications"
url="https://edu.kde.org/cantor/"
@@ -9,18 +9,18 @@ arch="all"
options="!check" # Tests require X11.
license="GPL-2.0-only"
depends="r"
+depends_dev="libspectre-dev"
makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev
qt5-qtxmlpatterns-dev karchive-dev kcompletion-dev kconfig-dev
kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev kiconthemes-dev
kio-dev knewstuff-dev kparts-dev kpty-dev ktexteditor-dev
- ktextwidgets-dev kxmlgui-dev libspectre-dev
+ ktextwidgets-dev kxmlgui-dev $depends_dev poppler-dev poppler-qt5-dev
analitza-dev gfortran libqalculate-dev python3-dev r r-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/cantor-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/cantor-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -31,18 +31,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="f9a089297c288bd4013da68b9388407f990aa20f508b759bd1839a85a714728fe2322daa198c522869285b64c02b84a587f605b4f1e8cc22b9c0aafc3138fd35 cantor-19.08.2.tar.xz"
+sha512sums="2466de7265a79a199c19b62b32fd27a949eee133bac187f9fcf46a7154aab279490f96403f4c5f61c052c6dde6ea20e35189c337c67a8f86e1a8ef1c3e82eb76 cantor-19.12.1.tar.xz"
diff --git a/user/cardo/APKBUILD b/user/cardo/APKBUILD
index 7af7e9f04..9f057c246 100644
--- a/user/cardo/APKBUILD
+++ b/user/cardo/APKBUILD
@@ -15,8 +15,7 @@ source="http://scholarsfonts.net/cardo104.zip"
builddir="$srcdir"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/*.ttf
}
sha512sums="559d91528dfebba1c0668ab0116e7cc8d481c88727cf01848978d920d625ee32c893d6abff3170e5365e136fa6f603c4f34390e17383409bc3db01611c42eefb cardo104.zip"
diff --git a/user/catcodec/APKBUILD b/user/catcodec/APKBUILD
index 9a18b7b29..2f098cba8 100644
--- a/user/catcodec/APKBUILD
+++ b/user/catcodec/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-doc"
source="https://binaries.openttd.org/extra/catcodec/1.0.5/catcodec-$pkgver-source.tar.xz"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make prefix=/usr DESTDIR="$pkgdir" install
}
diff --git a/user/catfish/APKBUILD b/user/catfish/APKBUILD
index eacc0772b..87695bbfe 100644
--- a/user/catfish/APKBUILD
+++ b/user/catfish/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=catfish
-pkgver=1.4.10
+pkgver=1.4.11
pkgrel=0
pkgdesc="File-searching application for the XFCE desktop environment"
url="https://xfce.org"
@@ -10,7 +10,7 @@ license="GPL-2.0-only"
depends="python3 py3-pygobject py3-pexpect"
makedepends="py3-distutils-extra intltool"
subpackages="$pkgname-doc $pkgname-lang"
-source="http://archive.xfce.org/src/apps/catfish/1.4/catfish-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/catfish/1.4/catfish-$pkgver.tar.bz2"
build() {
python3 setup.py build
@@ -24,4 +24,4 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="baf9007b2ce2418fa5704e10884f509e4361505537e2ce70a7f8c8c61009094a09d7d032e0a6b4ca174f33bf76783ee2665f781cce47d2b236f2633e25192f29 catfish-1.4.10.tar.bz2"
+sha512sums="aed919ff5824bffb7d48b715dee4bba51d74d24d523c1bb468b0cc1735bdfbeb0e50fa86d3c10e91b6ae747aea82c292c7b423fadc3abaa1f6841b38f8887cd0 catfish-1.4.11.tar.bz2"
diff --git a/user/cbindgen/APKBUILD b/user/cbindgen/APKBUILD
index f0093accf..2a735e5ce 100644
--- a/user/cbindgen/APKBUILD
+++ b/user/cbindgen/APKBUILD
@@ -3,59 +3,51 @@
# Contributor: Samuel Holland <samuel@sholland.org>
# Maintainer: Molly Miller <adelie@m-squa.red>
pkgname=cbindgen
-pkgver=0.9.1
+pkgver=0.12.1
pkgrel=0
pkgdesc="Tool to generate C bindings from Rust code"
url="https://github.com/eqrion/cbindgen"
arch="all"
license="MPL-2.0"
+depends=""
makedepends="cargo"
source=""
# dependencies taken from Cargo.lock
cargo_deps="$pkgname-$pkgver
ansi_term-0.11.0
-atty-0.2.11
-autocfg-0.1.4
-bitflags-1.1.0
-cfg-if-0.1.9
+atty-0.2.13
+bitflags-1.2.1
+c2-chacha-0.2.3
+cfg-if-0.1.10
clap-2.33.0
-cloudabi-0.0.3
-fuchsia-cprng-0.1.1
+getrandom-0.1.13
itoa-0.4.4
-libc-0.2.58
-log-0.4.6
-numtoa-0.1.0
-proc-macro2-1.0.0
-quote-1.0.0
-rand-0.6.5
-rand_chacha-0.1.1
-rand_core-0.3.1
-rand_core-0.4.0
-rand_hc-0.1.0
-rand_isaac-0.1.1
-rand_jitter-0.1.4
-rand_os-0.1.3
-rand_pcg-0.1.2
-rand_xorshift-0.1.1
-rdrand-0.4.0
-redox_syscall-0.1.54
-redox_termios-0.1.1
+libc-0.2.66
+log-0.4.8
+ppv-lite86-0.2.6
+proc-macro2-1.0.6
+quote-1.0.2
+rand-0.7.2
+rand_chacha-0.2.1
+rand_core-0.5.1
+rand_hc-0.2.0
+redox_syscall-0.1.56
remove_dir_all-0.5.2
-ryu-0.2.8
-serde-1.0.93
-serde_derive-1.0.99
-serde_json-1.0.39
+ryu-1.0.2
+serde-1.0.104
+serde_derive-1.0.104
+serde_json-1.0.44
strsim-0.8.0
-syn-1.0.1
-tempfile-3.0.8
-termion-1.5.3
+syn-1.0.11
+tempfile-3.1.0
textwrap-0.11.0
-toml-0.5.1
-unicode-width-0.1.5
+toml-0.5.5
+unicode-width-0.1.7
unicode-xid-0.2.0
vec_map-0.8.1
-winapi-0.3.7
+wasi-0.7.0
+winapi-0.3.8
winapi-i686-pc-windows-gnu-0.4.0
winapi-x86_64-pc-windows-gnu-0.4.0
"
@@ -110,48 +102,39 @@ package() {
}
-sha512sums="0e32563db42363dc82e8aca2f36bdafcdf0ec9156e7238937295c9369d306c2bfa590ea7a9afd61d8b915fc383bb7af8bbb78cde71f6ab30b0c576262c74232b cbindgen-0.9.1.tar.gz
+sha512sums="851f82cfdd4304dc57dab1a145f78a05a6c5f05ad607d27e0ae909920a5d99013ffb7f7e87950541bda98462f73f0c338d9761b94a96c3073f39163c2ddacf08 cbindgen-0.12.1.tar.gz
a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz
-9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79 atty-0.2.11.tar.gz
-811b68ea24a836980026abba12598b35359abdff5660e6e9d3cc65e3edbedcd10dffc208900af5d4c21e983e1218b5fb5499117c05ab60b3e4716f0529b231ce autocfg-0.1.4.tar.gz
-e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3 bitflags-1.1.0.tar.gz
-45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c cfg-if-0.1.9.tar.gz
+4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz
+ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b bitflags-1.2.1.tar.gz
+302498f75d1befdb8bf8b61d0eff2762f0e86000c3909d819a377be2fec72e830bfb4530e24059906b499cef17ab56229f5627fb998ad9ba34a7c6c0de748538 c2-chacha-0.2.3.tar.gz
+9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 cfg-if-0.1.10.tar.gz
f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz
-691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz
-ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz
+534b01d28bc9e69a5ad1e84f34aa4154939c27d70c5f557f15e669fa8894c375486ee945a6a6d8adaf1b6b7accda0e24963f70e77dd51ee0638a6ae6daa38925 getrandom-0.1.13.tar.gz
f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d itoa-0.4.4.tar.gz
-9127ad9a94f75655740fc3a2278c7a17d5f03c4cd12c8833c1a1ecb7a860ec8581fbc969f5c2e23b8eecb9131d9d8271131ad6a675b785f18fb55d830bcc0491 libc-0.2.58.tar.gz
-3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb log-0.4.6.tar.gz
-41b5c774048592c5867fba217c85d4ece4540e0f3ab0eea7dd1a6af340ba46dae42bbca62ea7fe3afdb258660f39a3d3082264c99dea67d3d1ae178d00a01354 numtoa-0.1.0.tar.gz
-8b70b107ee0445eacae9a3f35b5c02649cbcc41550fdf109a4bf3248eab20568ad016ccde2274b406a4631605b8414d208187f5fd0090baa182df8aeb68a2727 proc-macro2-1.0.0.tar.gz
-64db0b1690beb4f0a81dd77ccdf8e3f61b523674802ac657f0849b7ae653d8de41f279e55eb22c5f6080fc9787845cc6470b5486b35c3a0f44f019185db542e0 quote-1.0.0.tar.gz
-2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz
-200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz
-5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz
-f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 rand_core-0.4.0.tar.gz
-808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz
-9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz
-fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz
-01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz
-6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz
-3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz
-6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz
-38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e redox_syscall-0.1.54.tar.gz
-201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981 redox_termios-0.1.1.tar.gz
+5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975 libc-0.2.66.tar.gz
+0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz
+b9764a841364eb89157c828a183fdf6aeeb63d1d35e4f5dcba79e5d8e20eee8f22c845636c5c7bc980da1d141d838528d5f190546b23aa5e4e51e626a0ddce3d ppv-lite86-0.2.6.tar.gz
+d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853 proc-macro2-1.0.6.tar.gz
+67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4 quote-1.0.2.tar.gz
+d29d10e9788f0f44b56b2981aca01a115eca1018e6afe2428fca088cc9432f27d014c6f1f0c819317052f4c64a9c54cee8834eb08e081f292ad65160dcdd014c rand-0.7.2.tar.gz
+30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6 rand_chacha-0.2.1.tar.gz
+4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf rand_core-0.5.1.tar.gz
+bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0 rand_hc-0.2.0.tar.gz
+17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 redox_syscall-0.1.56.tar.gz
d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd remove_dir_all-0.5.2.tar.gz
-15a17fa06cb971847386013b7bc80e0483bb30f62062ac1e3200d588cb52771a7d34cdd74aba51de46341d303bd29065cf1f8cdcc17c23576cfadaefe63384b4 ryu-0.2.8.tar.gz
-ec7712ad54bae2d93524e49730e2707b20ef91c8aa05084c6bbbd17e3ca77532cc672b8ae8f3ace25fc72a109cdc06a4b3f74515b7afe35faff6887984ae9309 serde-1.0.93.tar.gz
-6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e serde_derive-1.0.99.tar.gz
-7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036 serde_json-1.0.39.tar.gz
+c681e037f1eea488bad7fb5ecc79af52377bd4b9eeed95eb213201219d7f100702000f81947aff8f18641235fb62c138a30eb20c1f93ae518a4d9960a598bb64 ryu-1.0.2.tar.gz
+638a1dacc158d69658a005e599adc19d6bc80d0c663f527b1ff906f729e70e027eacc4ea5b9b2c675ac990d5997f50f9d46d614ba95b0c73bb9606aba46b053a serde-1.0.104.tar.gz
+303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e serde_derive-1.0.104.tar.gz
+ce1c68bfd2ceaa8b7f45cd34cfbc71dcfe3905b06fa47032403c54aa9eed0e618cd526938eb78dbc201e9480dbd64b4bfb405f2119478229f5cea12056dcf5e4 serde_json-1.0.44.tar.gz
1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz
-10ec59186b0090f4a7302ad9504ab78c0a396ce7087b7e75502f12a1c6ba02700455a7f0910f2abfb45dc0c9b59de112a170772f4da11ac8d094a701bbbe754f syn-1.0.1.tar.gz
-88f5bb3ac88b192b9f106d5902ac7563114b901df8c36cbb7f2eb7dccd631e19093cd1ec6aa82e4b833f35ab265072e81f3205773654c263555bee22a78abc00 tempfile-3.0.8.tar.gz
-1cbe60f97d5f8b95e6a57ec9b7cfcf37459bc8dbcf8424b055f04b2ecdaf069e1bb52222364a2f380dc3f63039fe3823d424228af1c212a8b3790b7dd55d5deb termion-1.5.3.tar.gz
+6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c syn-1.0.11.tar.gz
+a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5 tempfile-3.1.0.tar.gz
f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz
-4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073 toml-0.5.1.tar.gz
-bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 unicode-width-0.1.5.tar.gz
+8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33 toml-0.5.5.tar.gz
+39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84 unicode-width-0.1.7.tar.gz
590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 unicode-xid-0.2.0.tar.gz
026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz
-6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 winapi-0.3.7.tar.gz
+1950e78df7f0ba21b917680633d092704f1fb906bd973de4ddc43cedb7bf449f6e881d50e3aa0d5595e8d58796915d582b69c116ef536f819b6f035affea18f0 wasi-0.7.0.tar.gz
+5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 winapi-0.3.8.tar.gz
a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz
4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz"
diff --git a/user/ccache/APKBUILD b/user/ccache/APKBUILD
index e8df804e5..4bca128ec 100644
--- a/user/ccache/APKBUILD
+++ b/user/ccache/APKBUILD
@@ -2,14 +2,15 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=ccache
-pkgver=3.7.4
+pkgver=3.7.6
pkgrel=0
pkgdesc="A fast C/C++ compiler cache"
url="https://ccache.dev/"
arch="all"
license="GPL-3.0+"
-makedepends="zlib-dev"
+depends=""
checkdepends="bash perl"
+makedepends="zlib-dev"
subpackages="$pkgname-doc"
source="https://github.com/ccache/ccache/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz"
@@ -46,4 +47,4 @@ package() {
done
}
-sha512sums="cc382f37f7efb30a64f6fc2b136ef7424fe51795a778dbb18dde7c9e80636515f242f51c3ef3231f74d154e65ed9e815abf8241eb1a8f4e0b4fe4f533ea27146 ccache-3.7.4.tar.xz"
+sha512sums="c92a699b9761bbbde1666a9bc2718070a5beb24f7054d91226790c7903fe2e26a02d0782822bc811aaffcd88df3cd3e011a19061eb69569ed7140765cef8d6ba ccache-3.7.6.tar.xz"
diff --git a/user/certbot/APKBUILD b/user/certbot/APKBUILD
index fc6381b30..20e59ff00 100644
--- a/user/certbot/APKBUILD
+++ b/user/certbot/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: zlg <zlg+adelie@zlg.space>
# Maintainer:
pkgname=certbot
-pkgver=0.40.1
+pkgver=1.0.0
pkgrel=0
pkgdesc="The EFF's reference ACME client"
url="https://certbot.eff.org/"
@@ -17,6 +17,7 @@ _depends_acme="python3 py3-cryptography py3-josepy py3-mock py3-openssl py3-requ
makedepends="python3-dev $_depends_acme"
subpackages="py3-acme:acme"
source="certbot-$pkgver.tar.gz::https://github.com/certbot/certbot/archive/v$pkgver.tar.gz"
+builddir="$srcdir"/$pkgname-$pkgver/$pkgname
build() {
python3 setup.py build
@@ -33,9 +34,9 @@ package() {
acme() {
pkgdesc="ACME protocol implementation for Python"
depends="$_depends_acme"
- cd "$builddir"/acme
+ cd "$builddir"/../acme
python3 setup.py build
python3 setup.py install --prefix=/usr --root="$subpkgdir"
}
-sha512sums="e5517a20cf26efba850728b3f81db5d6c3c5570b0a1c8eeeec9d4a4401ac04bcf44c6a2f1c248bf6e0b1be4a21b54f6168ccd11dc766304805f13b4cb16336b3 certbot-0.40.1.tar.gz"
+sha512sums="649ddd3d9305e166ef36de4e4e48b1171d5f369d9d60c026ab37a03e7b221cd815e93e69460662e6436b56cec076005582457e9d45499114306ad808a2497912 certbot-1.0.0.tar.gz"
diff --git a/user/cgit/APKBUILD b/user/cgit/APKBUILD
index eda8e62b4..9a3be5d89 100644
--- a/user/cgit/APKBUILD
+++ b/user/cgit/APKBUILD
@@ -3,13 +3,14 @@
# Contributor: zlg <zlg+adelie@zlg.space>
# Maintainer:
pkgname=cgit
-pkgver=1.2.1
-pkgrel=1
-_gitver=2.18.0
+pkgver=1.2.2
+pkgrel=0
+_gitver=2.25.0
pkgdesc="A fast Web interface for Git"
url="https://git.zx2c4.com/cgit/"
arch="all"
license="GPL-2.0-only"
+depends=""
makedepends="openssl-dev zlib-dev lua5.3-libs lua5.3-dev asciidoctor gettext-tiny-dev"
subpackages="$pkgname-doc"
source="http://git.zx2c4.com/$pkgname/snapshot/$pkgname-$pkgver.tar.xz
@@ -27,8 +28,6 @@ _makeopts="NO_CURL=1
prefix=/usr"
prepare() {
- cd "$builddir"
-
# check that upstream git ver corresponds with ours
local _ver="$(awk -F'[ \t]*=[ \t]*' '/^GIT_VER/ { print $2 }' Makefile)"
if [ "$_ver" != "$_gitver" ]; then
@@ -43,23 +42,20 @@ prepare() {
}
build() {
- cd "$builddir"
sed -i -e 's:a2x -f:asciidoctor -b:' Makefile
make $_makeopts all doc-man
}
check() {
- cd "$builddir"
make $_makeopts test
}
package() {
- cd "$builddir"
make $_makeopts DESTDIR="$pkgdir" \
CGIT_SCRIPT_PATH=/usr/share/webapps/cgit \
install install-man
ln -s cgit.cgi "$pkgdir"/usr/share/webapps/cgit/cgit
}
-sha512sums="c7380df9afbc3735ef9e4f196f4f5bbd26cf52e473fa6f435e7d0c00dc295cc8de6bee6bfb1857144025c8591d41a6a74efb1af551e8610848d90ac40fcfab36 cgit-1.2.1.tar.xz
-db19363c9c2042248322d49874a27c0614acfb912183725e5d4f0331d6b44cef66a9a7da6a49bd4a17e5d86d30c5fed6bef7527f386494184595a433c4060e46 git-2.18.0.tar.xz"
+sha512sums="ac006db0b14ae84fc9304b4cb1b49c3445d229593071be39b2d6e2709b54d03b11efd0ac1b5daef8160278303a7611c897fb6cf1e008c66c3f2463151e650af9 cgit-1.2.2.tar.xz
+8bbada0451fe0a3314e1b9a43a74135115449aa41f5b3e7f960279e4a7fe6069c36e78825fc4b60d06806e3a6fa8158f327cb8a3801686ac22a35e3704244191 git-2.25.0.tar.xz"
diff --git a/user/cgmanager/APKBUILD b/user/cgmanager/APKBUILD
index 3074679fd..f4cad0309 100644
--- a/user/cgmanager/APKBUILD
+++ b/user/cgmanager/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
source="https://linuxcontainers.org/downloads/cgmanager/cgmanager-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD
index 60ca163eb..26345d0ac 100644
--- a/user/checkbashisms/APKBUILD
+++ b/user/checkbashisms/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=checkbashisms
-pkgver=2.19.6
+pkgver=2.19.7
pkgrel=0
pkgdesc="Check shell scripts for POSIX compliance"
url="https://tracker.debian.org/pkg/devscripts"
arch="noarch"
license="GPL-2.0+"
-makedepends=""
depends="perl"
checkdepends="shunit2"
+makedepends=""
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
source="https://cdn-aws.deb.debian.org/debian/pool/main/d/devscripts/devscripts_$pkgver.tar.xz"
builddir="$srcdir/devscripts-$pkgver"
@@ -33,9 +33,8 @@ bashcomp() {
depends=""
install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
- cd "$builddir"
- install -Dm644 "scripts/$pkgname.bash_completion" \
+ install -Dm644 "$builddir/scripts/$pkgname.bash_completion" \
"$subpkgdir/usr/share/bash-completion/completions/$pkgname"
}
-sha512sums="9313af1777d9a9932a81f95492b7cd423afbeacc8afbf6d9400e6430d2ce83abef0e0228a581f705f661183f605f2cadc95e11f1a43daf11fb968bcefc352422 devscripts_2.19.6.tar.xz"
+sha512sums="6e31862bc8f0d43678341f40ec527d76cdccc2e6e50c231eb7c6a1eb442f48b6c62e94126644224e9fdbef583be3166e2c7cc65ea15de4a7c20605089b708eb7 devscripts_2.19.7.tar.xz"
diff --git a/user/chelf/APKBUILD b/user/chelf/APKBUILD
index 6e7aff4c0..cf3b34228 100644
--- a/user/chelf/APKBUILD
+++ b/user/chelf/APKBUILD
@@ -14,12 +14,10 @@ subpackages=""
source="$pkgname-$pkgver.tar.xz::https://distfiles.adelielinux.org/source/$pkgname-$pkgver.txz"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
install -D -m755 chelf "$pkgdir"/usr/bin/chelf
}
diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD
index 01f3a13b7..e6a8f7303 100644
--- a/user/chrony/APKBUILD
+++ b/user/chrony/APKBUILD
@@ -10,11 +10,12 @@ url="https://chrony.tuxfamily.org"
pkgusers="$pkgname"
pkggroups="$pkgname"
arch="all"
+options="!check" # Test suite no longer functions after 2020-01-01.
license="GPL-2.0-only"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
depends=""
-makedepends="asciidoctor libcap-dev libedit-dev texinfo"
checkdepends="bash"
+makedepends="asciidoctor libcap-dev libedit-dev texinfo"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://download.tuxfamily.org/$pkgname/$pkgname-$pkgver.tar.gz
fix-tests.patch
@@ -41,7 +42,6 @@ prepare() {
}
build() {
- cd "$builddir"
CPPFLAGS="$CPPFLAGS -I./pps-tools/" ./configure \
--prefix=/usr \
--infodir=/usr/share/info \
@@ -55,12 +55,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/etc/logrotate.d
diff --git a/user/cifs-utils/APKBUILD b/user/cifs-utils/APKBUILD
index 436e0d909..798bb8a1e 100644
--- a/user/cifs-utils/APKBUILD
+++ b/user/cifs-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=cifs-utils
-pkgver=6.9
+pkgver=6.10
pkgrel=0
pkgdesc="CIFS filesystem user-space tools"
url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -9,17 +9,22 @@ arch="all"
options="!check suid" # No test suite.
license="GPL-3.0+ AND GPL-2.0+ AND LGPL-3.0+"
depends=""
-makedepends="keyutils-dev krb5-dev libcap-ng-dev linux-pam-dev
- py3-docutils talloc-dev"
+makedepends="keyutils-dev krb5-dev libcap-ng-dev linux-pam-dev py3-docutils
+ talloc-dev autoconf automake"
subpackages="$pkgname-doc $pkgname-dev"
source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2
musl-fix-includes.patch
- xattr_size_max.patch"
+ respect-destdir.patch
+ xattr_size_max.patch
+ "
+
+prepare() {
+ default_prepare
+ autoreconf -vif
+}
build() {
# --enable-cifsidmap and --enable-cifsacl require libwbclient (samba)
-
- autoreconf -i
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -43,6 +48,7 @@ package() {
chmod u+s "$pkgdir"/sbin/mount.cifs
}
-sha512sums="b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a cifs-utils-6.9.tar.bz2
+sha512sums="e19ca69b7948f01c1fd6a4ed069e00511588b903a5b8b0dc35ac1e00743170b9ca180b747c47d56cfacf273b296da21df60e1957404f26ebf2ba80bfa7e275cc cifs-utils-6.10.tar.bz2
99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch
+f3acb4f7873628d67c7dfb2378135c302fe382e314277829ea5569710bac0ddb43684aa6d143327d735aec641997084eaa567823b534138ed884bd74044b652a respect-destdir.patch
2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch"
diff --git a/user/cifs-utils/respect-destdir.patch b/user/cifs-utils/respect-destdir.patch
new file mode 100644
index 000000000..6330efc38
--- /dev/null
+++ b/user/cifs-utils/respect-destdir.patch
@@ -0,0 +1,18 @@
+--- cifs-utils-6.10/Makefile.am.old 2019-12-16 23:34:56.000000000 +0000
++++ cifs-utils-6.10/Makefile.am 2020-01-09 07:28:27.635229782 +0000
+@@ -119,11 +119,11 @@
+ SUBDIRS = contrib
+
+ install-exec-hook:
+- (cd $(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
++ (cd $(DESTDIR)$(ROOTSBINDIR) && ln -sf mount.cifs mount.smb3)
+
+ install-data-hook:
+- (cd $(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
++ (cd $(DESTDIR)$(man8dir) && ln -sf mount.cifs.8 mount.smb3.8)
+
+ uninstall-hook:
+- (cd $(ROOTSBINDIR) && rm -f $(ROOTSBINDIR)/mount.smb3)
+- (cd $(man8dir) && rm -f $(man8dir)/mount.smb3.8)
++ (cd $(DESTDIR)$(ROOTSBINDIR) && rm -f $(DESTDIR)$(ROOTSBINDIR)/mount.smb3)
++ (cd $(DESTDIR)$(man8dir) && rm -f $(DESTDIR)$(man8dir)/mount.smb3.8)
diff --git a/user/claws-mail/APKBUILD b/user/claws-mail/APKBUILD
index 1194f3c0e..f59ff40e1 100644
--- a/user/claws-mail/APKBUILD
+++ b/user/claws-mail/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=claws-mail
pkgver=3.17.4
-pkgrel=1
+pkgrel=2
pkgdesc="User-friendly, lightweight, and fast email client"
url="https://www.claws-mail.org/"
arch="all"
@@ -11,9 +11,16 @@ depends="compface"
makedepends="compface-dev curl-dev dbus-glib-dev enchant-dev gnutls-dev
gpgme-dev gtk+2.0-dev libcanberra-gtk2 libcanberra-dev libetpan-dev
libical-dev libnotify-dev librsvg-dev openldap-dev
- startup-notification-dev"
+ startup-notification-dev autoconf automake libtool"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz"
+source="https://www.claws-mail.org/download.php?file=releases/claws-mail-$pkgver.tar.xz
+ etpan.patch
+ "
+
+prepare() {
+ default_prepare
+ autoreconf -vif
+}
build() {
./configure \
@@ -36,4 +43,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012 claws-mail-3.17.4.tar.xz"
+sha512sums="4fc3b04d89c84b068654902d3d4f8ba66ec86c4ea9c4bd145fb3169dd26a2fcfc26adc8367b0ed90c69d095f6b1717ba3a9a52cc6d3e310a9dad1c3f733d8012 claws-mail-3.17.4.tar.xz
+39e70ba2edfad857d4c042db0fa38ac806cf188d1cf7642b92d0115e162349919df7b98ade49da822fb1b299c5ef06d221b5c600e218ed33e0e8a48c3635d0a2 etpan.patch"
diff --git a/user/claws-mail/etpan.patch b/user/claws-mail/etpan.patch
new file mode 100644
index 000000000..572380d2e
--- /dev/null
+++ b/user/claws-mail/etpan.patch
@@ -0,0 +1,97 @@
+diff --git a/configure.ac b/configure.ac
+index 412a3f014..6a80c2a92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -908,38 +908,62 @@ fi
+ dnl Libetpan
+ AC_MSG_CHECKING([whether to use libetpan])
+ if test x"$enable_libetpan" = xyes; then
+- AC_MSG_RESULT(yes)
+- libetpan_result=no
+- AC_PATH_PROG(libetpanconfig, [libetpan-config])
+- if test "x$libetpanconfig" != "x"; then
+- CPPFLAGS="$CPPFLAGS `$libetpanconfig --cflags 2>/dev/null`"
+- AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
+- if test "x$libetpan_result" = "xyes"; then
+- AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
+- LIBS="$LIBS `$libetpanconfig --libs 2>/dev/null`"
+- AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
+- AC_MSG_RESULT([$libetpan_result])
+- fi
+- fi
+- if test "x$libetpan_result" = "xyes"; then
+- LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
+- LIBETPAN_LIBS="`$libetpanconfig --libs`"
+- LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
+- if test "$LIBETPAN_VERSION" -lt "57"; then
+- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
+- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
++ AC_MSG_RESULT(yes)
++
++ libetpan_config=no
++ libetpan_result=no
++ libetpan_versiontype=0
++
++ # since 1.9.4, libetpan uses pkg-config
++ PKG_CHECK_MODULES([LIBETPAN], [libetpan >= 1.9.4],
++ [
++ LIBETPAN_VERSION=`pkg-config --modversion | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
++ libetpan_config=yes
++ ],
++ [
++ # before 1.9.4, libetpan uses its own libetpan-config script
++ AC_PATH_PROG(libetpanconfig, [libetpan-config])
++ if test "x$libetpanconfig" != "x"; then
++ LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
++ LIBETPAN_LIBS="`$libetpanconfig --libs`"
++ # support libetpan version like x.x and x.x.x
++ libetpan_versiontype=`$libetpanconfig --version | tr -dc . | wc -c`
++ if test $libetpan_versiontype -eq 1; then
++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 100) + $2}'`
++ else
++ LIBETPAN_VERSION=`$libetpanconfig --version | $AWK -F. '{printf "%d", ($1 * 10000) + ($2 * 100) + $3}'`
++ fi
++ libetpan_config=yes
++ fi
++ ])
++ if test "x$libetpan_config" = "xyes"; then
++ CPPFLAGS="$CPPFLAGS $LIBETPAN_FLAGS"
++ AC_CHECK_HEADER(libetpan/libetpan.h, [libetpan_result=yes])
++ if test "x$libetpan_result" = "xyes"; then
++ AC_MSG_CHECKING([whether libetpan-config hints compiles and links fine])
++ LIBS="$LIBS $LIBETPAN_LIBS"
++ AC_TRY_LINK([#include <libetpan/dbstorage.h>], [db_mailstorage_init(NULL, NULL);], [libetpan_result=yes], [libetpan_result=no])
++ AC_MSG_RESULT([$libetpan_result])
++ fi
++ fi
++ if test "x$libetpan_result" = "xyes"; then
++ if test $libetpan_versiontype -eq 1; then
++ if test "$LIBETPAN_VERSION" -lt "57"; then
++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/])
++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
+ AC_MSG_ERROR([libetpan 0.57 not found])
+- fi
+- AC_SUBST(LIBETPAN_FLAGS)
+- AC_SUBST(LIBETPAN_LIBS)
+- AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
+- else
+- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
+- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
+- AC_MSG_ERROR([libetpan 0.57 not found])
+- fi
++ fi
++ fi
++ AC_SUBST(LIBETPAN_FLAGS)
++ AC_SUBST(LIBETPAN_LIBS)
++ AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNit TP support.)
++ else
++ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 or newer. See http://www.etpan.org/ ])
++ AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
++ AC_MSG_ERROR([libetpan 0.57 not found])
++ fi
+ else
+- AC_MSG_RESULT(no)
++ AC_MSG_RESULT(no)
+ fi
+ AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
+
diff --git a/user/clearsans/APKBUILD b/user/clearsans/APKBUILD
index 2f8f486d0..82c7a7291 100644
--- a/user/clearsans/APKBUILD
+++ b/user/clearsans/APKBUILD
@@ -15,8 +15,7 @@ source="https://01.org/sites/default/files/downloads/clear-sans/clearsans-$pkgve
builddir="$srcdir"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ TTF/*.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/TTF/*.ttf
}
sha512sums="83faebae8b1041ab16bb3c6586574374f70ad1da406ad5d20f07f14b65e00e8645c5393471cea0194b14f2c2d926d6de814f745299062a4dccef2581e6de332d clearsans-1.00.zip"
diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD
index 86ddd5c59..c05fdc470 100644
--- a/user/cloc/APKBUILD
+++ b/user/cloc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=cloc
pkgver=1.84
pkgrel=0
@@ -9,22 +9,20 @@ arch="noarch"
license="GPL-2.0+"
depends="perl perl-regexp-common perl-algorithm-diff"
checkdepends="perl-parallel-forkmanager"
+makedepends=""
subpackages="$pkgname-doc"
source="https://github.com/AlDanial/cloc/releases/download/$pkgver/cloc-$pkgver.tar.gz"
build() {
- cd Unix
- make DESTDIR="$pkgdir" doc
+ make DESTDIR="$pkgdir" -C Unix doc
}
check() {
- cd Unix
- make DESTDIR="$pkgdir" test-perl
+ make DESTDIR="$pkgdir" -C Unix test-perl
}
package() {
- cd Unix
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C Unix install
}
sha512sums="cfcc1854d7f3257bcd66f13b1053a856ae31acc35f94537e20cbb341ab256390bded1f00ff6b1ce2bc60a1a69379b6915d398297e2f878bc4eea190c59b22669 cloc-1.84.tar.gz"
diff --git a/user/clucene/APKBUILD b/user/clucene/APKBUILD
index 2c5e047e4..c76e42c3c 100644
--- a/user/clucene/APKBUILD
+++ b/user/clucene/APKBUILD
@@ -21,14 +21,12 @@ builddir="$srcdir/$pkgname-core-$pkgver"
prepare() {
default_prepare
- cd "$builddir"
# Do not use bundled zlib or boost
sed -ie '/ADD_SUBDIRECTORY (src\/ext)/d' CMakeLists.txt
rm -rf src/ext
}
build() {
- cd "$builddir"
cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_CONTRIBS_LIB=BOOL:ON \
@@ -39,8 +37,6 @@ build() {
}
check() {
- cd "$builddir"
-
# clucene is not smart enough to delete files between successive checks,
# so let's remove them for it. Otherwise, if check is run a second time
# without clearing the files beforehand, a lot of tests will fail.
@@ -56,7 +52,6 @@ check() {
}
package() {
- cd "$builddir"
make install/fast DESTDIR="$pkgdir"
rm -r "$pkgdir"/usr/lib/CLuceneConfig.cmake
}
diff --git a/user/clutter/APKBUILD b/user/clutter/APKBUILD
index d2a53b372..962fcf3e7 100644
--- a/user/clutter/APKBUILD
+++ b/user/clutter/APKBUILD
@@ -1,20 +1,20 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=clutter
pkgver=1.26.2
pkgrel=0
pkgdesc="OpenGL-based interactive canvas library"
url="https://gnome.org"
arch="all"
-options="!check" # testsuite skipped all tests
+options="!check" # Test suite skipped all tests.
license="LGPL-2.0+ AND MIT AND LGPL-2.1+ AND GPL-2.0+"
+depends=""
makedepends="glib-dev mesa-dev cogl-dev cairo-dev pango-dev json-glib-dev
atk-dev vala gobject-introspection-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.gnome.org/sources/clutter/1.26/clutter-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/cm-unicode/APKBUILD b/user/cm-unicode/APKBUILD
index 30a09c8a0..26e26d477 100644
--- a/user/cm-unicode/APKBUILD
+++ b/user/cm-unicode/APKBUILD
@@ -14,8 +14,7 @@ subpackages=""
source="https://downloads.sourceforge.net/cm-unicode/cm-unicode-$pkgver-ttf.tar.xz"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
}
sha512sums="6340b7c6b220c8c887a4b77e77a01a43bedf13d08dd1d62570de70866d0bff908adf3fcb7907149ab2f5ab060650b39eaad3c01c1e8d028bbeb879b058190e70 cm-unicode-0.7.0-ttf.tar.xz"
diff --git a/user/cmocka/APKBUILD b/user/cmocka/APKBUILD
new file mode 100644
index 000000000..302249363
--- /dev/null
+++ b/user/cmocka/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=cmocka
+pkgver=1.1.5
+pkgrel=0
+pkgdesc="Unit testing framework for C"
+url="https://cmocka.org/"
+arch="all"
+license="Apache-2.0"
+depends=""
+makedepends="cmake"
+subpackages="$pkgname-dev"
+source="https://cmocka.org/files/1.1/cmocka-$pkgver.tar.xz
+ uintptr_t.patch
+ "
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ ${CMAKE_CROSSOPTS} \
+ -Bbuild
+ make -C build
+}
+
+check() {
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
+}
+
+package() {
+ make DESTDIR="$pkgdir" -C build install
+}
+
+sha512sums="cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd cmocka-1.1.5.tar.xz
+8f928bc6bf4bbe43f461b6387d63ba9c63ef97496e93a13fd28b423767ced8c6935ea40f1a054145bb8efbf2c9b88c4b130a49d55e498da7aab0624fae4e1e44 uintptr_t.patch"
diff --git a/user/cmocka/uintptr_t.patch b/user/cmocka/uintptr_t.patch
new file mode 100644
index 000000000..2950e3933
--- /dev/null
+++ b/user/cmocka/uintptr_t.patch
@@ -0,0 +1,25 @@
+--- cmocka-1.1.5/include/cmocka.h.old 2019-03-28 12:33:50.000000000 +0000
++++ cmocka-1.1.5/include/cmocka.h 2020-01-14 10:59:11.716464203 +0000
+@@ -123,21 +123,7 @@
+ # elif defined(_WIN64)
+ typedef unsigned long int uintptr_t;
+ # else /* _WIN32 */
+-
+-/* ILP32 and LP64 platforms */
+-# ifdef __WORDSIZE /* glibc */
+-# if __WORDSIZE == 64
+- typedef unsigned long int uintptr_t;
+-# else
+- typedef unsigned int uintptr_t;
+-# endif /* __WORDSIZE == 64 */
+-# else /* __WORDSIZE */
+-# if defined(_LP64) || defined(_I32LPx)
+- typedef unsigned long int uintptr_t;
+-# else
+- typedef unsigned int uintptr_t;
+-# endif
+-# endif /* __WORDSIZE */
++# include <stdint.h>
+ # endif /* _WIN32 */
+
+ # define _UINTPTR_T
diff --git a/user/cmus/APKBUILD b/user/cmus/APKBUILD
index 63f7a6758..936cfbff2 100644
--- a/user/cmus/APKBUILD
+++ b/user/cmus/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=1
pkgdesc="An ncurses based music player with plugin support for many formats"
url="https://cmus.github.io/"
arch="all"
-options="!check" # no test suite
+options="!check" # No test suite.
license="GPL-2.0+"
depends=""
makedepends="alsa-lib-dev faad2-dev ffmpeg-dev flac-dev libao-dev libcddb-dev
@@ -14,10 +14,10 @@ makedepends="alsa-lib-dev faad2-dev ffmpeg-dev flac-dev libao-dev libcddb-dev
opusfile-dev pulseaudio-dev wavpack-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
- ppc-libatomic.patch"
+ ppc-libatomic.patch
+ "
build() {
- cd "$builddir"
./configure prefix=/usr \
CONFIG_AAC=y \
CONFIG_ALSA=y \
@@ -57,7 +57,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" PREFIX=/usr install
}
diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD
index f7e7b699c..988e85e8f 100644
--- a/user/cogl/APKBUILD
+++ b/user/cogl/APKBUILD
@@ -1,20 +1,20 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=cogl
pkgver=1.22.4
pkgrel=0
pkgdesc="GObject-based GL/GLES abstraction library"
url="https://gnome.org"
arch="all"
-options="!check" # broken testsuite, no logs/messages to determine why
+options="!check" # broken testsuite, no logs/messages to determine why
license="MIT AND SGI-B-2.0 AND BSD-3-Clause AND Public-Domain AND LGPL-2.0+ AND Apache-2.0"
+depends=""
makedepends="glib-dev libxcomposite-dev libxrandr-dev mesa-dev cairo-dev
pango-dev vala gobject-introspection-dev gdk-pixbuf-dev"
subpackages="$pkgname-dev $pkgname-lang"
source="https://download.gnome.org/sources/cogl/1.22/cogl-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +28,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/comfortaa/APKBUILD b/user/comfortaa/APKBUILD
index cca3023f9..98118e63f 100644
--- a/user/comfortaa/APKBUILD
+++ b/user/comfortaa/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=comfortaa
-pkgver=3.001
+pkgver=3.101
pkgrel=0
pkgdesc="Stylish, modern, free TrueType font"
url="https://www.deviantart.com/aajohan/art/Comfortaa-font-105395949"
@@ -11,13 +11,11 @@ license="OFL-1.1"
depends="fontconfig"
makedepends=""
subpackages=""
-source="https://distfiles.adelielinux.org/source/comfortaa-$pkgver.zip"
-builddir="$srcdir/$pkgver"
+source="$pkgname-$pkgver.tar.gz::https://github.com/alexeiva/comfortaa/archive/3.101.tar.gz"
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/
- install -D -m644 *.ttf "$pkgdir"/usr/share/fonts/X11/TTF/
+ install -D -m644 "$builddir"/fonts/TTF/*.ttf "$pkgdir"/usr/share/fonts/X11/TTF/
}
-sha512sums="caf998f9a1dd994f790a2ace1fcc8bf5632f21a61d849e6b5590d808d646556115ec08142397817d9dcfc1bb507d62ca52caf061e5c6048f89bc77f6e74c1f4b comfortaa-3.001.zip"
+sha512sums="0411960f72729513c234de753271e311465968ea62975201e1d54125aee16520a065f983b37e588f91cf7e5d0f439e7f1095ea02ea13f94b605b4b72ff626b7f comfortaa-3.101.tar.gz"
diff --git a/user/comic-neue/APKBUILD b/user/comic-neue/APKBUILD
index dc12db220..6becb4de9 100644
--- a/user/comic-neue/APKBUILD
+++ b/user/comic-neue/APKBUILD
@@ -15,8 +15,7 @@ source="$pkgname-$pkgver.zip::https://github.com/crozynski/comicneue/archive/v$p
builddir="$srcdir/comicneue-$pkgver"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ OTF/*.otf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/OTF/*.otf
}
sha512sums="12c93efc00e1caecd6be9080de37ecf2049384185c4043dc250945b7cb47fbbe3fcc973ebdf7d58f3351ba11f87341c24af7e1039b873d463b0d84da9c72f0b8 comic-neue-2.4.zip"
diff --git a/user/command-not-found/APKBUILD b/user/command-not-found/APKBUILD
index 96cd1127d..ed9919343 100644
--- a/user/command-not-found/APKBUILD
+++ b/user/command-not-found/APKBUILD
@@ -11,13 +11,12 @@ license="MIT"
depends="apk-tools"
makedepends=""
subpackages="$pkgname-bash $pkgname-zsh"
-source="$pkgname-$pkgver.tar.gz::https://git.dereferenced.org/kaniini/command-not-found/archive/v$pkgver.tar.gz
+source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz
explicit-apk-path.patch
"
builddir="$srcdir/$pkgname"
package() {
- cd "$builddir"
install -d -D -m755 "$pkgdir"/usr/libexec
install -m755 command-not-found.sh "$pkgdir"/usr/libexec/command-not-found
}
@@ -25,17 +24,15 @@ package() {
bash() {
pkgdesc="$pkgdesc (Bash shell support)"
install_if="$pkgname=$pkgver-r$pkgrel bash"
- cd "$builddir"
install -d -D -m755 "$subpkgdir"/etc/profile.d/
- install -m755 profiles/command-not-found.ash "$subpkgdir"/etc/profile.d/command-not-found.sh
+ install -m755 "$builddir"/profiles/command-not-found.ash "$subpkgdir"/etc/profile.d/command-not-found.sh
}
zsh() {
pkgdesc="$pkgdesc (Z shell support)"
install_if="$pkgname=$pkgver-r$pkgrel zsh"
- cd "$builddir"
install -d -D -m755 "$subpkgdir"/etc/zprofile.d/
- install -m755 profiles/command-not-found.zsh "$subpkgdir"/etc/zprofile.d/command-not-found.zsh
+ install -m755 "$builddir"/profiles/command-not-found.zsh "$subpkgdir"/etc/zprofile.d/command-not-found.zsh
}
sha512sums="a9fc6cf063195abf4bbf015f770b93fb23e2afc0efbed10a54adc1e0d38d7f9a57ab5817a52e483dd01aa21888e76f5aaefdbf89c835f227be2f150848ddb7ad command-not-found-0.3.tar.gz
diff --git a/user/compface/APKBUILD b/user/compface/APKBUILD
index 0c742f166..6cc0b4c03 100644
--- a/user/compface/APKBUILD
+++ b/user/compface/APKBUILD
@@ -9,13 +9,11 @@ arch="all"
options="!check" # No test suite.
license="MIT"
depends=""
-depends_dev=""
-makedepends="$depends_dev"
+makedepends=""
subpackages="$pkgname-dev $pkgname-doc"
source="http://ftp.xemacs.org/pub/xemacs/aux/compface-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
make prefix="$pkgdir"/usr MANDIR="$pkgdir"/usr/share/man install
}
diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD
index 1753aff6c..3899919dd 100644
--- a/user/compton-conf/APKBUILD
+++ b/user/compton-conf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=compton-conf
pkgver=0.14.1
pkgrel=0
@@ -15,11 +15,9 @@ subpackages=""
source="https://github.com/lxqt/compton-conf/releases/download/$pkgver/compton-conf-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -27,13 +25,12 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="76cacb0960112ab3d0b7a05fba3ac2418c2bd37f4273fc20383b49ce035fd045a2a8e8a1ae5a8a5dc116f46ab6ccd7a5764dd2c3ec64822d930c7dd268533db4 compton-conf-0.14.1.tar.xz"
diff --git a/user/compton/APKBUILD b/user/compton/APKBUILD
index 338f123de..82b9cc638 100644
--- a/user/compton/APKBUILD
+++ b/user/compton/APKBUILD
@@ -1,20 +1,20 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=compton
pkgver=4
pkgrel=0
pkgdesc="Lightweight compositor for X11"
url="https://github.com/yshui/compton"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="MIT AND MPL-2.0"
+depends=""
makedepends="meson libx11-dev libxext-dev libev-dev xcb-util-renderutil-dev
xcb-util-image-dev pixman-dev libconfig-dev pcre-dev mesa-dev
dbus-dev"
-source="compton-$pkgver.tar.gz::https://github.com/yshui/compton/archive/v$pkgver.tar.gz"
+source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
meson \
--prefix=/usr \
--sysconfdir=/etc \
@@ -26,7 +26,6 @@ build() {
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" ninja -C output install
}
diff --git a/user/confuse/APKBUILD b/user/confuse/APKBUILD
index 4055055eb..efc38ab5c 100644
--- a/user/confuse/APKBUILD
+++ b/user/confuse/APKBUILD
@@ -4,17 +4,15 @@ pkgname=confuse
pkgver=3.2.2
pkgrel=0
pkgdesc="Small configuration file parser library for C"
-url="https://github.com/martinh/libconfuse"
+url=" "
arch="all"
-options="!checkroot"
license="ISC"
depends=""
makedepends=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz"
+source="https://github.com/martinh/libconfuse/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/convertlit/APKBUILD b/user/convertlit/APKBUILD
index 49cce0d46..d7b886afb 100644
--- a/user/convertlit/APKBUILD
+++ b/user/convertlit/APKBUILD
@@ -17,13 +17,11 @@ source="http://www.convertlit.com/${pkgname}${pkgver/./}src.zip
builddir="$srcdir/"
build() {
- cd "$builddir"
make -C lib
make -C clit18
}
package() {
- cd "$builddir"
install -D -m755 clit18/clit "$pkgdir"/usr/bin/clit
}
diff --git a/user/courier-prime/APKBUILD b/user/courier-prime/APKBUILD
index 94cdce083..950e88c1f 100644
--- a/user/courier-prime/APKBUILD
+++ b/user/courier-prime/APKBUILD
@@ -14,8 +14,7 @@ subpackages=""
source="https://dev.gentoo.org/~jstein/dist/courier-prime-$pkgver.tar.xz"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
}
sha512sums="fef9d7f09dafbdb9d8626cb06cac617319d5ec43aef29fe7f6ee25156b380f9ec9684715d6012f05cb40d9511d44cf36a9ed1951281218b2c545e6ce4e7cdbda courier-prime-1.203.tar.xz"
diff --git a/user/coverage/APKBUILD b/user/coverage/APKBUILD
index 1cea3561d..adbca0392 100644
--- a/user/coverage/APKBUILD
+++ b/user/coverage/APKBUILD
@@ -8,23 +8,20 @@ url="https://coverage.readthedocs.io/"
arch="all"
license="Apache-2.0"
depends="python3"
-makedepends="python3-dev"
checkdepends="py3-tox"
+makedepends="python3-dev"
subpackages=""
-source="https://files.pythonhosted.org/packages/35/fe/e7df7289d717426093c68d156e0fd9117c8f4872b6588e8a8928a0f68424/coverage-$pkgver.tar.gz"
+source="https://files.pythonhosted.org/packages/source/c/coverage/coverage-$pkgver.tar.gz"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py check
}
package() {
- cd "$builddir"
python3 setup.py install --prefix="/usr" --root="$pkgdir"
}
diff --git a/user/cppunit/APKBUILD b/user/cppunit/APKBUILD
index f334d23f1..4efda7916 100644
--- a/user/cppunit/APKBUILD
+++ b/user/cppunit/APKBUILD
@@ -1,17 +1,18 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=cppunit
-pkgver=1.14.0
+pkgver=1.15.1
pkgrel=0
pkgdesc="C++ unit testing framework"
url="https://www.freedesktop.org/wiki/Software/cppunit/"
arch="all"
license="LGPL-2.1+"
+depends=""
+makedepends=""
subpackages="$pkgname-dev $pkgname-doc"
source="http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
LIBS="-ldl" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,13 +25,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e cppunit-1.14.0.tar.gz"
+sha512sums="0feb47faec451357bb4c4e287efa17bb60fd3ad966d5350e9f25b414aaab79e94921024b0c0497672f8d3eeb22a599213d2d71d9e1d28b243b3e37f3a9a43691 cppunit-1.15.1.tar.gz"
diff --git a/user/cram/APKBUILD b/user/cram/APKBUILD
index 73bb7c8cc..505e64ef8 100644
--- a/user/cram/APKBUILD
+++ b/user/cram/APKBUILD
@@ -8,26 +8,23 @@ url="https://bitheap.org/cram/"
arch="noarch"
license="GPL-2.0-only"
depends="python3"
-makedepends="cmd:which"
checkdepends="coverage"
+makedepends="cmd:which"
subpackages=""
source="https://bitheap.org/cram/cram-$pkgver.tar.gz
die-py2-die.patch
"
build() {
- cd "$builddir"
make PYTHON=python3
}
check() {
- cd "$builddir"
# tests are not 100% coverage
make PYTHON=python3 check || true
}
package() {
- cd "$builddir"
# we can't use make because there's no --root option
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/ctags/APKBUILD b/user/ctags/APKBUILD
index bdc83ed14..135c0326d 100644
--- a/user/ctags/APKBUILD
+++ b/user/ctags/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
source="https://prdownloads.sourceforge.net/ctags/ctags-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
install -D -m755 ctags "$pkgdir"/usr/bin/ctags
install -D -m644 ctags.1 "$pkgdir"/usr/share/man/man1/ctags.1
}
diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD
index 9a484828f..efb5baccc 100644
--- a/user/cups-filters/APKBUILD
+++ b/user/cups-filters/APKBUILD
@@ -7,10 +7,10 @@ url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
arch="all"
license="GPL-2.0-only AND GPL-2.0+ AND GPL-3.0-only AND MIT"
depends="gnu-ghostscript poppler-utils bc ttf-freefont"
+checkdepends="ttf-dejavu"
makedepends="cups-dev libjpeg-turbo-dev poppler-dev zlib-dev libpng-dev
tiff-dev lcms2-dev freetype-dev fontconfig-dev qpdf-dev dbus-dev linux-headers
coreutils gnutls-dev python3"
-checkdepends="ttf-dejavu"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz"
diff --git a/user/cve-check-tool/APKBUILD b/user/cve-check-tool/APKBUILD
index 879cdcada..055d49fe2 100644
--- a/user/cve-check-tool/APKBUILD
+++ b/user/cve-check-tool/APKBUILD
@@ -9,9 +9,9 @@ url="https://code.foxkit.us/sroracle/cve-check-tool"
arch="all"
license="GPL-2.0+"
depends=""
-makedepends="bash curl-dev glib-dev gobject-introspection-dev
- jansson-dev libxml2-dev openssl-dev sqlite-dev"
checkdepends="check-dev"
+makedepends="autoconf automake bash curl-dev glib-dev gobject-introspection-dev
+ jansson-dev libtool libxml2-dev openssl-dev sqlite-dev"
subpackages="$pkgname-doc"
source="https://dev.sick.bike/dist/cve-check-tool-$_pkgver.tar.gz"
builddir="$srcdir/$pkgname-$_pkgver"
diff --git a/user/dconf/APKBUILD b/user/dconf/APKBUILD
index 88160df56..3495c4f93 100644
--- a/user/dconf/APKBUILD
+++ b/user/dconf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=dconf
pkgver=0.34.0
pkgrel=0
@@ -12,7 +12,9 @@ depends="dbus"
makedepends="meson ninja
bash-completion dbus-dev docbook-xsl libxslt-dev python3-dev vala-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/dconf/${pkgver%.*}/dconf-$pkgver.tar.xz
+ meson.patch
+ "
build() {
meson \
@@ -30,4 +32,5 @@ package() {
DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 dconf-0.34.0.tar.xz"
+sha512sums="8b28373f31fe36ba3f21f56fca84563681c3648ff595709880cd9ac49fc6b130ac375fb89fd585f1dd62b5a2f728127292ea57d18feca1147b709a93e8c4c743 dconf-0.34.0.tar.xz
+be807b17c20c829b307da2df23252893f99f47845825328a0b1880aad9d97f85fe1d66be3903e8c1cc62bb6daa2baf1462bc09daf397c31394e7159ede07d58c meson.patch"
diff --git a/user/dconf/meson.patch b/user/dconf/meson.patch
new file mode 100644
index 000000000..77d980e31
--- /dev/null
+++ b/user/dconf/meson.patch
@@ -0,0 +1,35 @@
+From cc32667c5d7d9ff95e65cc21f59905d8f9218394 Mon Sep 17 00:00:00 2001
+From: Diego Escalante Urrelo <diegoe@gnome.org>
+Date: Thu, 31 Oct 2019 05:51:22 -0500
+Subject: [PATCH] build: Update use of link_whole for meson-0.52
+
+A regression in meson-0.52 caused uses of link_whole to expose scenarios
+where duplicate symbols issues could appear. In particular
+libdconf_client_dep was being link_whole'd to itself, which recursively
+already included libdconf_common which was also a link_whole.
+
+This change does not modify the available symbols in libdconf.so, and is
+compatible with meson-0.52 and 0.51.
+
+See: https://github.com/mesonbuild/meson/pull/6030
+Fixes: https://gitlab.gnome.org/GNOME/dconf/issues/59
+---
+ client/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/client/meson.build b/client/meson.build
+index f3b7122..de6387e 100644
+--- a/client/meson.build
++++ b/client/meson.build
+@@ -28,7 +28,7 @@ libdconf_client = static_library(
+
+ libdconf_client_dep = declare_dependency(
+ dependencies: gio_dep,
+- link_whole: libdconf_client,
++ link_with: libdconf_client,
+ )
+
+ libdconf = shared_library(
+--
+2.24.1
+
diff --git a/user/ddrescue/APKBUILD b/user/ddrescue/APKBUILD
index 6fd0c0a02..a62b71c5e 100644
--- a/user/ddrescue/APKBUILD
+++ b/user/ddrescue/APKBUILD
@@ -5,13 +5,14 @@ pkgver=1.24
pkgrel=0
pkgdesc="Data recovery tool for block devices with errors"
url="https://www.gnu.org/s/ddrescue/ddrescue.html"
-license="GPL-3.0+"
arch="all !aarch64"
+license="GPL-3.0+"
+depends=""
+makedepends=""
subpackages="$pkgname-doc"
-source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz"
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.lz"
build() {
- cd "$builddir"
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
@@ -20,17 +21,10 @@ build() {
}
check() {
- cd "$builddir"
-
- # XXX: Some tests fail on s390x, but only on builder, so ignore it for now.
- case "$CARCH" in
- s390x) make check || true;;
- *) make check;;
- esac
+ make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD
index 8c9ed8bc0..ce37435d9 100644
--- a/user/dhcpcd/APKBUILD
+++ b/user/dhcpcd/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=dhcpcd
-pkgver=8.0.6
+pkgver=8.1.5
pkgrel=0
pkgdesc="RFC2131 compliant DHCP client"
url="https://roy.marples.name/projects/dhcpcd"
@@ -18,8 +18,6 @@ source="https://roy.marples.name/downloads/dhcpcd/$pkgname-$pkgver.tar.xz
"
build() {
- cd "$builddir"
-
CFLAGS="$CFLAGS -D_GNU_SOURCE -DHAVE_PRINTF_M"
./configure \
--build=$CBUILD \
@@ -35,18 +33,15 @@ build() {
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/dhcpcd.initd \
"$pkgdir"/etc/init.d/dhcpcd
}
-sha512sums="19a568800a4e510a250de7cc111700b364c68bfe3907f1ac2cda81aacd079cb9ac87731cbabbf8f1e85e055a11c7ba88e419f6c4d7b33f8842dfaeadc7d1e193 dhcpcd-8.0.6.tar.xz
+sha512sums="59c8ae255b18b6678b22d4bd5f6797ac20e762d1d22e5ba4c0aefce5ec0d4f863876c06c03dd4c5e71f4d65884474cef9c29f95658eac55097603becd96e3846 dhcpcd-8.1.5.tar.xz
1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5 fix-chrony-conf-location.patch
e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880 dhcpcd.initd"
diff --git a/user/dina/APKBUILD b/user/dina/APKBUILD
index 628675765..0bce275b4 100644
--- a/user/dina/APKBUILD
+++ b/user/dina/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=dina
pkgver=2.93
pkgrel=0
@@ -8,7 +8,7 @@ url="https://www.dcmembers.com/jibsen/download/61/"
arch="noarch"
options="!check" # No tests
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf"
source="$pkgname-$pkgver.zip::https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61&refresh=5c64600776bf51550082055"
builddir="$srcdir/BDF"
diff --git a/user/diskdev_cmds/APKBUILD b/user/diskdev_cmds/APKBUILD
index 1b071453c..59e8f58ab 100644
--- a/user/diskdev_cmds/APKBUILD
+++ b/user/diskdev_cmds/APKBUILD
@@ -6,11 +6,10 @@ pkgrel=0
pkgdesc="HFS+ utilities ported from OS X 10.8.4 (fsck/mkfs)"
url="https://opensource.apple.com/release/mac-os-x-10411ppc.html"
arch="all"
+options="!check" # No test suite.
license="APSL-2.0"
depends=""
makedepends="bsd-compat-headers openssl-dev"
-install=""
-options="!check"
subpackages="$pkgname-doc"
source="https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-$pkgver.tar.gz
linux.patch
@@ -19,12 +18,10 @@ source="https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-$pkgver.
builddir="$srcdir/diskdev_cmds-$pkgver"
build() {
- cd "$builddir"
make -f Makefile.lnx
}
package() {
- cd "$builddir"
install -D -m755 "$builddir"/fsck_hfs.tproj/fsck_hfs "$pkgdir"/sbin/fsck_hfs
install -m755 "$builddir"/newfs_hfs.tproj/newfs_hfs "$pkgdir"/sbin/newfs_hfs
ln -s fsck_hfs "$pkgdir"/sbin/fsck.hfs
diff --git a/user/dmidecode/APKBUILD b/user/dmidecode/APKBUILD
index 811c0a361..0d6ff8ac4 100644
--- a/user/dmidecode/APKBUILD
+++ b/user/dmidecode/APKBUILD
@@ -7,17 +7,16 @@ url="http://www.nongnu.org/dmidecode"
arch="all"
options="!check" # No test suite.
license="GPL-2.0-only"
+depends=""
+makedepends=""
subpackages="$pkgname-doc"
-source="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-$pkgver.tar.xz
- "
+source="http://download.savannah.gnu.org/releases/dmidecode/dmidecode-$pkgver.tar.xz"
build() {
- cd "$builddir"
make prefix=/usr
}
package() {
- cd "$builddir"
make prefix=/usr DESTDIR="${pkgdir}" install
}
diff --git a/user/docbook2x/APKBUILD b/user/docbook2x/APKBUILD
index 463e60300..24f2fb23e 100644
--- a/user/docbook2x/APKBUILD
+++ b/user/docbook2x/APKBUILD
@@ -20,7 +20,6 @@ source="https://downloads.sourceforge.net/docbook2x/docbook2X-$pkgver.tar.gz
builddir="$srcdir/docbook2X-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"/test/refentry
- make check
+ make -C test/refentry check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD
index 732b54a1f..5a02c3c12 100644
--- a/user/dolphin/APKBUILD
+++ b/user/dolphin/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dolphin
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Lightweight desktop file manager"
url="https://www.kde.org/applications/system/dolphin/"
@@ -16,10 +16,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev kinit-dev
baloo-dev kfilemetadata-dev kdelibs4support-dev kactivities-dev
baloo-widgets-dev ruby-test-unit"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/dolphin-$pkgver.tar.xz
- baloo.patch
- frameworks.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/dolphin-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -32,7 +29,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -44,6 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="97ba07fc6e5f7295297149b8377620c0fb9dedec33833671f29e39f8cb4fb78051bd21d7d63b1dfc48126b03195b3eecc831c3882346a86fbb6ff1122996cbbc dolphin-19.08.2.tar.xz
-9c61e0fd899d172f1a5e67f9621099c69ce673a1c66cc948dcf3bd74278c8fc206a029d33c56934fb7b42a91191c1259d966d4b39e4208226e9830c9f27ec411 baloo.patch
-08801b4ae25e1f64eeb2b574bc09eed526f0fa570a6c12982db55aa5aa26498191c1a15c73bdb37664204cadd84abe80c9168f298558861010183af9e6c30368 frameworks.patch"
+sha512sums="a00b13abe9036ac82d4c8c42fe54ad4174d6ca49d733a1ecb86825ce8bfb63d1996d6918afbd3b1681b49eb30754c7dc20017efe0728072b82f6327cd86baec4 dolphin-19.12.1.tar.xz"
diff --git a/user/dolphin/baloo.patch b/user/dolphin/baloo.patch
deleted file mode 100644
index 48efb30ed..000000000
--- a/user/dolphin/baloo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Subject: Revert "handle maps with multiple or single entries from Baloo"
-
-This reverts commit 36b61838a27df32824c58f383453bb94b730b52c.
-
-diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
-index 469f079..f367154 100644
---- a/src/kitemviews/private/kbaloorolesprovider.cpp
-+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
-@@ -56,34 +56,18 @@ QHash<QByteArray, QVariant> KBalooRolesProvider::roleValues(const Baloo::File& f
- {
- QHash<QByteArray, QVariant> values;
-
-+ QMapIterator<KFileMetaData::Property::Property, QVariant> it(file.properties());
-+ while (it.hasNext()) {
-+ it.next();
-- using entry = std::pair<const KFileMetaData::Property::Property&, const QVariant&>;
--
-- const auto& propMap = file.properties();
-- auto rangeBegin = propMap.constKeyValueBegin();
--
-- while (rangeBegin != propMap.constKeyValueEnd()) {
-- auto key = (*rangeBegin).first;
-- const KFileMetaData::PropertyInfo propertyInfo(key);
-- const QByteArray role = roleForProperty(propertyInfo.name());
--
-- auto rangeEnd = std::find_if(rangeBegin, propMap.constKeyValueEnd(),
-- [key](const entry& e) { return e.first != key; });
-
-+ const KFileMetaData::PropertyInfo pi(it.key());
-+ const QString property = pi.name();
-+ const QByteArray role = roleForProperty(property);
- if (role.isEmpty() || !roles.contains(role)) {
-- rangeBegin = rangeEnd;
- continue;
- }
-
-+ values.insert(role, pi.formatAsDisplayString(it.value()));
-- auto distance = std::distance(rangeBegin, rangeEnd);
-- if (distance > 1) {
-- QVariantList list;
-- list.reserve(static_cast<int>(distance));
-- std::for_each(rangeBegin, rangeEnd, [&list](const entry& s) { list.append(s.second); });
-- values.insert(role, propertyInfo.formatAsDisplayString(list));
-- } else {
-- values.insert(role, propertyInfo.formatAsDisplayString((*rangeBegin).second));
-- }
-- rangeBegin = rangeEnd;
- }
-
- KFileMetaData::UserMetaData md(file.path());
---
-cgit v1.1
-
diff --git a/user/dolphin/frameworks.patch b/user/dolphin/frameworks.patch
deleted file mode 100644
index af57972c0..000000000
--- a/user/dolphin/frameworks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dolphin-19.04.0/CMakeLists.txt.old 2019-04-12 00:02:11.000000000 +0000
-+++ dolphin-19.04.0/CMakeLists.txt 2019-04-18 20:17:53.396872289 +0000
-@@ -8,7 +8,7 @@
- project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION})
-
- set(QT_MIN_VERSION "5.8.0")
--set(KF5_MIN_VERSION "5.57.0")
-+set(KF5_MIN_VERSION "5.54.0")
-
- # ECM setup
- find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
diff --git a/user/dos2unix/APKBUILD b/user/dos2unix/APKBUILD
new file mode 100644
index 000000000..4b80f6265
--- /dev/null
+++ b/user/dos2unix/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=dos2unix
+pkgver=7.4.1
+pkgrel=0
+pkgdesc="Convert line endings in plain text files"
+url="https://sourceforge.net/projects/dos2unix/"
+arch="all"
+license="BSD-2-Clause-FreeBSD"
+depends=""
+makedepends=""
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://downloads.sourceforge.net/dos2unix/dos2unix-$pkgver.tar.gz"
+
+build() {
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="81e7cff82d95b298fb218b073f54d17fa851a7507fbd54b3cd9af7c1efa6a7bd3cf59f7a84ffbaf395403bf458650763e1755944451b24f708878a9c62316dc4 dos2unix-7.4.1.tar.gz"
diff --git a/user/dosbox/APKBUILD b/user/dosbox/APKBUILD
index e8674b531..e811aa22c 100644
--- a/user/dosbox/APKBUILD
+++ b/user/dosbox/APKBUILD
@@ -9,7 +9,8 @@ arch="all !s390x"
options="!check" # dosbox does not ship tests
license="GPL-2.0-only"
depends=""
-makedepends="ncurses-dev zlib-dev libxkbfile-dev libpng-dev libpcap-dev fluidsynth-dev sdl2-dev alsa-lib-dev"
+makedepends="ncurses-dev zlib-dev libxkbfile-dev libpng-dev libpcap-dev
+ fluidsynth-dev sdl2-dev alsa-lib-dev autoconf automake libtool"
source="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-wip-20180513-1316.tar.gz
porttalk-fix.patch
asmfix.patch
@@ -20,7 +21,6 @@ source="https://github.com/joncampbell123/dosbox-x/archive/dosbox-x-wip-20180513
builddir="$srcdir/dosbox-x-dosbox-x-wip-20180513-1316"
build() {
- cd "$builddir"
./autogen.sh
./configure \
--build=$CBUILD \
@@ -33,7 +33,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/dosfstools/APKBUILD b/user/dosfstools/APKBUILD
index 0ee614c94..a45803e24 100644
--- a/user/dosfstools/APKBUILD
+++ b/user/dosfstools/APKBUILD
@@ -7,13 +7,12 @@ url="https://github.com/dosfstools/dosfstools"
arch="all"
license="GPL-3.0+"
depends=""
-makedepends="linux-headers"
checkdepends="vim"
+makedepends="linux-headers"
subpackages="$pkgname-doc"
source="https://github.com/dosfstools/dosfstools/releases/download/v$pkgver/dosfstools-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/doxygen/APKBUILD b/user/doxygen/APKBUILD
index 881e6156d..eefc391ce 100644
--- a/user/doxygen/APKBUILD
+++ b/user/doxygen/APKBUILD
@@ -3,7 +3,7 @@ pkgname=doxygen
pkgver=1.8.16
_pkgver=${pkgver%.*.*}_${pkgver#*.}
_pkgver=${_pkgver%.*}_${pkgver#*.*.}
-pkgrel=0
+pkgrel=1
pkgdesc="A documentation system for C++, C, Java, IDL, and PHP"
url="http://www.doxygen.org/"
arch="all"
@@ -13,6 +13,7 @@ makedepends="bison cmake coreutils flex perl python3"
checkdepends="libxml2-utils"
source="https://github.com/doxygen/doxygen/archive/Release_$_pkgver.tar.gz
doxygen-1.8.14-install.patch
+ time64.patch
"
builddir="$srcdir/doxygen-Release_$_pkgver"
@@ -30,7 +31,7 @@ build() {
check() {
# Remove test that use bibtex
rm -f ./testing/012_cite.dox
- make test
+ CTEST_OUTPUT_ON_FAILURE=true make test
}
package() {
@@ -38,4 +39,5 @@ package() {
}
sha512sums="546ceaae949cf5cc8162309bc804dad7a00b970c14a2dd66d27111e03f2fbebfec299ddc559f8c915ed00776217d2c439843806d2b6c15b58cf29f490979bd8f Release_1_8_16.tar.gz
-725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1 doxygen-1.8.14-install.patch"
+725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1 doxygen-1.8.14-install.patch
+92d82c0799d7cdbb6fb37069514d7c6dbadb0c3d88409803e88180bcfcf4be9a2f346c035cd49de8f7496eed2ffd1519d96a1ec3c22db21c2dfdc4e437dada50 time64.patch"
diff --git a/user/doxygen/time64.patch b/user/doxygen/time64.patch
new file mode 100644
index 000000000..ee06d6e03
--- /dev/null
+++ b/user/doxygen/time64.patch
@@ -0,0 +1,19 @@
+--- doxygen-Release_1_8_16/qtools/qdatetime.cpp.old 2019-08-08 13:36:52.000000000 +0000
++++ doxygen-Release_1_8_16/qtools/qdatetime.cpp 2020-01-19 19:14:24.204239898 +0000
+@@ -35,7 +35,6 @@
+ **
+ **********************************************************************/
+
+-#define gettimeofday __hide_gettimeofday
+ #include "qdatetime.h"
+ #include "qdatastream.h"
+ #include <stdio.h>
+@@ -55,8 +54,6 @@
+ #elif defined(_OS_UNIX_) || defined(_OS_MAC_)
+ #include <sys/time.h>
+ #include <unistd.h>
+-#undef gettimeofday
+-extern "C" int gettimeofday( struct timeval *, struct timezone * );
+ #endif
+
+ static const uint FIRST_DAY = 2361222; // Julian day for 1752/09/14
diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD
index 71b016945..c2a8a513c 100644
--- a/user/dragonplayer/APKBUILD
+++ b/user/dragonplayer/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=dragonplayer
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Multimedia player with a focus on simplicity"
url="https://www.kde.org/applications/multimedia/dragonplayer/"
@@ -13,11 +13,10 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev
ki18n-dev kjobwidgets-dev kio-dev kparts-dev solid-dev phonon-dev
kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev knotifications-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/dragon-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/dragon-$pkgver.tar.xz"
builddir="$srcdir"/dragon-$pkgver
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="d40019da9e6d4bcad52bcac5e7adaaacca140276e9fd8e4e24bff3a22d12fb00e259b7d3e88fda0620a6b46bcccb648a680631c053a253a1d71df99b85695c3d dragon-19.08.2.tar.xz"
+sha512sums="dc54ed3e180a53cfd2be0d8d11cdce209aa386a032ff52be26fdbe08f786d8c4dea3019c54bdde5e7e3faf214cd8ab0e1210f42477300e647a9b6a26c4339283 dragon-19.12.1.tar.xz"
diff --git a/user/dtach/APKBUILD b/user/dtach/APKBUILD
index d94502928..79751667a 100644
--- a/user/dtach/APKBUILD
+++ b/user/dtach/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
source="dtach-$pkgver.tar.gz::https://github.com/crigler/dtach/archive/v$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
diff --git a/user/dumb-init/APKBUILD b/user/dumb-init/APKBUILD
index e500cb008..541b964d4 100644
--- a/user/dumb-init/APKBUILD
+++ b/user/dumb-init/APKBUILD
@@ -8,6 +8,8 @@ url="https://github.com/Yelp/dumb-init"
arch="all"
options="!check" # Check requires Python 3.7 and will not function correctly within chroots.
license="MIT"
+depends=""
+makedepends=""
source="$pkgname-$pkgver.tar.gz::https://github.com/Yelp/$pkgname/archive/v$pkgver.tar.gz"
build() {
diff --git a/user/ebgaramond/APKBUILD b/user/ebgaramond/APKBUILD
index f1f071a67..4db1ce2c0 100644
--- a/user/ebgaramond/APKBUILD
+++ b/user/ebgaramond/APKBUILD
@@ -15,8 +15,7 @@ source="https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-$pkgver.zi
builddir="$srcdir/EBGaramond-0.016"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ otf/*.otf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/otf/*.otf
}
sha512sums="f7d67d6fb47ff7aa614b08d97f953cd50122935b40ff191c7b226ad0714b738a5b359b04342ebea10109e7ab8b4260256ce0f8592fd70dc3e7fe29c77188a955 EBGaramond-0.016.zip"
diff --git a/user/ebook-tools/APKBUILD b/user/ebook-tools/APKBUILD
index 6c33ad3d5..6eeeb3cdb 100644
--- a/user/ebook-tools/APKBUILD
+++ b/user/ebook-tools/APKBUILD
@@ -8,12 +8,11 @@ url="https://sourceforge.net/projects/ebook-tools/"
arch="all"
license="MIT"
depends="convertlit cmd:which"
-makedepends="libxml2-dev libzip-dev"
+makedepends="cmake libxml2-dev libzip-dev"
subpackages="$pkgname-dev"
source="https://downloads.sourceforge.net/ebook-tools/ebook-tools-$pkgver.tar.gz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -22,17 +21,15 @@ build() {
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/editres/APKBUILD b/user/editres/APKBUILD
index f0f7bd1d8..a22c2d68a 100644
--- a/user/editres/APKBUILD
+++ b/user/editres/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/editres-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/efibootmgr/APKBUILD b/user/efibootmgr/APKBUILD
index 0cde72c5a..5f2149b22 100644
--- a/user/efibootmgr/APKBUILD
+++ b/user/efibootmgr/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-doc"
source="https://github.com/rhboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
make EFIDIR="Adelie" libdir="/usr/lib" LIBS="intl"
}
package() {
- cd "$builddir"
make EFIDIR="Adelie" libdir="/usr/lib" LIBS="intl" DESTDIR="$pkgdir" install
}
diff --git a/user/efivar/APKBUILD b/user/efivar/APKBUILD
index bcfcc3a2a..13b1b64bd 100644
--- a/user/efivar/APKBUILD
+++ b/user/efivar/APKBUILD
@@ -17,12 +17,10 @@ source="https://github.com/rhboot/$pkgname/releases/download/$pkgver/$pkgname-$p
"
build() {
- cd "$builddir"
make prefix="/usr" libdir="/usr/lib"
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" prefix="/usr" libdir="/usr/lib" install
}
diff --git a/user/eggdbus/APKBUILD b/user/eggdbus/APKBUILD
index ddceb9066..96ba02a34 100644
--- a/user/eggdbus/APKBUILD
+++ b/user/eggdbus/APKBUILD
@@ -7,18 +7,17 @@ pkgdesc="Experimental D-Bus bindings for GObject"
url="https://cgit.freedesktop.org/~david/eggdbus"
arch="all"
license="LGPL-2.0+"
+depends=""
makedepends="dbus-glib-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/emacs/APKBUILD b/user/emacs/APKBUILD
index a1db01ae7..87a2da365 100644
--- a/user/emacs/APKBUILD
+++ b/user/emacs/APKBUILD
@@ -4,9 +4,9 @@ pkgname=emacs
pkgver=26.3
pkgrel=0
pkgdesc="The extensible, customizable, self-documenting real-time display editor"
+url="https://www.gnu.org/software/emacs/"
arch="all"
options="!check !dbg"
-url="https://www.gnu.org/software/emacs/"
license="GPL-3.0+"
depends="emacs-nox"
makedepends="autoconf automake linux-headers
@@ -16,7 +16,8 @@ makedepends="autoconf automake linux-headers
ncurses-libs gnutls-dev libxaw-dev"
subpackages="$pkgname-doc $pkgname-nox $pkgname-x11 $pkgname-gtk2"
source="https://ftp.gnu.org/gnu/emacs/emacs-$pkgver.tar.xz
- gamedir.patch"
+ gamedir.patch
+ "
prepare() {
default_prepare
diff --git a/user/engrampa/APKBUILD b/user/engrampa/APKBUILD
index a9332f56a..48f2ae859 100644
--- a/user/engrampa/APKBUILD
+++ b/user/engrampa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=engrampa
pkgver=1.22.2
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/engrampa-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/eom/APKBUILD b/user/eom/APKBUILD
index bc53bc9b7..0d82153d9 100644
--- a/user/eom/APKBUILD
+++ b/user/eom/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=eom
pkgver=1.22.2
pkgrel=0
diff --git a/user/erl-rebar/APKBUILD b/user/erl-rebar/APKBUILD
index c4fe28bb2..5fdc774fd 100644
--- a/user/erl-rebar/APKBUILD
+++ b/user/erl-rebar/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
pkgdesc="Legacy Erlang build tool"
url="https://github.com/rebar/rebar"
arch="noarch"
-license="Apache-2"
options="!tracedeps"
+license="Apache-2.0"
depends="erlang"
makedepends="erlang-dev"
source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/rebar/rebar/tar.gz/$pkgver"
diff --git a/user/erl-rebar3/APKBUILD b/user/erl-rebar3/APKBUILD
index a37633ae8..87ae5f2a5 100644
--- a/user/erl-rebar3/APKBUILD
+++ b/user/erl-rebar3/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
pkgdesc="Erlang build tool"
url="http://www.rebar3.org/"
arch="noarch"
-license="Apache-2"
options="!tracedeps"
+license="Apache-2.0"
depends="erlang"
makedepends="erlang-dev"
subpackages="$pkgname-doc"
diff --git a/user/erlang/APKBUILD b/user/erlang/APKBUILD
index e58319f00..58fac74b8 100644
--- a/user/erlang/APKBUILD
+++ b/user/erlang/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=erlang
-pkgver=22.1.7
+pkgver=22.2.1
pkgrel=0
pkgdesc="Soft real-time system programming language"
url="https://www.erlang.org/"
@@ -51,5 +51,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="72660ea481ac647a091b713a4a9240d1d008336152a41fd5f9f191c6050d42a67ddc0ff8bc51addc2e1d6f9a244516883df5025f005ae575fa101d941ac0bd05 erlang-22.1.7.tar.gz
+sha512sums="4c0e5b963def01e02f8550414bee9e15a79681ac19547c4707d4cf3a67924e252dde7f8f94dfeca5eb3d34730acaffd193603711531bdf7c22d47d8880c5e5f4 erlang-22.2.1.tar.gz
91c62e6a894d6f1ae371025e49c02ff25f1cc244fb18c8eae87c9e031d8216bab901b8d278df67db08f260f0d56fa18122f191405e4d58ca64934259f156b907 fix-wx-linking.patch"
diff --git a/user/ers-symbols/APKBUILD b/user/ers-symbols/APKBUILD
index 652acc95f..7cf4173e6 100644
--- a/user/ers-symbols/APKBUILD
+++ b/user/ers-symbols/APKBUILD
@@ -15,8 +15,7 @@ source="https://www.fgdc.gov/HSWG/symbol_downloads/ers_v220.zip"
builddir="$srcdir"/ersSymbolsVersion0202/ersV2sym
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$builddir"/*.ttf
}
sha512sums="f34b11f13df250d85758c1980f0782033d2ed6874980d51a3b225ca348d0cf8f722e28fab9f9ffc81720ba637928dfa126eb7b1e8227743fb58bb18960407717 ers_v220.zip"
diff --git a/user/essays1743/APKBUILD b/user/essays1743/APKBUILD
index 930050ba1..0c0ce7654 100644
--- a/user/essays1743/APKBUILD
+++ b/user/essays1743/APKBUILD
@@ -15,7 +15,6 @@ source="https://www.thibault.org/fonts/essays/essays1743-$pkgver-1.ttc"
builddir="$srcdir/"
package() {
- cd "$builddir"
install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ essays1743-$pkgver-1.ttc
}
diff --git a/user/ethtool/APKBUILD b/user/ethtool/APKBUILD
index be9d4e369..0f899072c 100644
--- a/user/ethtool/APKBUILD
+++ b/user/ethtool/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Utility for controlling network drivers and hardware"
url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
arch="all"
license="GPL-2.0-only AND GPL-2.0+"
+depends=""
makedepends="linux-headers"
subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
source="https://www.kernel.org/pub/software/network/ethtool/$pkgname-$pkgver.tar.xz"
diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD
index 4c2b3172f..6811c1bef 100644
--- a/user/evince/APKBUILD
+++ b/user/evince/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=evince
-pkgver=3.34.1
+pkgver=3.34.2
pkgrel=0
pkgdesc="GNOME document viewer"
url="https://wiki.gnome.org/Apps/Evince"
@@ -75,4 +75,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="1815274df7fbcb124770342a78e332c55e295100efb4962ed6094d7cf23e4947d07e7a6f63780b6dc7b176cb425217208637ec8e69821ff8465a371d59445bee evince-3.34.1.tar.xz"
+sha512sums="51bfa4671e17a98c536790185ece6f4f77b956062901f840cd298cdc3e42eb7e8cabe9bfa84387f185cdf7462a322ef54bbc463b988a677af68561e55acd9f12 evince-3.34.2.tar.xz"
diff --git a/user/exfat-utils/APKBUILD b/user/exfat-utils/APKBUILD
index 552d1bfe6..cfdabc42c 100644
--- a/user/exfat-utils/APKBUILD
+++ b/user/exfat-utils/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://github.com/relan/exfat/releases/download/v$pkgver/exfat-utils-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD
index 935b57108..d3d135619 100644
--- a/user/exo/APKBUILD
+++ b/user/exo/APKBUILD
@@ -1,12 +1,13 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=exo
-pkgver=0.12.9
+pkgver=0.12.11
pkgrel=0
pkgdesc="Support library for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="LGPL-2.0+ AND GPL-2.0+"
+depends=""
makedepends="intltool glib-dev gtk+2.0-dev gtk+3.0-dev libxfce4util-dev
libxfce4ui-dev libice-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
@@ -31,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ae0e893c595553ff9db15967419ffd9d78ec6ab6dbcefcc02536367e04cc4db51d41305f0f527778ba9b8b04cb51bd560bff07ef5ba3a56d1acab1d1730e7ee7 exo-0.12.9.tar.bz2"
+sha512sums="ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533 exo-0.12.11.tar.bz2"
diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD
index 02313900d..c8ee7edc5 100644
--- a/user/extra-cmake-modules/APKBUILD
+++ b/user/extra-cmake-modules/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=extra-cmake-modules
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="CMake modules needed for KDE development"
url="https://www.kde.org/"
@@ -37,5 +37,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0e48374deaad34e3a9d9be1bba81890e40611ff2ccccb71d8f702d40fdb53c599404ace20ead4daf13951834cee6224093d20a83f0eb85ad2a6c973eab925ed4 extra-cmake-modules-5.65.0.tar.xz
+sha512sums="d0fdf658b636ad7b0cc70d87cb695010969d51f83c62a3b59ffc880c4b2db179170124e4baf185b6261801bad6207c4776536581c5152aeb174784af3b5236a4 extra-cmake-modules-5.66.0.tar.xz
a9e5d5e7ac8372099458ed18d2a6023fa0acf46955f51509880e7a467b4bd9e5df67c44c9ad032b1d70139efb73206390eaf7cd2baf63a82131e6e2b4acdbd71 posix.patch"
diff --git a/user/faad2/APKBUILD b/user/faad2/APKBUILD
index af7ffa905..679d7831e 100644
--- a/user/faad2/APKBUILD
+++ b/user/faad2/APKBUILD
@@ -8,9 +8,9 @@ url="https://www.audiocoding.com/"
arch="all"
options="!check" # No test suite.
license="GPL-2.0+"
-subpackages="$pkgname-dev $pkgname-doc"
depends=""
makedepends="autoconf automake libtool"
+subpackages="$pkgname-dev $pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/knik0/faad2/archive/$_pkgver.tar.gz"
builddir="$srcdir/$pkgname-$_pkgver"
diff --git a/user/fantasque-sans-mono/APKBUILD b/user/fantasque-sans-mono/APKBUILD
index d6c2ad111..3d4712524 100644
--- a/user/fantasque-sans-mono/APKBUILD
+++ b/user/fantasque-sans-mono/APKBUILD
@@ -15,8 +15,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/belluzj/fantasque-sans/relea
builddir="$srcdir"/OTF
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$builddir"/*.otf
}
sha512sums="3afbd441d192769ea44fd7730e728844d13c15b0dd52e3968e6e1659ffa11a173d21891c09ceb7465b83a0b8c923129df2554e159620c9611ee9bb6ff35c90c6 fantasque-sans-mono-1.8.0.tar.gz"
diff --git a/user/farstream/APKBUILD b/user/farstream/APKBUILD
index f0d45c176..c5a6f422e 100644
--- a/user/farstream/APKBUILD
+++ b/user/farstream/APKBUILD
@@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://freedesktop.org/software/farstream/releases/farstream/farstream-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,12 +28,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/fastjar/APKBUILD b/user/fastjar/APKBUILD
index b821b2419..249f3a9b1 100644
--- a/user/fastjar/APKBUILD
+++ b/user/fastjar/APKBUILD
@@ -17,13 +17,11 @@ source="https://download.savannah.nongnu.org/releases/fastjar/fastjar-$pkgver.ta
"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,12 +33,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -f "$pkgdir"/usr/lib/charset.alias
}
diff --git a/user/fdupes/APKBUILD b/user/fdupes/APKBUILD
index 1cd4e02b3..944256215 100644
--- a/user/fdupes/APKBUILD
+++ b/user/fdupes/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-doc"
source="fdupes-$pkgver.tar.gz::https://github.com/adrianlopezroche/fdupes/archive/v$pkgver.tar.gz"
build() {
- cd "$builddir"
make PREFIX=/usr
}
package() {
- cd "$builddir"
make PREFIX=/usr DESTDIR="$pkgdir" install
}
diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD
index 8df9c0bff..636f2c474 100644
--- a/user/featherpad/APKBUILD
+++ b/user/featherpad/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=featherpad
pkgver=0.11.1
pkgrel=0
diff --git a/user/feh/APKBUILD b/user/feh/APKBUILD
index ad6703b80..899461202 100644
--- a/user/feh/APKBUILD
+++ b/user/feh/APKBUILD
@@ -1,16 +1,16 @@
# Contributor: Max Rees <maxcrees@me.com>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=feh
-pkgver=3.2.1
+pkgver=3.3
pkgrel=0
pkgdesc="feh is a fast, lightweight image viewer which uses imlib2"
url="https://feh.finalrewind.org/"
arch="all"
license="MIT-feh"
depends=""
+checkdepends="perl-test-command"
makedepends="curl-dev imlib2-dev libexif-dev libjpeg-turbo-dev libpng-dev
libxinerama-dev libxt-dev"
-checkdepends="perl-test-command"
subpackages="$pkgname-doc"
source="https://feh.finalrewind.org/$pkgname-$pkgver.tar.bz2"
@@ -31,4 +31,4 @@ package() {
install
}
-sha512sums="11a136990f7d02409501f10553659c64ad5d18d4bfaa4e5cfdeb7a2f53ffdb8bd9b8347796c65e75c49615ac4c12bc81bf3a58325f778cb5e0c1608181d7b53a feh-3.2.1.tar.bz2"
+sha512sums="0372115a8f2df77cdfc0fc1b24479e72d9be1f24127c787909ef671075b199b8d5f873200ce202f51705991cf3c5f5cc71ef8f47294fe520e3a9acc5cb7582a9 feh-3.3.tar.bz2"
diff --git a/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
index 93e3ac995..9cc6fdfcf 100644
--- a/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
+++ b/user/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
@@ -15,7 +15,7 @@ diff --git a/libavutil/internal.h b/libavutil/internal.h
index 61784b5..69d63d5 100644
--- a/libavutil/internal.h
+++ b/libavutil/internal.h
-@@ -177,34 +177,6 @@
+@@ -187,34 +187,6 @@
#endif
/**
diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD
index 06d9db55c..c3537f5fe 100644
--- a/user/ffmpeg/APKBUILD
+++ b/user/ffmpeg/APKBUILD
@@ -85,7 +85,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install install-man
install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart"
}
@@ -98,4 +97,4 @@ libs() {
}
sha512sums="3efddc7d6bbccba9a1f55bf0e6caa8a578405a7e12058ce526766ed5eca9d45a783dbf86325ab860a8eabbe29701f8093e691f0138e0d9cc883cfe5200b3561b ffmpeg-4.2.1.tar.xz
-32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch"
+1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch"
diff --git a/user/ffmpegthumbnailer/APKBUILD b/user/ffmpegthumbnailer/APKBUILD
index 8a3049363..b8f5f02a2 100644
--- a/user/ffmpegthumbnailer/APKBUILD
+++ b/user/ffmpegthumbnailer/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ffmpegthumbnailer
pkgver=2.2.2
pkgrel=0
@@ -7,12 +7,12 @@ pkgdesc="Thumbnail generator based on FFMPEG"
url="https://github.com/dirkvdb/ffmpegthumbnailer"
arch="all"
license="GPL-2.0+"
-makedepends="ffmpeg-dev libjpeg-turbo-dev libpng-dev"
+depends=""
+makedepends="cmake ffmpeg-dev libjpeg-turbo-dev libpng-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://github.com/dirkvdb/ffmpegthumbnailer/releases/download/$pkgver/ffmpegthumbnailer-$pkgver.tar.bz2"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,17 +25,15 @@ build() {
-DCMAKE_C_FLAGS="$CFLAGS" \
-DENABLE_GIO=True \
-DENABLE_THUMBNAILER=True \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD
index 5ae37a61f..9da3bbf11 100644
--- a/user/ffmpegthumbs/APKBUILD
+++ b/user/ffmpegthumbs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ffmpegthumbs
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KDE video thumbnail system using FFmpeg"
url="https://www.KDE.org/"
@@ -11,10 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev ffmpeg-dev kconfig-dev
ki18n-dev kio-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ffmpegthumbs-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/ffmpegthumbs-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="b708034ac4b8541f84ce6b806f8e914f656fde260c24b5a4e1d957fe01ec145e62a41545e535821122b1b26e590caba74bd192b309fe295fb0b7fb423f3550b9 ffmpegthumbs-19.08.2.tar.xz"
+sha512sums="8a4e35e6f3ff0191b9777a83e82551ba2c315783629e73c1324567ca985da08e38e455c534cd02991926d4842601e86da78f4d899b9d825e15b6747abc3b24c6 ffmpegthumbs-19.12.1.tar.xz"
diff --git a/user/fifth-leg/APKBUILD b/user/fifth-leg/APKBUILD
index c80ecb5a6..43cf5b2b3 100644
--- a/user/fifth-leg/APKBUILD
+++ b/user/fifth-leg/APKBUILD
@@ -15,8 +15,7 @@ source="https://api.opensuse.org/public/source/openSUSE:Factory/fifth-leg-font/o
builddir="$srcdir"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF *.otf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF "$builddir"/*.otf
}
sha512sums="7c2ee6aab8d5bc54d3a0d3a7d02ff5514cdc9e6672fcd28e827197061e5aa3f023b1d6cbe7077458f8cb3046a22e4aac085d4a56398d59845d004edde67622f9 opensuse-font-fifth-leg-0.6.tar.bz2"
diff --git a/user/figlet/APKBUILD b/user/figlet/APKBUILD
index 1d44369c4..da4121dc4 100644
--- a/user/figlet/APKBUILD
+++ b/user/figlet/APKBUILD
@@ -11,20 +11,18 @@ depends=""
makedepends=""
subpackages="$pkgname-doc"
source="ftp://ftp.figlet.org/pub/figlet/program/unix/${pkgname}-${pkgver}.tar.gz
- musl-fix-cplusplus-decls.patch"
+ musl-fix-cplusplus-decls.patch
+ "
build() {
- cd "$builddir"
make DEFAULTFONTDIR=/usr/share/figlet/fonts all
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="${pkgdir}" BINDIR=/usr/bin MANDIR=/usr/share/man \
DEFAULTFONTDIR=/usr/share/figlet/fonts install
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD
index 3d0594f99..baaad8d63 100644
--- a/user/firefox-esr/APKBUILD
+++ b/user/firefox-esr/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Molly Miller <adelie@m-squa.red>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=firefox-esr
-pkgver=68.2.0
+pkgver=68.4.1
pkgrel=0
pkgdesc="Firefox web browser (extended support release)"
url="https://www.mozilla.org/firefox/"
@@ -15,7 +15,7 @@ depends=""
# actual deps
makedepends="
autoconf2.13 cargo cbindgen clang llvm8-dev node ncurses-dev
- perl rust rust-stdlib cmd:which
+ perl rust rust-std cmd:which
ncurses-dev openssl-dev
@@ -45,7 +45,6 @@ source="https://ftp.mozilla.org/pub/firefox/releases/$_ffxver/source/firefox-$_f
shut-up-warning.patch
stackwalk-x86-ppc.patch
webrtc-broken.patch
- yuv-be.patch
firefox.desktop
firefox-safe.desktop
@@ -84,6 +83,22 @@ ldpath="$_mozappdir"
# - CVE-2019-11762
# - CVE-2019-11763
# - CVE-2019-11764
+# 68.3.0-r0:
+# - CVE-2019-11745
+# - CVE-2019-13722
+# - CVE-2019-17005
+# - CVE-2019-17008
+# - CVE-2019-17009
+# - CVE-2019-17010
+# - CVE-2019-17011
+# - CVE-2019-17012
+# 68.4.1-r0:
+# - CVE-2019-17016
+# - CVE-2019-17017
+# - CVE-2019-17022
+# - CVE-2019-17024
+# - CVE-2019-17026
+
unpack() {
default_unpack
@@ -113,16 +128,11 @@ unpack() {
}
prepare() {
- cd "$builddir"
default_prepare
cp "$srcdir"/mozconfig "$builddir"/mozconfig
echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> "$builddir"/mozconfig
echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig
echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig
- # too much memory
- if [ -z "$JOBS" ] || [ $JOBS -ge 32 ]; then
- JOBS=32
- fi
echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig
case "$CARCH" in
@@ -133,6 +143,9 @@ prepare() {
echo "ac_add_options --disable-webrtc" >> "$builddir"/mozconfig;
export LDFLAGS="$LDFLAGS -latomic"
;;
+ s390x)
+ echo "ac_add_options --disable-startupcache" >> "$builddir"/mozconfig
+ ;;
esac
rm "$builddir"/third_party/python/virtualenv/virtualenv_support/pip*.whl
@@ -142,8 +155,6 @@ prepare() {
}
build() {
- cd "$builddir"
-
export SHELL=/bin/sh
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
@@ -156,9 +167,6 @@ build() {
export UNIXCONFDIR="$srcdir"
- local extra_flags=""
- [ "$CARCH" = "s390x" ] && extra_flags="--disable-startupcache"
-
export PATH="$srcdir/python/bin:$PATH"
./mach build
}
@@ -170,14 +178,12 @@ run() {
}
package() {
- cd "$builddir"
export PATH="$srcdir/python/bin:$PATH"
DESTDIR="$pkgdir" ./mach install
install -m755 -d ${pkgdir}/usr/share/applications
install -m755 -d ${pkgdir}/usr/share/pixmaps
- local png
for png in browser/branding/official/default*.png; do
local i="${_png%.png}"
i=${i##*/default}
@@ -208,7 +214,7 @@ package() {
EOF
}
-sha512sums="f6522ca6b9efa3fdeb866912ab9cb904eaace5806c606d5721cba23aebd679885670011c743ca8d381b579b728077182dc766f9b6d3b31ccf51c3eb583c547ee firefox-68.2.0esr.source.tar.xz
+sha512sums="8dd85096f1223b2ab396cc3b89a9f1b113f01ce8919af08a278d077cc4380c108a66b6379c75d85311aa3c54a7804f4d51f718b309fe107ff7c44aca7e4386ed firefox-68.4.1esr.source.tar.xz
16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz
f82758d279cd12a1b30a9b36ac3c265cfb137df3db7ae185f2c538504e46fa70ace1b051fce847356851062b5cc9cd741a6d33d54f8cd103aa0c8272cb19ccc4 mozconfig
ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch
@@ -223,6 +229,5 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb1
39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch
452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch
be68f1387aa6677875a67106e2d6a9db470c934c943056d3b53391a63034235108e41945c53957db427d9cdc59f0aa2f9e6f2f8cd862e090e512a3ab9cbcc9a8 webrtc-broken.patch
-2dfb986089c9afcd6a895302c8a5a1d299cffa4cc3c73fce784c29d348f362c1e7570109c4f09d328275d8549a96531736dd976411c15956b385d7fb211b8af2 yuv-be.patch
f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop
5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop"
diff --git a/user/firefox-esr/yuv-be.patch b/user/firefox-esr/yuv-be.patch
deleted file mode 100644
index ccb0c2fd8..000000000
--- a/user/firefox-esr/yuv-be.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# HG changeset patch
-# User A. Wilcox <AWilcox@Wilcox-Tech.com>
-# Date 1543674229 0
-# Sat Dec 01 14:23:49 2018 +0000
-# Node ID 0309ff19e46b126c527e633518d7de8570442114
-# Parent 53107afbc21ec78e7ac46d37af212505f2032d5d
-Bug 1511604 - Swizzle YCbCr->RGB data on big-endian machines
-
-diff -r 53107afbc21e -r 0309ff19e46b gfx/ycbcr/YCbCrUtils.cpp
---- a/gfx/ycbcr/YCbCrUtils.cpp Wed Nov 07 04:50:21 2018 +0000
-+++ b/gfx/ycbcr/YCbCrUtils.cpp Sat Dec 01 14:23:49 2018 +0000
-@@ -3,7 +3,9 @@
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-+#include "mozilla/EndianUtils.h"
- #include "gfx2DGlue.h"
-+#include "mozilla/gfx/Swizzle.h"
-
- #include "YCbCrUtils.h"
- #include "yuv_convert.h"
-@@ -236,6 +238,13 @@
- yuvtype,
- srcData.mYUVColorSpace);
- }
-+#if MOZ_BIG_ENDIAN
-+ // libyuv makes endian-correct result, which needs to be swapped to BGRX
-+ if (aDestFormat != SurfaceFormat::R5G6B5_UINT16)
-+ gfx::SwizzleData(aDestBuffer, aStride, gfx::SurfaceFormat::X8R8G8B8,
-+ aDestBuffer, aStride, gfx::SurfaceFormat::B8G8R8X8,
-+ srcData.mPicSize);
-+#endif
- }
-
- void
-@@ -257,6 +266,12 @@
- aSrcStrideYA,
- aSrcStrideUV,
- aDstStrideARGB);
-+#if MOZ_BIG_ENDIAN
-+ // libyuv makes endian-correct result, which needs to be swapped to BGRA
-+ gfx::SwizzleData(aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::A8R8G8B8,
-+ aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::B8G8R8A8,
-+ IntSize(aWidth, aHeight));
-+#endif
- }
-
- } // namespace gfx
diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD
index 8c0ff4bc6..9754c4a0b 100644
--- a/user/fish/APKBUILD
+++ b/user/fish/APKBUILD
@@ -1,12 +1,12 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=fish
pkgver=3.0.2
pkgrel=0
pkgdesc="Modern interactive commandline shell"
url="http://www.fishshell.com"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="BSD-3-Clause AND BSD-2-Clause AND GPL-2.0+ AND GPL-2.0-only AND ISC"
depends="bc"
depends_dev="$pkgname-tools"
diff --git a/user/flite/APKBUILD b/user/flite/APKBUILD
index 3922e1d88..dcd9d98f2 100644
--- a/user/flite/APKBUILD
+++ b/user/flite/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=flite
pkgver=2.1
pkgrel=0
pkgdesc="Small, fast text-to-speech synthesizer based on Festival"
url="http://www.festvox.org/flite/"
arch="all"
-options="!check" # testsuite refuses to cooperate
+options="!check" # Test suite refuses to cooperate.
license="MIT AND Apache-2.0 AND BSD-3-Clause AND Public-Domain AND BSD-2-Clause"
depends=""
makedepends="alsa-lib-dev"
diff --git a/user/fluidsynth/APKBUILD b/user/fluidsynth/APKBUILD
index 97e8e8f1e..a84da6e8d 100644
--- a/user/fluidsynth/APKBUILD
+++ b/user/fluidsynth/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=fluidsynth
-pkgver=2.0.9
+pkgver=2.1.0
pkgrel=0
pkgdesc="Real-time, software synthesiser based on SoundFont 2"
url="http://www.fluidsynth.org/"
arch="all"
license="LGPL-2.1+"
depends=""
-makedepends="alsa-lib-dev dbus-dev glib-dev libsndfile-dev pulseaudio-dev"
+makedepends="alsa-lib-dev cmake dbus-dev glib-dev libsndfile-dev pulseaudio-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="fluidsynth-$pkgver.tar.gz::https://github.com/FluidSynth/fluidsynth/archive/v$pkgver.tar.gz"
@@ -22,7 +22,7 @@ build() {
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -34,4 +34,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3cc88ed3e83b15d5b3f397f3d93bf85a03dda122b570b8b09e83e9a5d00be7fc0592b2f1088151a1284c6c9125c309efd030f0fb8cb160051863e1a2fea53467 fluidsynth-2.0.9.tar.gz"
+sha512sums="d7af4047ebde49ef48098ae9dbab5d90422a4536acf28a2de32d8da67a50ebbbcf30e06833b630bd54e441040be0e432b377e3b63bf666e63106e69cd408ea0d fluidsynth-2.1.0.tar.gz"
diff --git a/user/fluxbox/APKBUILD b/user/fluxbox/APKBUILD
index 73c076d15..c45ce0ec9 100644
--- a/user/fluxbox/APKBUILD
+++ b/user/fluxbox/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=1
pkgdesc="A lightweight and highly-configurable window manager"
url="http://www.fluxbox.org"
arch="all"
+options="!check" # This package has a broken test suite.
license="MIT"
-options="!check" # This package has a broken testsuite
depends="gxmessage"
makedepends="libxinerama-dev libxpm-dev libxrandr imlib2-dev libxrender-dev
libxrandr-dev libxinerama-dev freetype-dev libxft-dev xorgproto"
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc"
source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
# TODO: Enable NLS when we get 'gencat'
./configure \
--build=$CBUILD \
@@ -27,7 +26,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/font-adobe-100dpi/APKBUILD b/user/font-adobe-100dpi/APKBUILD
index 4547cee87..e141b606b 100644
--- a/user/font-adobe-100dpi/APKBUILD
+++ b/user/font-adobe-100dpi/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="100dpi X11 fonts from Adobe"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-adobe-100dpi-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-adobe-75dpi/APKBUILD b/user/font-adobe-75dpi/APKBUILD
index 8f3f7ac0c..5ef4fe5a8 100644
--- a/user/font-adobe-75dpi/APKBUILD
+++ b/user/font-adobe-75dpi/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="75dpi X11 fonts from Adobe"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-adobe-75dpi-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-adobe-utopia-100dpi/APKBUILD b/user/font-adobe-utopia-100dpi/APKBUILD
index ffd9eb443..7f7b77dd7 100644
--- a/user/font-adobe-utopia-100dpi/APKBUILD
+++ b/user/font-adobe-utopia-100dpi/APKBUILD
@@ -13,19 +13,17 @@ arch="noarch"
# [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts
# [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec
license="Utopia"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-adobe-utopia-100dpi-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -37,12 +35,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-adobe-utopia-75dpi/APKBUILD b/user/font-adobe-utopia-75dpi/APKBUILD
index da04ba89e..02e746ddf 100644
--- a/user/font-adobe-utopia-75dpi/APKBUILD
+++ b/user/font-adobe-utopia-75dpi/APKBUILD
@@ -13,19 +13,17 @@ arch="noarch"
# [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts
# [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec
license="Utopia"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-adobe-utopia-75dpi-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -37,12 +35,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-adobe-utopia-type1/APKBUILD b/user/font-adobe-utopia-type1/APKBUILD
index 12443931b..ee684a79e 100644
--- a/user/font-adobe-utopia-type1/APKBUILD
+++ b/user/font-adobe-utopia-type1/APKBUILD
@@ -13,19 +13,17 @@ arch="noarch"
# [1]: https://fedoraproject.org/wiki/Legal_considerations_for_fonts
# [2]: https://src.fedoraproject.org/cgit/rpms/xorg-x11-fonts.git/tree/xorg-x11-fonts.spec
license="Utopia"
-depends="encodings font-alias fontconfig mkfontdir mkfontscale"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-adobe-utopia-type1-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -37,12 +35,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
find "$pkgdir" -name fonts.scale -exec rm {} +
diff --git a/user/font-arabic-misc/APKBUILD b/user/font-arabic-misc/APKBUILD
index e36be36a0..66e7cb372 100644
--- a/user/font-arabic-misc/APKBUILD
+++ b/user/font-arabic-misc/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Arabic X11 fonts"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-arabic-misc-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-bh-100dpi/APKBUILD b/user/font-bh-100dpi/APKBUILD
index 507bd19cc..2dff87e24 100644
--- a/user/font-bh-100dpi/APKBUILD
+++ b/user/font-bh-100dpi/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="100dpi X11 fonts from Bigelow & Holmes"
url="https://www.X.Org/"
arch="noarch"
license="Lucida"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-bh-100dpi-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-bh-75dpi/APKBUILD b/user/font-bh-75dpi/APKBUILD
index 6a1287b10..619f8ce0c 100644
--- a/user/font-bh-75dpi/APKBUILD
+++ b/user/font-bh-75dpi/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="75dpi X11 fonts from Bigelow & Holmes"
url="https://www.X.Org/"
arch="noarch"
license="Lucida"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-bh-75dpi-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-bh-lucidatypewriter-100dpi/APKBUILD b/user/font-bh-lucidatypewriter-100dpi/APKBUILD
index afa5b8a83..118787f42 100644
--- a/user/font-bh-lucidatypewriter-100dpi/APKBUILD
+++ b/user/font-bh-lucidatypewriter-100dpi/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="100dpi Lucida Typewriter X11 font from Bigelow & Holmes"
url="https://www.X.Org/"
arch="noarch"
license="Lucida"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-100dpi-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-bh-lucidatypewriter-75dpi/APKBUILD b/user/font-bh-lucidatypewriter-75dpi/APKBUILD
index e1e9508dc..67d155853 100644
--- a/user/font-bh-lucidatypewriter-75dpi/APKBUILD
+++ b/user/font-bh-lucidatypewriter-75dpi/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="75dpi Lucida Typewriter X11 font from Bigelow & Holmes"
url="https://www.X.Org/"
arch="noarch"
license="Lucida"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-bh-lucidatypewriter-75dpi-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-bitstream-100dpi/APKBUILD b/user/font-bitstream-100dpi/APKBUILD
index 27c9f4848..491e7622b 100644
--- a/user/font-bitstream-100dpi/APKBUILD
+++ b/user/font-bitstream-100dpi/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="100dpi X11 fonts from Bitstream"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-bitstream-100dpi-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-bitstream-75dpi/APKBUILD b/user/font-bitstream-75dpi/APKBUILD
index a456b9bd6..fa6149d10 100644
--- a/user/font-bitstream-75dpi/APKBUILD
+++ b/user/font-bitstream-75dpi/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="75dpi X11 fonts from Bitstream"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-bitstream-75dpi-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-bitstream-speedo/APKBUILD b/user/font-bitstream-speedo/APKBUILD
index dcee83640..a9e76bed9 100644
--- a/user/font-bitstream-speedo/APKBUILD
+++ b/user/font-bitstream-speedo/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Speedo X11 fonts from Bitstream"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir mkfontscale"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-bitstream-speedo-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
find "$pkgdir" -name fonts.scale -exec rm {} +
diff --git a/user/font-bitstream-type1/APKBUILD b/user/font-bitstream-type1/APKBUILD
index 328b0f874..cf4d86d6d 100644
--- a/user/font-bitstream-type1/APKBUILD
+++ b/user/font-bitstream-type1/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Type 1 X11 fonts from Bitstream"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="fontconfig mkfontdir mkfontscale"
+depends="fontconfig mkfontscale"
makedepends="util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-bitstream-type1-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
find "$pkgdir" -name fonts.scale -exec rm {} +
diff --git a/user/font-cronyx-cyrillic/APKBUILD b/user/font-cronyx-cyrillic/APKBUILD
index ee537b55b..38765a4a3 100644
--- a/user/font-cronyx-cyrillic/APKBUILD
+++ b/user/font-cronyx-cyrillic/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Cyrillic X11 fonts from Cronyx"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-cronyx-cyrillic-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-daewoo-misc/APKBUILD b/user/font-daewoo-misc/APKBUILD
index a71dba0aa..0e75b5af6 100644
--- a/user/font-daewoo-misc/APKBUILD
+++ b/user/font-daewoo-misc/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="X11 fonts from Daewoo"
url="https://www.X.Org/"
arch="noarch"
license="X11"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-daewoo-misc-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-dec-misc/APKBUILD b/user/font-dec-misc/APKBUILD
index 36045bbca..6f6189efd 100644
--- a/user/font-dec-misc/APKBUILD
+++ b/user/font-dec-misc/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="X11 fonts from Digital"
url="https://www.X.Org/"
arch="noarch"
license="X11"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-dec-misc-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-isas-misc/APKBUILD b/user/font-isas-misc/APKBUILD
index 6dd2a8b08..9acfa2cb3 100644
--- a/user/font-isas-misc/APKBUILD
+++ b/user/font-isas-misc/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Chinese X11 fonts from Academia Sinica"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-isas-misc-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-jis-misc/APKBUILD b/user/font-jis-misc/APKBUILD
index 67cad5057..1b047736a 100644
--- a/user/font-jis-misc/APKBUILD
+++ b/user/font-jis-misc/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Japanese Industrial Standard X11 fonts"
url="https://www.X.Org/"
arch="noarch"
license="Public-Domain"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-jis-misc-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-micro-misc/APKBUILD b/user/font-micro-misc/APKBUILD
index 7c72642fe..8eae0a5a4 100644
--- a/user/font-micro-misc/APKBUILD
+++ b/user/font-micro-misc/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Smol X11 font"
url="https://www.X.Org/"
arch="noarch"
license="Public-Domain"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-micro-misc-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-misc-cyrillic/APKBUILD b/user/font-misc-cyrillic/APKBUILD
index e66c9ccd8..ffe4760e6 100644
--- a/user/font-misc-cyrillic/APKBUILD
+++ b/user/font-misc-cyrillic/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Cyrillic X11 fonts"
url="https://www.X.Org/"
arch="noarch"
license="MIT AND Public-Domain"
-depends="encodings font-alias fontconfig mkfontdir"
-makedepends="bdftopcf mkfontdir util-macros"
+depends="encodings font-alias fontconfig mkfontscale"
+makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-misc-cyrillic-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-misc-ethiopic/APKBUILD b/user/font-misc-ethiopic/APKBUILD
index e04621e66..41b13186e 100644
--- a/user/font-misc-ethiopic/APKBUILD
+++ b/user/font-misc-ethiopic/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Ethiopic X11 fonts"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir mkfontscale"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-misc-ethiopic-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
find "$pkgdir" -name fonts.scale -exec rm {} +
diff --git a/user/font-mutt-misc/APKBUILD b/user/font-mutt-misc/APKBUILD
index 62a4437ff..575ad7e2e 100644
--- a/user/font-mutt-misc/APKBUILD
+++ b/user/font-mutt-misc/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="MUTT X11 font family"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-mutt-misc-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-schumacher-misc/APKBUILD b/user/font-schumacher-misc/APKBUILD
index 4b3008fe5..d8a3bfb90 100644
--- a/user/font-schumacher-misc/APKBUILD
+++ b/user/font-schumacher-misc/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="X11 fonts from Dale Schumacher"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-schumacher-misc-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-screen-cyrillic/APKBUILD b/user/font-screen-cyrillic/APKBUILD
index 8dc59ebe6..4e0d72cd6 100644
--- a/user/font-screen-cyrillic/APKBUILD
+++ b/user/font-screen-cyrillic/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Cyrillic X11 fonts"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-screen-cyrillic-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-sony-misc/APKBUILD b/user/font-sony-misc/APKBUILD
index 7ce54a805..2d5a256ff 100644
--- a/user/font-sony-misc/APKBUILD
+++ b/user/font-sony-misc/APKBUILD
@@ -6,19 +6,17 @@ pkgdesc="X11 fonts from Sony"
url="https://www.X.Org/"
arch="noarch"
license="MIT"
-depends="encodings font-alias fontconfig mkfontdir mkfontscale"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf font-util-dev util-macros"
subpackages=""
source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-sun-misc/APKBUILD b/user/font-sun-misc/APKBUILD
index e004d9738..e3134ef91 100644
--- a/user/font-sun-misc/APKBUILD
+++ b/user/font-sun-misc/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="X11 fonts from Sun Microsystems"
url="https://www.X.Org/"
arch="noarch"
license="X11"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-sun-misc-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-winitzki-cyrillic/APKBUILD b/user/font-winitzki-cyrillic/APKBUILD
index 03e93b01f..09853fc30 100644
--- a/user/font-winitzki-cyrillic/APKBUILD
+++ b/user/font-winitzki-cyrillic/APKBUILD
@@ -7,19 +7,17 @@ pkgdesc="Cyrillic X11 fonts from Serge Winitzki"
url="https://www.X.Org/"
arch="noarch"
license="Public-Domain"
-depends="encodings font-alias fontconfig mkfontdir"
+depends="encodings font-alias fontconfig mkfontscale"
makedepends="bdftopcf util-macros"
subpackages=""
source="https://www.x.org/releases/individual/font/font-winitzki-cyrillic-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
}
diff --git a/user/font-xfree86-type1/APKBUILD b/user/font-xfree86-type1/APKBUILD
index f82b76bcf..308217e65 100644
--- a/user/font-xfree86-type1/APKBUILD
+++ b/user/font-xfree86-type1/APKBUILD
@@ -13,13 +13,11 @@ subpackages=""
source="https://www.x.org/releases/individual/font/font-xfree86-type1-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" -name fonts.dir -exec rm {} +
find "$pkgdir" -name fonts.scale -exec rm {} +
diff --git a/user/fontforge/APKBUILD b/user/fontforge/APKBUILD
index 949fb702c..2566d470c 100644
--- a/user/fontforge/APKBUILD
+++ b/user/fontforge/APKBUILD
@@ -8,7 +8,7 @@ url="https://fontforge.github.io/en-US/"
arch="all"
license="GPL-3.0+ AND BSD-3-Clause"
depends="desktop-file-utils shared-mime-info"
-makedepends="freetype-dev giflib-dev glib-dev libjpeg-turbo-dev
+makedepends="freetype-dev giflib-dev glib-dev libjpeg-turbo-dev libtool
libuninameslist-dev libpng-dev libx11-dev libxml2-dev pango-dev
python3-dev tiff-dev zlib-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
@@ -17,7 +17,6 @@ source="https://github.com/fontforge/fontforge/releases/download/${pkgver/2.0./}
"
build() {
- cd "$builddir"
PYTHON=python3 ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,13 +28,11 @@ build() {
}
check() {
- cd "$builddir"
# skip test 53; it doesn't work.
make check TESTSUITEFLAGS="1-52 54"
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/fonttosfnt/APKBUILD b/user/fonttosfnt/APKBUILD
index 62d1ddcae..c8c4c8739 100644
--- a/user/fonttosfnt/APKBUILD
+++ b/user/fonttosfnt/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/fonttosfnt-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/fortune-mod/APKBUILD b/user/fortune-mod/APKBUILD
index f3be67c18..7d3ba823c 100644
--- a/user/fortune-mod/APKBUILD
+++ b/user/fortune-mod/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=fortune-mod
-pkgver=2.10.0
+pkgver=2.12.0
pkgrel=0
pkgdesc="Display random messages or quotations"
url="https://www.shlomifish.org/humour/fortunes/"
@@ -11,7 +11,7 @@ license="BSD-4-Clause"
depends=""
checkdepends="perl-file-find-object perl-io-all perl-test-differences
perl-test-runvalgrind valgrind"
-makedepends="cmake recode-dev"
+makedepends="cmake recode-dev rinutils"
subpackages="$pkgname-doc"
source="https://github.com/shlomif/fortune-mod/archive/$pkgname-$pkgver.tar.gz"
builddir="$srcdir/fortune-mod-fortune-mod-$pkgver/$pkgname"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="f5776d3afc52859b8959b0a51fc0dd57665b7d35b046958e6a08f29f9ad7915957ec4fec6b38d08a797a05163cc20a47e62a4e3d65034084e2003b8a69cc90e1 fortune-mod-2.10.0.tar.gz"
+sha512sums="e3feca02b33bcae3c7113432af5d200d7c8701338c1d778c5dd893e4541969146185393c952f19f1b2f17077c4f171cdacbd9b6ba3cb0581117b8aa569cc652f fortune-mod-2.12.0.tar.gz"
diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD
index 74c234c7c..bb981015d 100644
--- a/user/frameworkintegration/APKBUILD
+++ b/user/frameworkintegration/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=frameworkintegration
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0af9b631e40d44c06661fd671898f102930f2efec9273f9efc1f7b11a16a42e25525e1a5a9c165e9d901cff01b08f36c1ac9845f316368b7f630a06dd32f414e frameworkintegration-5.65.0.tar.xz"
+sha512sums="d22cc4a2f5552705c0b863d2b73dfffd70a0020bf31dcf17874ac5a8c05de8bbbc88c7e12d455d1a98bc64916cb174a7fdb9677833cb5404c0b7c8f1c9bea2f2 frameworkintegration-5.66.0.tar.xz"
diff --git a/user/freealut/APKBUILD b/user/freealut/APKBUILD
index c249d9d21..035d254fe 100644
--- a/user/freealut/APKBUILD
+++ b/user/freealut/APKBUILD
@@ -6,20 +6,14 @@ pkgrel=0
pkgdesc="Free software implementation of OpenAL ALUT"
url="https://github.com/vancegroup/freealut"
arch="all"
+options="!check" # No test suite.
license="LGPL-2.0-only"
depends=""
-makedepends="openal-soft-dev"
+makedepends="cmake openal-soft-dev"
subpackages="$pkgname-dev"
source="https://distfiles.adelielinux.org/source/freealut-$pkgver.tar.xz"
-prepare() {
- cd "$builddir"
- default_prepare
- mkdir build
-}
-
build() {
- cd "$builddir"/build
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,18 +23,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_C_FLAGS="$CFLAGS" \
${CMAKE_CROSSOPTS} \
- ..
- make
+ -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="218f52ddc5f26aa6744d4209bb2ec6963e423dccec642ba96f9b6d0c1ee0972b9b86cd2fc4c81e21ba2fce7b6ff5e5150d23083b76602d0704a7e65b52f2cc45 freealut-1.1.0_git20140626.tar.xz"
diff --git a/user/freecell-solver/APKBUILD b/user/freecell-solver/APKBUILD
index 78c1eadb5..57ebc05a2 100644
--- a/user/freecell-solver/APKBUILD
+++ b/user/freecell-solver/APKBUILD
@@ -8,15 +8,14 @@ url="https://fc-solve.shlomifish.org/"
arch="all"
license="MIT"
depends="python3"
-makedepends="gperf perl perl-task-freecellsolver-testing python3 py3-random2
- py3-six"
checkdepends="gmp-dev libtap-dev perl-dev py3-cffi py3-pycotap the_silver_searcher
valgrind"
+makedepends="cmake gperf perl perl-task-freecellsolver-testing python3
+ py3-random2 py3-six"
subpackages="$pkgname-dev $pkgname-doc"
source="https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,19 +25,17 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
# The build system generates header files; jobs >1 may cause failures
# because .h don't exist yet.
make -j1
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/freeglut/APKBUILD b/user/freeglut/APKBUILD
index 34b38ebf2..184882c91 100644
--- a/user/freeglut/APKBUILD
+++ b/user/freeglut/APKBUILD
@@ -15,10 +15,11 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
cmake . \
- -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DFREEGLUT_BUILD_STATIC_LIBS=0
+ -DFREEGLUT_BUILD_STATIC_LIBS=0 \
+ .
make
}
diff --git a/user/frei0r-plugins/APKBUILD b/user/frei0r-plugins/APKBUILD
index bbfd1c2ca..989dcc871 100644
--- a/user/frei0r-plugins/APKBUILD
+++ b/user/frei0r-plugins/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer:
pkgname=frei0r-plugins
-pkgver=1.6.1
+pkgver=1.7.0
pkgrel=0
pkgdesc="A minimalistic plugin API for video sources and filters"
url=" "
@@ -12,19 +12,15 @@ depends=""
makedepends="opencv-dev gavl-dev file cairo-dev doxygen
automake autoconf libtool"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://files.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz
- facebl0r-opencv-3.4.3.patch
- "
+source="https://files.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz"
prepare() {
default_prepare
- cd "$builddir"
- touch README AUTHORS ChangeLog TODO
+ touch README.md AUTHORS ChangeLog TODO
autoreconf -i
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,9 +29,7 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="843790389e6de83817d1c3744a91d3365864bb0c22cf6598707ccba5ec8933f6209434011cde1303e16edd89f6cde2f22aa1fb6eca3548d892a2c77332c44aac frei0r-plugins-1.6.1.tar.gz
-785ff3459f371620780f274b82702c8f6625d78fcd6000fddca0585e3aeaa0af57fd9d9444c4d0f1ca47e84b47b8a2fca4b86fa44ebe93487948eb8f4a193503 facebl0r-opencv-3.4.3.patch"
+sha512sums="8c80e8e0ce8c302e633ea1f6ff4e2a141fd7a8bcb7fce25dc7f1f6521be11258a3efa1074c224c7323e6a17bc405413385be193a5c787e2f276252b50477ebce frei0r-plugins-1.7.0.tar.gz"
diff --git a/user/frei0r-plugins/facebl0r-opencv-3.4.3.patch b/user/frei0r-plugins/facebl0r-opencv-3.4.3.patch
deleted file mode 100644
index f3d4f46bb..000000000
--- a/user/frei0r-plugins/facebl0r-opencv-3.4.3.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From b0a06d52e39438fae2afbf98bafe6c794d13b83e Mon Sep 17 00:00:00 2001
-From: Christoph Willing <chris.willing@linux.com>
-Date: Sat, 14 Jul 2018 21:34:03 +1000
-Subject: [PATCH] Include opencv2/imgproc.hpp for CV_RGB()
-
-Signed-off-by: Christoph Willing <chris.willing@linux.com>
----
- src/filter/facebl0r/facebl0r.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp
-index 6d6e8f2..823462a 100644
---- a/src/filter/facebl0r/facebl0r.cpp
-+++ b/src/filter/facebl0r/facebl0r.cpp
-@@ -19,6 +19,7 @@
- #include <stdlib.h>
- #include <opencv/cv.h>
- #include <opencv/highgui.h>
-+#include <opencv2/imgproc.hpp>
-
- #include <frei0r.hpp>
- #include <frei0r_math.h>
diff --git a/user/fslsfonts/APKBUILD b/user/fslsfonts/APKBUILD
index 5734d3301..d910a5664 100644
--- a/user/fslsfonts/APKBUILD
+++ b/user/fslsfonts/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/fslsfonts-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/fstobdf/APKBUILD b/user/fstobdf/APKBUILD
index 0c39dcfba..ad6ffdb18 100644
--- a/user/fstobdf/APKBUILD
+++ b/user/fstobdf/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/fstobdf-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/ftmenu/APKBUILD b/user/ftmenu/APKBUILD
index 3f8e2d157..b5c291a24 100644
--- a/user/ftmenu/APKBUILD
+++ b/user/ftmenu/APKBUILD
@@ -9,13 +9,17 @@ arch="all"
options="!check" # there is currently no testsuite to run
license="GPL-3.0-only"
depends=""
-makedepends="gtk+2.0-dev"
+makedepends="autoconf automake gtk+2.0-dev libtool"
source="https://downloads.sourceforge.net/project/ftmenu/ftmenu/ftmenu-0.4/ftmenu-$pkgver.tar.gz
- include-stdlib.patch"
+ include-stdlib.patch
+ "
-build() {
- cd "$builddir"
+prepare() {
+ default_prepare
autoreconf -if
+}
+
+build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +31,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/fts/APKBUILD b/user/fts/APKBUILD
index 2864ee250..d75403d6a 100644
--- a/user/fts/APKBUILD
+++ b/user/fts/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Provides the fts(3) functions, which are missing in musl libc"
url="https://github.com/pullmoll/musl-fts/"
arch="all"
license="BSD-3-Clause"
+depends=""
makedepends="automake autoconf libtool"
subpackages="$pkgname-dev"
source="$pkgname-$pkgver.zip::https://github.com/pullmoll/musl-fts/archive/v$pkgver.zip"
@@ -14,12 +15,10 @@ builddir="$srcdir/musl-$pkgname-$pkgver"
prepare() {
default_prepare
- cd "$builddir"
./bootstrap.sh
}
build() {
- cd "$builddir"
CFLAGS=-fPIC ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/usr/lib/pkgconfig
diff --git a/user/fuse-exfat/APKBUILD b/user/fuse-exfat/APKBUILD
index 21848f057..66a02e572 100644
--- a/user/fuse-exfat/APKBUILD
+++ b/user/fuse-exfat/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://github.com/relan/exfat/releases/download/v$pkgver/fuse-exfat-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD
index 20a76707d..821be29db 100644
--- a/user/fuse3/APKBUILD
+++ b/user/fuse3/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=fuse3
_pkgname=fuse
-pkgver=3.7.0
+pkgver=3.9.0
pkgrel=0
pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
url="https://github.com/libfuse/libfuse"
@@ -10,14 +10,15 @@ arch="all"
options="suid !check" # Requires fuse kernel module to be loaded
license="GPL-2.0-only AND LGPL-2.1-only AND BSD-2-Clause"
depends="fuse-common"
+#checkdepends="py3-pytest cmd:which"
makedepends="linux-headers meson eudev-dev python3 py3-six py3-pluggy
py3-attrs py3-py"
-#checkdepends="py3-pytest cmd:which"
subpackages="$pkgname-dev $pkgname-doc
$_pkgname-common:common:noarch $_pkgname-openrc:openrc:noarch"
source="https://github.com/libfuse/libfuse/releases/download/fuse-$pkgver/fuse-$pkgver.tar.xz
fix-realpath.patch
- fuse.initd"
+ fuse.initd
+ "
builddir="$srcdir/$_pkgname-$pkgver"
# secfixes:
@@ -71,6 +72,6 @@ openrc() {
install_if="openrc fuse-common=$pkgver-r$pkgrel"
}
-sha512sums="512ac1fff38fa3fbe768ac02a6b138bb5c58ae9c0c898fde237faab9ecb48dafcb063879942d3845cd85af1f5fbe068626401e7da9afbd7ef2f0820757393585 fuse-3.7.0.tar.xz
+sha512sums="0c96df5db4d0ceb7885ddb6f6c05b523ee7e179f8f411ad0614caecb9fa0f5fd682ab9bf4dfdaa3aff9d90c18b8947a122ee376328535e49fa6091d784aa0cb7 fuse-3.9.0.tar.xz
1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b fix-realpath.patch
7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1 fuse.initd"
diff --git a/user/gamin/APKBUILD b/user/gamin/APKBUILD
index b7d0461fc..140e44fc7 100644
--- a/user/gamin/APKBUILD
+++ b/user/gamin/APKBUILD
@@ -6,9 +6,9 @@ pkgdesc="Library for file and directory monitoring"
url="http://www.gnome.org/~veillard/gamin"
arch="all"
license="LGPL-2.0+"
-subpackages="$pkgname-dev"
depends=""
makedepends="glib-dev"
+subpackages="$pkgname-dev"
source="https://www.gnome.org/~veillard/$pkgname/sources/$pkgname-$pkgver.tar.gz
fix-deprecated-const.patch
fix-pthread-mutex.patch
diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD
index c712903ee..476a1ecf5 100644
--- a/user/garcon/APKBUILD
+++ b/user/garcon/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=garcon
pkgver=0.6.4
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="freedesktop.org menu library for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="LGPL-2.0+"
+depends=""
makedepends="intltool glib-dev libxfce4util-dev gtk+3.0-dev libxfce4util-dev
libxfce4ui-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/user/gavl/APKBUILD b/user/gavl/APKBUILD
index bc81e1a5b..8e97e7407 100644
--- a/user/gavl/APKBUILD
+++ b/user/gavl/APKBUILD
@@ -12,7 +12,8 @@ depends=""
makedepends="doxygen"
subpackages="$pkgname-dev $pkgname-doc"
source="https://downloads.sourceforge.net/sourceforge/gmerlin/gavl-$pkgver.tar.gz
- musl-sched_h.patch"
+ musl-sched_h.patch
+ "
prepare() {
default_prepare
@@ -20,7 +21,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,7 +32,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/gcompat/APKBUILD b/user/gcompat/APKBUILD
index e6b142f84..bbc4eedc9 100644
--- a/user/gcompat/APKBUILD
+++ b/user/gcompat/APKBUILD
@@ -25,12 +25,10 @@ ppc64*) _ld="ld64.so.2" ;;
esac
build() {
- cd "$builddir"
make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease
}
package() {
- cd "$builddir"
make LINKER_PATH="/lib/ld-musl-${_link_arch}.so.1" LOADER_NAME="$_ld" WITH_LIBUCONTEXT=YesPlease DESTDIR="$pkgdir" install
}
diff --git a/user/gcompris-qt/APKBUILD b/user/gcompris-qt/APKBUILD
index 9240e9af7..6b53bd372 100644
--- a/user/gcompris-qt/APKBUILD
+++ b/user/gcompris-qt/APKBUILD
@@ -17,9 +17,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="http://gcompris.net/download/qt/src/gcompris-qt-$pkgver.tar.xz"
build() {
- cd "$builddir"
- mkdir build
- cd build
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -31,13 +28,12 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
${CMAKE_CROSSOPTS} \
- ..
- make
+ -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="bc4515acc5c58869997e44c0c3c38d2904f34a7a5efede1ee7aefcbd1ae5907fe00b29a3ecf8e5e46396031736d10df64523e280dfffe3bac2df7e34fe9a8eda gcompris-qt-0.91.tar.xz"
diff --git a/user/gdbm/APKBUILD b/user/gdbm/APKBUILD
index 230f62e28..351236639 100644
--- a/user/gdbm/APKBUILD
+++ b/user/gdbm/APKBUILD
@@ -11,10 +11,9 @@ license="GPL-2.0+ AND GPL-3.0+"
depends=""
makedepends=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="ftp://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz"
+source="https://ftp.gnu.org/gnu/gdbm/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/genmenu/APKBUILD b/user/genmenu/APKBUILD
index 2e34c5192..098f47e30 100644
--- a/user/genmenu/APKBUILD
+++ b/user/genmenu/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Menu generator for Enlightenment, Blackbox, Openbox, Fluxbox, and WindowMaker"
url="https://f00l.de/genmenu/"
arch="noarch"
-options="!check" # this is just a bash script, no tests
+options="!check" # This is just a bash script, no tests
license="GPL-2.0+"
depends="bash"
makedepends=""
@@ -14,8 +14,7 @@ subpackages=""
source="https://f00l.de/$pkgname/$pkgname-$pkgver.tar.bz2"
package() {
- cd "$builddir"
- install -D -m755 -t $pkgdir/usr/bin/ genmenu
+ install -D -m755 -t $pkgdir/usr/bin/ "$builddir"/genmenu
}
sha512sums="eb87db30f6787570ffe844c7b9b25542652e485296ec061ab1da8f2b1bae40942630c9ca141cf8c7b55ce4d99d1b173511850247a5e07243256eb71588515e54 genmenu-1.1.0.tar.bz2"
diff --git a/user/giblib/APKBUILD b/user/giblib/APKBUILD
index 22f125ef3..85f255925 100644
--- a/user/giblib/APKBUILD
+++ b/user/giblib/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=giblib
pkgver=1.2.4
-pkgrel=10
+pkgrel=11
pkgdesc="Graphics library built atop Imlib2"
url="http://linuxbrit.co.uk/details.html"
arch="all"
@@ -10,16 +10,15 @@ subpackages="$pkgname-doc $pkgname-dev"
depends=""
depends_dev="freetype-dev imlib2-dev libx11-dev libxext-dev zlib-dev"
makedepends="$depends_dev"
+subpackages="$pkgname-doc"
source="http://distfiles.gentoo.org/distfiles/$pkgname-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" docsdir=/usr/share/doc/giblib install
install -Dm644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
}
diff --git a/user/gidole/APKBUILD b/user/gidole/APKBUILD
index f20bf594f..2cfa018ec 100644
--- a/user/gidole/APKBUILD
+++ b/user/gidole/APKBUILD
@@ -15,8 +15,7 @@ source="https://dev.gentoo.org/~jstein/dist/gidole-$pkgver.zip"
builddir="$srcdir/GidoleFont"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$builddir"/*.ttf
}
sha512sums="adc58657a4ea0331cda6261de293ab997c8d862fd23824f92860710e4a017267835d5c1fbfc6accace20ce172d5586d5f9568de08adf0266a07a191d9499e727 gidole-2.0.2.zip"
diff --git a/user/glass-tty-vt220/APKBUILD b/user/glass-tty-vt220/APKBUILD
index 54b89f38c..12d39dda5 100644
--- a/user/glass-tty-vt220/APKBUILD
+++ b/user/glass-tty-vt220/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
makedepends=""
subpackages=""
source="http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf"
-builddir="$srcdir"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF Glass_TTY_VT220.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$srcdir"/Glass_TTY_VT220.ttf
}
sha512sums="0b3b598bbdcc8f1177b48a7cedd2ad035a8a95d17d162d868e7c988a9d918f2756a8fe674bef3f30357225a87ea4e3adde01889502540d6920210161edc37023 Glass_TTY_VT220.ttf"
diff --git a/user/gleam/APKBUILD b/user/gleam/APKBUILD
index cc931ea0c..65271ea38 100644
--- a/user/gleam/APKBUILD
+++ b/user/gleam/APKBUILD
@@ -1,70 +1,70 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=gleam
-pkgver=0.4.2
+pkgver=0.6.0
pkgrel=0
pkgdesc="Compiler for the Gleam language"
url="https://gleam.run"
arch="all"
license="Apache-2.0"
depends="erl-rebar3"
-makedepends="cargo erlang-dev"
+makedepends="cargo erlang-dev rust"
source="$pkgname-$pkgver.tar.gz::https://github.com/gleam-lang/gleam/archive/v$pkgver.tar.gz"
# dependencies taken from Cargo.lock
cargo_deps="
-aho-corasick-0.7.4
+aho-corasick-0.7.6
ansi_term-0.11.0
-argon2rs-0.2.5
-arrayvec-0.4.11
+arrayref-0.3.5
+arrayvec-0.5.1
ascii-canvas-2.0.0
atty-0.2.13
-autocfg-0.1.5
-backtrace-0.3.32
-backtrace-sys-0.1.30
+autocfg-0.1.7
+backtrace-0.3.40
+backtrace-sys-0.1.32
+base64-0.10.1
bit-set-0.5.1
bit-vec-0.5.1
-bitflags-1.1.0
-blake2-rfc-0.2.18
+bitflags-1.2.1
+bitmaps-2.0.0
+blake2b_simd-0.5.9
block-buffer-0.7.3
-block-padding-0.1.4
+block-padding-0.1.5
byte-tools-0.3.1
byteorder-1.3.2
-cc-1.0.37
-cfg-if-0.1.9
+cc-1.0.48
+cfg-if-0.1.10
clap-2.33.0
cloudabi-0.0.3
codespan-0.3.0
codespan-reporting-0.3.0
-constant_time_eq-0.1.3
-ctor-0.1.9
-diff-0.1.11
+constant_time_eq-0.1.4
+crossbeam-utils-0.6.6
+ctor-0.1.12
+diff-0.1.12
difference-2.0.0
digest-0.8.1
dirs-1.0.5
docopt-1.1.0
-either-1.5.2
-ena-0.13.0
-failure-0.1.5
-failure_derive-0.1.5
+either-1.5.3
+ena-0.13.1
+failure-0.1.6
+failure_derive-0.1.6
fake-simd-0.1.2
fixedbitset-0.1.9
fuchsia-cprng-0.1.1
generic-array-0.12.3
heck-0.3.1
-im-12.3.4
-itertools-0.7.11
-itertools-0.8.0
-lalrpop-0.17.1
-lalrpop-util-0.16.3
-lalrpop-util-0.17.1
-lazy_static-1.3.0
-libc-0.2.60
-log-0.4.7
+im-14.1.0
+itertools-0.8.2
+lalrpop-0.17.2
+lalrpop-util-0.17.2
+lazy_static-1.4.0
+libc-0.2.66
+log-0.4.8
memchr-2.2.1
new_debug_unreachable-1.0.3
-nodrop-0.1.13
-opaque-debug-0.2.2
+opaque-debug-0.2.3
ordermap-0.3.5
output_vt100-0.1.2
petgraph-0.4.13
@@ -72,61 +72,63 @@ phf_generator-0.7.24
phf_shared-0.7.24
precomputed-hash-0.1.1
pretty_assertions-0.6.1
-proc-macro2-0.4.30
-quote-0.6.13
+proc-macro-error-0.2.6
+proc-macro2-1.0.6
+quote-1.0.2
rand-0.6.5
rand_chacha-0.1.1
rand_core-0.3.1
-rand_core-0.4.0
+rand_core-0.4.2
+rand_core-0.5.1
rand_hc-0.1.0
rand_isaac-0.1.1
rand_jitter-0.1.4
rand_os-0.1.3
rand_pcg-0.1.2
rand_xorshift-0.1.1
+rand_xoshiro-0.4.0
rdrand-0.4.0
redox_syscall-0.1.56
-redox_users-0.3.0
-regex-1.1.9
-regex-syntax-0.6.8
-rustc-demangle-0.1.15
-rustc_version-0.2.3
+redox_users-0.3.1
+regex-1.3.1
+regex-syntax-0.6.12
+rust-argon2-0.5.1
+rustc-demangle-0.1.16
same-file-1.0.5
-scoped_threadpool-0.1.9
-semver-0.9.0
-semver-parser-0.7.0
-serde-1.0.95
-serde_derive-1.0.95
+serde-1.0.104
+serde_derive-1.0.104
sha2-0.8.0
siphasher-0.2.3
-sized-chunks-0.1.3
-string_cache-0.7.3
-string_cache_codegen-0.4.2
+sized-chunks-0.5.1
+string_cache-0.7.5
+string_cache_codegen-0.4.4
string_cache_shared-0.3.0
strsim-0.8.0
-strsim-0.9.2
-structopt-0.2.18
-structopt-derive-0.2.18
-syn-0.15.39
-synstructure-0.10.2
+strsim-0.9.3
+structopt-0.3.5
+structopt-derive-0.3.5
+strum-0.17.1
+strum_macros-0.17.1
+syn-1.0.11
+synstructure-0.12.3
term-0.5.2
termcolor-1.0.5
textwrap-0.11.0
thread_local-0.3.6
-toml-0.5.1
-typenum-1.10.0
-ucd-util-0.1.3
-unicode-segmentation-1.3.0
-unicode-width-0.1.5
+toml-0.5.5
+typenum-1.11.2
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
unicode-xid-0.1.0
-utf8-ranges-1.0.3
+unicode-xid-0.2.0
vec_map-0.8.1
-walkdir-2.2.8
-winapi-0.3.7
+version_check-0.9.1
+walkdir-2.2.9
+winapi-0.3.8
winapi-i686-pc-windows-gnu-0.4.0
winapi-util-0.1.2
winapi-x86_64-pc-windows-gnu-0.4.0
-wincolor-1.0.1
+wincolor-1.0.2
"
source="$source $(echo $cargo_deps | sed -E 's#([[:graph:]]+)-([0-9.]+(-(alpha|beta|rc)[0-9.]+)?)#&.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')"
@@ -161,7 +163,6 @@ prepare() {
build() {
export CARGO_HOME="$srcdir/cargo-home"
- cd gleam
cargo build --release -j $JOBS
export PATH="$PATH:$builddir/gleam/target/release"
}
@@ -169,71 +170,69 @@ build() {
check() {
export CARGO_HOME="$srcdir/cargo-home"
export PATH="$PATH:$srcdir/$pkgname-$pkgver/gleam/target/release"
- cd gleam
cargo test -j $JOBS --release
}
package() {
export CARGO_HOME="$srcdir/cargo-home"
- cd gleam
cargo install --path . --root="$pkgdir/usr"
rm "$pkgdir/usr/.crates.toml"
}
-sha512sums="e2d0eeaa53835066c7c774d4cde89deaee437151f85d068e3f6882decc0fbeb9e44ad321e3d84d234648c935c2aff784c89099cd9dfc845a2438f8e2c3da1cf5 gleam-0.4.2.tar.gz
-06863d85a3183c7ace014d6a8345d47147df53475c194030607314b80e00890625ae88e3e669d15e54704f2d3132dd6bf56dc057b87dab7f06c5deaf50d29b79 aho-corasick-0.7.4.tar.gz
+sha512sums="c47d711064a586070704c1ca6566e309df189c96ad26bbfe4d4b7c785ea1e196131829bb50f1665ae00f66f2a55660b9f6f108a1bf4a5621b104d93405fb0af0 gleam-0.6.0.tar.gz
+120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1 aho-corasick-0.7.6.tar.gz
a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa ansi_term-0.11.0.tar.gz
-09a47467d09ed5bb4efdc4b8392e6282da6f4434063f4352c225c6dd1b668b51623e7d8960deb56c7c18eaca890a3515c1dc833acac1c68dc999e56b63e9b04f argon2rs-0.2.5.tar.gz
-6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4 arrayvec-0.4.11.tar.gz
+6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8 arrayref-0.3.5.tar.gz
+53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043 arrayvec-0.5.1.tar.gz
814f1709d6863b904ba014025b01b3764592eed280df2500f8eaed9c150998315b4ae1de87d9c5d5c179f73cd0c110756e2a4515f04dba9b259f61522ef1cf57 ascii-canvas-2.0.0.tar.gz
4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad atty-0.2.13.tar.gz
-cb5457f92c1698fd8bcb78b7ce3f5af6000cad1637e3aa58cf474bf1a82c4ad7e43e08d8493b2903e3f3b0ce06c32a6640fbaa27700a76150985884bf0aa4a35 autocfg-0.1.5.tar.gz
-3d0ac22101d22d672ed8a695c202b934bc3c5482f1d7db96b3e5787abf1cb2f2fa8b6ad9a0c35a09790e71df30762546a9d3fd1fb959c5fc383e9af1c2fef94b backtrace-0.3.32.tar.gz
-8f80419510e86ee8a9db4a61aa599cbd316c0de46afed1459b4802e45e11c1f66b1a821301d6ad71bd134cb898c7cf75f954c9dfd2c8cfbef299482b509225fd backtrace-sys-0.1.30.tar.gz
+667ca520f2b46140d2f3519b43e5155426a6e7a2130879860eb10b974f84465600077f53abed4c0e6bf2612471f01786bfb3531ea8773d0f50f29d48e05f7925 autocfg-0.1.7.tar.gz
+8b9da3d6c515ef7bc5b04cf4abd53221cc114c912eb5033558b1c45eb6d85e56c0fc39579711fcd26f69fa364a823945901e4c2e5560436013b7523adf267d27 backtrace-0.3.40.tar.gz
+199658b1f95611f7c68a7b4fdd76044fb6784a7ab777a9f5fbe3a4a770bd6c31ac08dfea1297dd85053f0b28b1a686c076a78b120ac46fc3c639c30c937d49c3 backtrace-sys-0.1.32.tar.gz
+674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535 base64-0.10.1.tar.gz
1b58b9a1e6dc33483f302415e0a77544dab288c819ed5d899f6ef3969750a17227c5aeb1b563aef41e77e06e665cfa995e358a566f5783a2d3af0087d5fc65c1 bit-set-0.5.1.tar.gz
c0d57ec2c07ea660919ab7e17881b544496de0d6ee51cc8008b7da0bb39a2dd1ca680cc07051e007d6efaa91b25335e13a799e11a7a9d9a8084cc47525742cc7 bit-vec-0.5.1.tar.gz
-e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3 bitflags-1.1.0.tar.gz
-f89c1067febcd0ed04e86674a42ea7a96aa432ad255210180504f0dec97a10714110eb044fa5004cc48fd75eefac7af4dc12d8a4ad84dad82851ab6d7d916f8e blake2-rfc-0.2.18.tar.gz
+ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b bitflags-1.2.1.tar.gz
+6e89076a6ebe8256b99054a62e5112e8aba12f4393905bb4f6577f8cb19179a566df4fac01533aa83e3ae25950b9818828a9526ad370936355b8e5f761b6c81c bitmaps-2.0.0.tar.gz
+cb7ea3db1911976e48fbf64df4c9dd071d26f54b95d4f14adae2767bd18e5b7948a4f908bf9e5fbecc6e17d4849b878262cd8144d07c04e2d0745fa644ecd19e blake2b_simd-0.5.9.tar.gz
74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf block-buffer-0.7.3.tar.gz
-db06c66edf77b0a6860d75e053b84b74b3f168a320598a7f1de0e55fa6801dda22010328c5b50a56a27aafb09ed61e3e27ad7221d650b546b3798652b767b02b block-padding-0.1.4.tar.gz
+acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a block-padding-0.1.5.tar.gz
18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa byte-tools-0.3.1.tar.gz
2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f byteorder-1.3.2.tar.gz
-85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c cc-1.0.37.tar.gz
-45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c cfg-if-0.1.9.tar.gz
+4392c4455195dabfefc920e3692dc41fc763f7ca9e7163be395d7acefdcd1cf4f5e7a2356a9d8be367d43cb3e4320ad8e7513e5532118a418cd38e98748fe165 cc-1.0.48.tar.gz
+9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339 cfg-if-0.1.10.tar.gz
f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91 clap-2.33.0.tar.gz
691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz
c19fb68a06e4fdec291b172b94a2689b46a4605c7dfef4c33ae5639236f7c3b6ec8f9cecbaabcd72e12adf0d53446696972cc069a50bf54041c2f4a6b908de58 codespan-0.3.0.tar.gz
22706026b13aec1a212e375ea665630154288c9ce056b3cd030b840c5b3ea16aa359678dc8378ca7b75189ff08c8e3faf3c695729f10209f5213021bcca88a0e codespan-reporting-0.3.0.tar.gz
-b605ef913ae39c4d9658e9240b9d3dc7736c8d668e83326fc3c68498ca177e40960047de1beee684a23ce96bdf3f80d5b76ef7db6f2758c7aeb14f7a2258a69e constant_time_eq-0.1.3.tar.gz
-62ae7440af2ac770a8ce9f5b6d4e35fada9f19e9b85b9c211a69a3ba763b458c2f38bef8b93dc0995f1474846d535f2f789bb4569234d935f146db219e4c8e60 ctor-0.1.9.tar.gz
-9c31d38bc29c9372984339b8d289317981ba483eee4430e936252b0fc44b1f500305082b19e6dc20b7d7fc81906f1c0d5c3f375b6db9f2c266e41c7015597073 diff-0.1.11.tar.gz
+65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96 constant_time_eq-0.1.4.tar.gz
+771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5 crossbeam-utils-0.6.6.tar.gz
+b73f9b9470c75aab8368accf179dbc42ccc0530f5e18ceceef6f2206bf1d9016862d578f720ddc97dac9a52cdae6da019599cacf06a44a13817d1cc0390a4b75 ctor-0.1.12.tar.gz
+0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16 diff-0.1.12.tar.gz
cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482 difference-2.0.0.tar.gz
186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055 digest-0.8.1.tar.gz
12ebc3e92511373b11c2b7913b7bf74f8022344758057a2c71e36ec262e7ea6ac386bc75c323317406f1b25e965e047ddb308ff5017a1e607b48b978414e7416 dirs-1.0.5.tar.gz
f5dd97b4dbc9109811a83dba45bb09018f394adf3f5389cc62f7d42749c90dc337b7f5efdee569150a70194f5bda777a22107123ec7341a38c4f9923bb6f9f81 docopt-1.1.0.tar.gz
-88b4ad9854281d6748177b8e18a1cb1a9ac8948d2de8ebadbad94e72bf8b825361b142d890b6264106069af48328bb9844afd248f64b5469d2d2cb81d0ce5187 either-1.5.2.tar.gz
-edbc65aa296890d5960427c156d060fc8c8e4773223d725e4d8c93da3056dc5abc986e10b6ad4c75b5ef8631d65fa9da1962311cf49a4f529f86a1e613e67386 ena-0.13.0.tar.gz
-8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc failure-0.1.5.tar.gz
-c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a failure_derive-0.1.5.tar.gz
+5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2 either-1.5.3.tar.gz
+73b1ba85df436ab0ea7bc19e3540af90b4d55de49b0c639c8cc83a9be2019dd56594530e6826dafbdcb5da673d1645a49a8f64207d6680ee16d7356d5283637f ena-0.13.1.tar.gz
+9f962b30c3d242e59b22aa0df59524ab8a996e9f1c9c32677d22208edc37f0f9d4727e9e6e8f1841270d3ac1e1bf8057085e067bff23478b7e5f020f475690b8 failure-0.1.6.tar.gz
+5134df91747949e5f697ea98ea17716d1fd11f67fdb94230739d57bd8abba367474d45a1409319973a96bbfa0204d6f6854524ae41e9377e44f6eef66a5dfcc3 failure_derive-0.1.6.tar.gz
d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893 fake-simd-0.1.2.tar.gz
07b45fb7e676c6a1b450d23ff53651e1ea1eafdbfc5bc304b13255e0c30f72718fb37fe0f17f2baff799015aa29405b8a677eac604e3219e5ed3f9abecda1964 fixedbitset-0.1.9.tar.gz
ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz
75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8 generic-array-0.12.3.tar.gz
134722192c46fd64b38d2fbec3a2511c560916e906491a72c4ec9d99b9f716dc58942fb99cac99b9a6ef2de5b5ad1d1c1155f292d091401b6873347d80c086d6 heck-0.3.1.tar.gz
-b0698de343e4871762b8b45657423d07adb3de5f6516a3848c3736fdc69870101ec69c41d15ce5c9b5ba1b575f2703ed3fcd871ba01889beefcea2a1dc096bd9 im-12.3.4.tar.gz
-29951da2e976befacaeab91a1016a935e81cfc05d4eec04910de6710b14d0ca3a865ab6b5cbf4ec78a0ccbee1c025b6ef0c93f4e0b7be3f7dc3f4eaea408fc87 itertools-0.7.11.tar.gz
-ce1dd1f52f6792a6f5303e15f74063d50c11b75312cb807eeddaae7811686347c390426956cbe87b827b970b14b6e4d57fb4ac0f288632766218ff8661feb610 itertools-0.8.0.tar.gz
-5e6aa8b21b011ee47a852afc99f2415367919494b7fcd612a3aef71b1785fdeb4cf3897000b0bd3d8cec6b50214400f3eeb48bb9c450d1d91baf439e2e3e848e lalrpop-0.17.1.tar.gz
-90fdf4e09cb77ec49bc6129fb94b510635ad84b57b86a2a7e13abfb03c1599fd0a847fefc8a1bc7387d58073f1e5052bc6669b376fb8018ee4ec1e4b2b91c460 lalrpop-util-0.16.3.tar.gz
-367710b68a1ba1f84dda73e30c8fa48fdeb547e72f1cba0b8d8ac75d43e8bf8fe0f296e0a4268f3fcb1e6ead09712f8312bd03ec226d8d79292538dc355e1f1a lalrpop-util-0.17.1.tar.gz
-08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822 lazy_static-1.3.0.tar.gz
-649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c libc-0.2.60.tar.gz
-ecc8ba6fe505d8366ad9ee691bc19bb97654097d796d80eeb2544ac71aa7031fd57aac8d64eb065c8cc74471a8cca0a7e2092fb20e88cfc64050b650c2f760ba log-0.4.7.tar.gz
+003e3e6c8d1ba50f12ae119eed83e48e0c89db473714397ed81479440affd5b699c9de004a5454207fac2c23783a798079d5381a1a383203a64f9ccbe046237f im-14.1.0.tar.gz
+325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3 itertools-0.8.2.tar.gz
+257d72cd455153aab1c619d05ff9bf55c010957728d582f77f05c665203fd54337024a6670ecd5fe66243b3e0b1bb82af55ed3797cfbb8de1e5a57492de495c3 lalrpop-0.17.2.tar.gz
+bc11b32ed4adbd5414645e3758b4baea17c90035bf3195d91181adcba2c0e703a56e503967d12c8e154ba6c208d39e122af333042e7143e34cd9445799bf09b3 lalrpop-util-0.17.2.tar.gz
+e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8 lazy_static-1.4.0.tar.gz
+5bf5645a7cbe626108cd71e1d189286ed161fcd3ea12cd34f4e392be4cf93bf78feb6128b1101bedc41a71091398f26771f3efd3880f779ee0be00f706914975 libc-0.2.66.tar.gz
+0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b log-0.4.8.tar.gz
0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d memchr-2.2.1.tar.gz
d12686d789b0c37ae0b05881223b61737fd04092f10217caf4e6c9b8604e0a7734c9ff81b01ac204966c687481758b4dfaebf3b4947736ff90291a0dbfed3caa new_debug_unreachable-1.0.3.tar.gz
-2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e nodrop-0.1.13.tar.gz
-3bbe9ada50d8fbeb46a0d3ee624a8e2a4f8012ba018f7a9e2408817756c6aeae2804b89537685509cd4872b1ac19bdbe01b6e09d7ba22995d9046b99587fa157 opaque-debug-0.2.2.tar.gz
+7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40 opaque-debug-0.2.3.tar.gz
4413319af191656c82c6f4b185840486d2021ab4a91e412e5472329af928a6519690734613f9616c285c6a4c967a4c718483583e0a5d4b16bd98b01f3d226ddd ordermap-0.3.5.tar.gz
b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae5cf36286b82d1a54fb08b28720f1592ab6cfe0814c8d3036 output_vt100-0.1.2.tar.gz
670753503b9ee5eb28b73e9ad6367f5cc97064182ed82d691ab95e3948b1d879aec9c74eabad11c232f40cb18d2629e1bdfedb3f0d444d65526a2bd7e69bb60b petgraph-0.4.13.tar.gz
@@ -241,58 +240,60 @@ b8eb00a541bebef2e0bb44975c4547fadfd4ab88a14aa8e31945f3c73531a550cf5729f1f3d18fae
5d46e738eb9afa2c77c5d123ef47dc1f7ae767baa043cf3a937118faa64696e714dac57f01861bf58a39dac67048c55a301dd24401cbb1976a7f753873e49cca phf_shared-0.7.24.tar.gz
a118a98286a47e2f0cf35d2678d0325c18b9b7d5bdf40ceadc16483b282307fd1498434d5bdfa25477a4f420d97c34d786e42e9fa70431b788b4b8fde9718e05 precomputed-hash-0.1.1.tar.gz
10010c6e6b02098def38a8e6cbfe34fd052fe5773628d57a8141c7933f868906870158b4d4b1948b752d2c5f7b2981806d5f835e125aa2447d408415ba764f71 pretty_assertions-0.6.1.tar.gz
-73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0 proc-macro2-0.4.30.tar.gz
-bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e quote-0.6.13.tar.gz
+7db38f6b5f7e0697c1d6a14de1d0e3d67670dfc1005f74a9993d9c4ec31a4d1165375735711edda2a35e92d6f03619f4e139ac9d5197014853c8333d879d665d proc-macro-error-0.2.6.tar.gz
+d0a6358eb6f9334128a5b47c096bfc57452e13d603c9514df433409069c00468fa2b3c76761d7f3696abb061c1c3ba24150e0cf9be2c5d571d580238d2d27853 proc-macro2-1.0.6.tar.gz
+67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4 quote-1.0.2.tar.gz
2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz
200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz
5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz
-f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845 rand_core-0.4.0.tar.gz
+f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 rand_core-0.4.2.tar.gz
+4f7500b35e165e6c817fdd67a50745d5497d24e554bb554705097e37258751e8755c4d6b8a69fcb5e1977708ba78620bc35d640e4e018fcd4e88d9dbdbebdcbf rand_core-0.5.1.tar.gz
808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz
9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz
fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz
01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz
6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz
3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz
+e889eb75ef40ad52eaf32692b3a405e01eacfeb20e0dc171de8f1b2ce05723ba448e293a2ee91eb3bec3cb5a2667bd05c11433b50470eea9219586afa73f519e rand_xoshiro-0.4.0.tar.gz
6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz
17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1 redox_syscall-0.1.56.tar.gz
-c58b608971a6c2f38272d864dbaa95a6bcbc7139db0de74afc949c238b8a0a48851cd167c219c3956e81efea46f035e162e0bbdac22cad444cb260cb168a0353 redox_users-0.3.0.tar.gz
-550a062637075525b6898cf6c710ab1adadeba17480bdc9c59f02ac504f390f1042ca6e89a6c0f4abc583856ca2b7e2387c53de41d1060cec23b9050b2f78c71 regex-1.1.9.tar.gz
-cc0f4d4f16cd77ed7f5afcfc6d715c1becd9b30e9d8034460748b2b8c42dfb07cadce8e68198dc63521251476cf5f9265732bfeacb29c43f619183211818b20a regex-syntax-0.6.8.tar.gz
-9d10aae8df45db86fcee7fd51edc60961221cf2e3e74e826360fd01c8aa4dbf64eb1de4431309e6db89966f8f88c0933a35156835696f4693fc6f9d5c2e5fd1c rustc-demangle-0.1.15.tar.gz
-01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779 rustc_version-0.2.3.tar.gz
+086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5 redox_users-0.3.1.tar.gz
+6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7 regex-1.3.1.tar.gz
+671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec regex-syntax-0.6.12.tar.gz
+80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c rust-argon2-0.5.1.tar.gz
+36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063 rustc-demangle-0.1.16.tar.gz
33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc same-file-1.0.5.tar.gz
-df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33 scoped_threadpool-0.1.9.tar.gz
-03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc semver-0.9.0.tar.gz
-17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f semver-parser-0.7.0.tar.gz
-5b6052e64c0a291e39e2cbb4d36de0216f3a6cdd756257a4492b3c0a3942204c8ab9156867d482fc29b260e5a0c200939efae010c972519ed88d70fe51f94ceb serde-1.0.95.tar.gz
-f5d02f741c096c5f45c68c8c611e211aecd3e1fbc9e22776be3a837cc13682f3ea993fa2acfb69223b4124b7f15350debbb67cc5f6659d27e4877e4c26d0adee serde_derive-1.0.95.tar.gz
+638a1dacc158d69658a005e599adc19d6bc80d0c663f527b1ff906f729e70e027eacc4ea5b9b2c675ac990d5997f50f9d46d614ba95b0c73bb9606aba46b053a serde-1.0.104.tar.gz
+303c3d126ca56b0a7126a87e9e1be8bd60bdb212ed21b5e1aee015313fd769f1d260869c41b0335bd467fd4e3fc6bb26f428c7c4b35e9a55c009797cfa745d1e serde_derive-1.0.104.tar.gz
6d95888b40c7f84b245864891d4a3e8c06ed3e0cde1aaeacde2ef75c969e00b524fe6045aa9b978d0036b315cc74502f88aab0da67c6708b2450efa9119abdad sha2-0.8.0.tar.gz
7bccf3a0c988da97c36d5f80518a5adaca58385f7000697cf10771ab246e88509746e2ec9a356122d25c98f0acd98eef97fb97f81a92959622ed51dff61b37d0 siphasher-0.2.3.tar.gz
-613a306d7596846da858543c5eb34bcb52356e5ebefe77ebe36623f1bdd4579d18fea955c6ea07788dfaccfea013afa0c817f709afaaf01317362575370dda54 sized-chunks-0.1.3.tar.gz
-4ee532350e951ff1423aba00c34054653e2a2e6fdda8fe86d4052407cbbcf51bf3765288e581e6dbd7031969cafc9727267b2ebaf23750eb3e866b855b567fc2 string_cache-0.7.3.tar.gz
-1d0d91a6766a4985a833d5d0931b3331a37e1c97c82ccd4c85a92a8d338b3dfb6202a1a7c6c132e976a49f173d4fdbe5ff903120d20e6493d1be76af167b1026 string_cache_codegen-0.4.2.tar.gz
+31fcaeba18cae9ac1e9d6a994619249affe42a4c9a3dbbcafeefce809fbdb778972ae4bc222d7cf2d3b3a0c8d163edd99dcc859806b6e50b9a3d8066b8cad5ab sized-chunks-0.5.1.tar.gz
+b712043a5aff20ca197eae5e9e1ad50ea164631e6c8be25549e67c4c2b83e3bd7b2fce9def410dce585d8aca682ad17ce51d61b5c2bbdf10404f3114dbb8b139 string_cache-0.7.5.tar.gz
+59a92121f4e0967da13c6a2f40cfefb0451c734af6555f014dfd885ef8b478a803253f0c36c7ec95cd78032f2f50d3614daa3828cdc85e28acb6f588472aca44 string_cache_codegen-0.4.4.tar.gz
1ccae53f80c250bcb715c3276133295f3543d0a8708fe4a990c1ac81a5c783c23d9e7e080fa7bd159397d0908f90cf1eb3453975750c121c1c36c80d3fd3cca3 string_cache_shared-0.3.0.tar.gz
1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34 strsim-0.8.0.tar.gz
-2054444ea844a25f573219a4993986b69ff8c5dc0dfd2dd06fff638d596c8c5b5a1bedafc2bef3a1b9c146dd47a0769bbe039c54fd8e2a5d9894f29ab9f32838 strsim-0.9.2.tar.gz
-fafa9cea1a99950d1ef8bde53ab5a18daabd5cf131f3c2bacf25786f057b2d0169fe6f5d6e96761a74b6e9cf72a9d6b7dfee53edfe0018a19260ee66ba9b5f97 structopt-0.2.18.tar.gz
-b3bb2a2c1b28aa275ae25d60ca0a3878b715293950748fdd4ce5c791bc5e7fbf066db3bf4678b7a6fb3a61b2b2703ff14503f87db3659281c7b201b427c59965 structopt-derive-0.2.18.tar.gz
-a90235633ae87b24c6a631f79333e9290da7510a92a64e76ba298b8ef673767a07396271f25e8a6d089ae54fe658d82d70f38788f7e19841f623b02ec5529f52 syn-0.15.39.tar.gz
-48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458 synstructure-0.10.2.tar.gz
+8d7468be0f19819a454720d2fc9a139cb9afde9984f73d334b9b77085b58008d6d8ed0786f88ef91b4967c503fa1fac0ddf2fdba01391629f7bcf1ef2fe36b51 strsim-0.9.3.tar.gz
+a5b981c50d501f08bbacfdf9a9ffb991d1e17059cc502b8bdee70bcc412a9ea42c0840cf1e154647f420fe4817370e63a0824484ea9b40a0de92682820c43bd2 structopt-0.3.5.tar.gz
+cf55e93866d80ab266eca6008fb1b841cd6315cea779cc79dcd555ca98d1b85ec9227285c80fa1dd611ebcade6644881fb9ac53be04d7bbb36e3d84ae6b86cfe structopt-derive-0.3.5.tar.gz
+8e22d02ad05c1718b013fb27b63f2d09c631c037e1fa6e27d78cb5e1b8b11bb2dbbcaff49a76dc795a6de9629765c36fb04e3c9549e4c01ad88ed1df474899e9 strum-0.17.1.tar.gz
+4ce42a7ca81c1ff57df782c4bfda0bd20b33e8ef181d1fea58fb145166979c4252c60b64351fe305aeda2e05e972e4e65c61a9fdcc5cd6e1fa44322f9c98f1a1 strum_macros-0.17.1.tar.gz
+6b361c6cb27aebb3da5e81db270e7cd0fe8bfb11289c25ce46127214e222c2b64f53164c8869de41b77e9b780f967454ed5d7c5b73442ae292eadc4dea77494c syn-1.0.11.tar.gz
+919f908c679439cb9c2e60ee8672484504f03781412fd13f5cbd745a86ed794691665bcd7ea995667e89344d0eab725125fb0027c60f240290b300d04be26a59 synstructure-0.12.3.tar.gz
421b04f067f66ddecb615d715c828c98d3fa351b3490ec76bfa02bf430039717da5a168c20033399d5544ded5aed35c2aa4c9e6ea5018211bfe615389d18f3d6 term-0.5.2.tar.gz
d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca termcolor-1.0.5.tar.gz
f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a textwrap-0.11.0.tar.gz
cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253 thread_local-0.3.6.tar.gz
-4b8b9212934b8a8bf8f09fc9c63219f3bd8d21a1bc5ec4f4208fa833743951ddb53cb99b5fa27b9b59d2223cc74a7274d6eb196255e44650bb633e24b2529073 toml-0.5.1.tar.gz
-9ff611df79e312b8ab32522007981220213f2beddd959118a855d08b94b7a7d35d38378694c8667c2d6aa324933307a47a4072a89cacf7e594537794385b9449 typenum-1.10.0.tar.gz
-50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e ucd-util-0.1.3.tar.gz
-6f32a36c8c69e80b3aacfcf68cde088a34b88587e20de6e49a14b24941caa51a0031623941ef05e6d36e5c99f50472c9bb26d670b5396749bae8373ae4bc7d4c unicode-segmentation-1.3.0.tar.gz
-bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2 unicode-width-0.1.5.tar.gz
+8f6a04dc24ea775a9a28cc948039f20540ec983c46b287ebfa820e29cc5867803765ce099283f79d3b4a22c513b386603dbd8130808cb3354bc63b5d4706cb33 toml-0.5.5.tar.gz
+c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a typenum-1.11.2.tar.gz
+80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e unicode-segmentation-1.6.0.tar.gz
+39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84 unicode-width-0.1.7.tar.gz
cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d unicode-xid-0.1.0.tar.gz
-24907ad7ae1a02713e6ecc62e0c73488abea338f0dd3b49291b914ca907b3a220cb90f8ca409c6aa57d2e0e5d8ca8c44cd310081ffe7be9208952d73ec53b9f8 utf8-ranges-1.0.3.tar.gz
+590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359 unicode-xid-0.2.0.tar.gz
026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40 vec_map-0.8.1.tar.gz
-c20ffc6485ccadcecd68aa21c356c27e11705828ceb3456b1dee4213363defc31b3f46a73cc00e0ea386d7765e333d095d34500f41707ff1a2569c45b5fd482d walkdir-2.2.8.tar.gz
-6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134 winapi-0.3.7.tar.gz
+b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf version_check-0.9.1.tar.gz
+43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b walkdir-2.2.9.tar.gz
+5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736 winapi-0.3.8.tar.gz
a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz
54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a winapi-util-0.1.2.tar.gz
4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz
-f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1 wincolor-1.0.1.tar.gz"
+b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10 wincolor-1.0.2.tar.gz"
diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD
index a0bac403d..f499efc9d 100644
--- a/user/glibmm/APKBUILD
+++ b/user/glibmm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=glibmm
pkgver=2.62.0
pkgrel=0
diff --git a/user/gmime/APKBUILD b/user/gmime/APKBUILD
index 1e7db9163..cb1b591b9 100644
--- a/user/gmime/APKBUILD
+++ b/user/gmime/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Luis Ressel <aranea@aixah.de>
-# Maintainer:
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gmime
-pkgver=3.2.4
+pkgver=3.2.5
pkgrel=0
pkgdesc="MIME utility library"
url="https://developer.gnome.org/gmime/"
@@ -10,7 +10,7 @@ license="LGPL-2.1+"
depends=""
depends_dev="gpgme-dev libidn2-dev zlib-dev"
checkdepends="gnupg"
-makedepends="$depends_dev"
+makedepends="$depends_dev autoconf automake libtool"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
3.2.3-broken-tests.patch
@@ -42,5 +42,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b gmime-3.2.4.tar.xz
+sha512sums="37488da84f1befb37a0dff9465e9f786670dfb7248adbbc1f227dcc0e80bcd4ee7cd239abeab2b52e8ded6ea7f8aa432bcc0461b379282dacd6ee4f867aa049d gmime-3.2.5.tar.xz
443e768e15eb25116368739957ac31a30cd10a921c113b76af1a0baf0c690ca1346463577289d24ce8f46deb014dd014040033bc1f3d02d8a2190c70dd4c2a74 3.2.3-broken-tests.patch"
diff --git a/user/gnu-ghostscript/APKBUILD b/user/gnu-ghostscript/APKBUILD
index 0c09a5aa9..583194c4b 100644
--- a/user/gnu-ghostscript/APKBUILD
+++ b/user/gnu-ghostscript/APKBUILD
@@ -18,7 +18,6 @@ source="ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-$pkgver.tar.xz
"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
make DESTDIR="$pkgdir" soinstall
install -D -m644 base/*.h "$pkgdir"/usr/include/ghostscript
diff --git a/user/gnucobol/APKBUILD b/user/gnucobol/APKBUILD
index c95083a7f..1173da988 100644
--- a/user/gnucobol/APKBUILD
+++ b/user/gnucobol/APKBUILD
@@ -11,13 +11,15 @@ license="GPL-3.0+ AND LGPL-3.0+ AND GFDL-1.3"
# Since it compiles to C as an intermediate, the headers / libraries must
# always be present and thus there is no -dev subpackage.
depends="db-dev gmp-dev ncurses-dev"
-makedepends="help2man texinfo"
+makedepends="autoconf automake help2man libtool texinfo"
subpackages="$pkgname-doc $pkgname-lang"
source="https://downloads.sourceforge.net/project/open-cobol/gnu-cobol/3.0/$pkgname-$_pkgver.tar.xz
https://dev.sick.bike/dist/newcob.val.Z
keep-debug-flags.patch
big-endian.patch
- tests-are-fatal.patch"
+ tests-are-fatal.patch
+ dash-compat.patch
+ "
builddir="$srcdir/$pkgname-$_pkgver"
prepare() {
@@ -51,5 +53,6 @@ package() {
sha512sums="da669f7bef0c6664723dc88c20e28236ea31d5c933d9129b0132e929eb66f723995d3428b056164cf105bc22b38b8bc5fbf9d0d5b76df4ce6c08045837930fa0 gnucobol-3.0-rc1.tar.xz
eb784866d1a335834074fbe103b5c5f5da810d847ae14a64316ecbb2c0f95ef751d2f2ec609b8fa21ef0b775817dc61115a574608ec89750d779ae0afbb95379 newcob.val.Z
f45611c1298680b0c763094af662b3d1925d32379d33faff77862d7eaa3bf6225f68d5160a39a0822f54b570c923a53bc72dec54cff4f04f1162515834a40be2 keep-debug-flags.patch
-f7c1249db9d0f8d3a4eda732db93970f73fe649d1725b0b73c92af4885bc816d8727dbbcb8e9a1fb998997f3beed7de2812202749f05bbe1471b907737645648 big-endian.patch
-ca5ba1e19e5ff8740008b45ffcea4c1e8e34fc62246f3e635424ae1ec374c5cd9d7cc94d371690c021ccf82e293db7235143ebcaadb20ae5e4fc258749ff56c4 tests-are-fatal.patch"
+f8f8bb395e3f2e0e993df5133d1ed459dc7f03f148d76ddbbe4820f7674300c8c9a8d024785124444ca71a18a0d917e816ab852e0b5e9ebbfa5ed35f12a80b0f big-endian.patch
+ca5ba1e19e5ff8740008b45ffcea4c1e8e34fc62246f3e635424ae1ec374c5cd9d7cc94d371690c021ccf82e293db7235143ebcaadb20ae5e4fc258749ff56c4 tests-are-fatal.patch
+376af9b264b679388722b4d489a834cfb24b47fbdb6cd9bd9c239894741ffc265c2f83d770b0a820f48b3668b3596544183b48bee319186e4ed5c9c60bad4e77 dash-compat.patch"
diff --git a/user/gnucobol/big-endian.patch b/user/gnucobol/big-endian.patch
index 848300e15..65e5243d2 100644
--- a/user/gnucobol/big-endian.patch
+++ b/user/gnucobol/big-endian.patch
@@ -14,7 +14,7 @@ diff --git a/tests/testsuite.src/run_misc.at b/tests/testsuite.src/run_misc.at
index 2ef4a86..173ac48 100644
--- a/tests/testsuite.src/run_misc.at
+++ b/tests/testsuite.src/run_misc.at
-@@ -6185,6 +6185,10 @@ AT_CLEANUP
+@@ -5918,6 +5918,10 @@ AT_CLEANUP
AT_SETUP([MF FIGURATIVE to NUMERIC])
AT_KEYWORDS([MOVE])
@@ -25,7 +25,7 @@ index 2ef4a86..173ac48 100644
AT_DATA([prog.cob], [
IDENTIFICATION DIVISION.
PROGRAM-ID. prog.
-@@ -6230,12 +6234,16 @@ AT_DATA([prog.cob], [
+@@ -5963,12 +5967,16 @@ AT_DATA([prog.cob], [
DISPLAY "MOVE HIGH-VALUES TO BIGFLT"
MOVE HIGH-VALUES TO BIGFLT.
PERFORM SHOW-BIG.
@@ -42,7 +42,7 @@ index 2ef4a86..173ac48 100644
DISPLAY "MOVE ALL '21' TO BIGFLT"
MOVE ALL '21' TO BIGFLT.
PERFORM SHOW-BIG.
-@@ -6244,7 +6252,6 @@ AT_DATA([prog.cob], [
+@@ -5977,7 +5985,6 @@ AT_DATA([prog.cob], [
CALL "dump" USING MYFLD.
SHOW-BIG.
DISPLAY "BIGFLT is " BIGFLT.
@@ -50,7 +50,7 @@ index 2ef4a86..173ac48 100644
])
AT_DATA([cmod.c], [[
-@@ -6303,10 +6310,8 @@ BIGFLT is 2.1973164E-18
+@@ -6033,10 +6040,8 @@ BIGFLT is 2.1973164E-18
22222222 .
MOVE ALL * TO BIGFLT
BIGFLT is 5.4312347E+12
@@ -77,7 +77,7 @@ diff --git a/tests/testsuite.src/run_misc.at b/tests/testsuite.src/run_misc.at
index 173ac48..51f4b84 100644
--- a/tests/testsuite.src/run_misc.at
+++ b/tests/testsuite.src/run_misc.at
-@@ -6275,7 +6275,7 @@ prog.cob:28: warning: numeric value is expected
+@@ -6005,7 +6005,7 @@ prog.cob:28: warning: numeric value is expected
prog.cob:6: warning: 'MYFLD' defined here as PIC 9(4)
prog.cob:34: warning: numeric value is expected
prog.cob:6: warning: 'MYFLD' defined here as PIC 9(4)
@@ -105,7 +105,7 @@ diff --git a/libcob/common.c b/libcob/common.c
index 5262282..d99c533 100644
--- a/libcob/common.c
+++ b/libcob/common.c
-@@ -5275,9 +5275,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
+@@ -5138,9 +5138,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
COB_CHK_PARMS (CBL_GC_GETOPT, 6);
@@ -116,7 +116,7 @@ index 5262282..d99c533 100644
if (COB_MODULE_PTR->cob_procedure_params[1]) {
lo_size = COB_MODULE_PTR->cob_procedure_params[1]->size;
}
-@@ -5288,9 +5286,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
+@@ -5151,9 +5149,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
opt_val_size = COB_MODULE_PTR->cob_procedure_params[5]->size;
}
@@ -127,7 +127,7 @@ index 5262282..d99c533 100644
if (lo_size % sizeof (longoption_def) == 0) {
lo_amount = (int)lo_size / sizeof (longoption_def);
longoptions_root = (struct option*) cob_malloc (sizeof (struct option) * (lo_amount + 1U));
-@@ -5305,9 +5301,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
+@@ -5168,9 +5164,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
}
longind = cob_get_int (COB_MODULE_PTR->cob_procedure_params[2]);
@@ -138,7 +138,7 @@ index 5262282..d99c533 100644
shortoptions = cob_malloc (so_size + 1U);
if (COB_MODULE_PTR->cob_procedure_params[0]) {
cob_field_to_string (COB_MODULE_PTR->cob_procedure_params[0], shortoptions, so_size);
-@@ -5333,9 +5327,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
+@@ -5196,9 +5190,7 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
longoptions = longoptions + 1;
}
@@ -149,7 +149,7 @@ index 5262282..d99c533 100644
longoptions->name = NULL;
longoptions->has_arg = 0;
longoptions->flag = NULL;
-@@ -5348,17 +5340,42 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
+@@ -5211,17 +5203,42 @@ cob_sys_getopt_long_long (void *so, void *lo, void *idx, const int long_only, vo
return_value = cob_getopt_long_long (cob_argc, cob_argv, shortoptions, longoptions, &longind, long_only);
temp = (char *) &return_value;
@@ -218,7 +218,7 @@ diff --git a/libcob/fileio.c b/libcob/fileio.c
index 885cd48..521e245 100644
--- a/libcob/fileio.c
+++ b/libcob/fileio.c
-@@ -5633,6 +5633,22 @@ cob_sys_open_file (unsigned char *file_name, unsigned char *file_access,
+@@ -5559,6 +5559,22 @@ cob_sys_open_file (unsigned char *file_name, unsigned char *file_access,
COB_CHK_PARMS (CBL_OPEN_FILE, 5);
@@ -241,7 +241,7 @@ index 885cd48..521e245 100644
return open_cbl_file (file_name, file_access, file_handle, 0);
}
-@@ -5647,6 +5663,24 @@ cob_sys_create_file (unsigned char *file_name, unsigned char *file_access,
+@@ -5573,6 +5589,24 @@ cob_sys_create_file (unsigned char *file_name, unsigned char *file_access,
* @param: file_dev : not implemented, set 0
*/
@@ -266,7 +266,7 @@ index 885cd48..521e245 100644
if (*file_lock != 0) {
cob_runtime_warning (_("call to CBL_CREATE_FILE with wrong file_lock: %d"), *file_lock);
}
-@@ -5654,8 +5688,6 @@ cob_sys_create_file (unsigned char *file_name, unsigned char *file_access,
+@@ -5580,8 +5614,6 @@ cob_sys_create_file (unsigned char *file_name, unsigned char *file_access,
cob_runtime_warning (_("call to CBL_CREATE_FILE with wrong file_dev: %d"), *file_dev);
}
@@ -300,7 +300,7 @@ index 7c3c660..5ddbd58 100644
## Written by Keisuke Nishida, Roger While, Simon Sobisch, Edward Hart
##
## This file is part of GnuCOBOL.
-@@ -4254,7 +4254,7 @@ AT_CLEANUP
+@@ -4145,7 +4145,7 @@ AT_CLEANUP
AT_SETUP([UDF with recursion])
AT_KEYWORDS([functions LOCAL-STORAGE])
diff --git a/user/gnucobol/dash-compat.patch b/user/gnucobol/dash-compat.patch
new file mode 100644
index 000000000..e2d7f6006
--- /dev/null
+++ b/user/gnucobol/dash-compat.patch
@@ -0,0 +1,29 @@
+--- gnucobol-3.0-rc1/tests/testsuite.src/listings.at.old 2018-04-22 19:55:50.000000000 +0000
++++ gnucobol-3.0-rc1/tests/testsuite.src/listings.at 2020-01-14 09:08:26.488668118 +0000
+@@ -2185,7 +2185,7 @@
+
+ AT_CHECK([$UNIFY_LISTING prog.lst prog.lis once], [0], [], [])
+
+-AT_CHECK([test "$COB_HAS_64_BIT_POINTER" == "yes"], [0], [], [],
++AT_CHECK([test "$COB_HAS_64_BIT_POINTER" = "yes"], [0], [], [],
+
+ # Previous test "failed" --> 32 bit
+
+@@ -5761,4 +5761,4 @@
+ AT_CHECK([$UNIFY_LISTING prog.lst prog.lis once], [0], [], [])
+ AT_CHECK([diff prog1.lst prog.lis], [0], [], [])
+
+-AT_CLEANUP
+\ No newline at end of file
++AT_CLEANUP
+--- gnucobol-3.0-rc1/tests/testsuite.src/data_pointer.at.old 2018-04-22 19:55:46.000000000 +0000
++++ gnucobol-3.0-rc1/tests/testsuite.src/data_pointer.at 2020-01-14 09:08:48.226341564 +0000
+@@ -40,7 +40,7 @@
+
+ AT_CHECK([$COMPILE prog.cob], [0], [], [])
+
+-AT_CHECK([test "$COB_HAS_64_BIT_POINTER" == "yes"], [0], [], [],
++AT_CHECK([test "$COB_HAS_64_BIT_POINTER" = "yes"], [0], [], [],
+
+ # Previous test "failed" --> 32 bit
+
diff --git a/user/goffice/APKBUILD b/user/goffice/APKBUILD
index 5e61d7eb7..6a60b2ce1 100644
--- a/user/goffice/APKBUILD
+++ b/user/goffice/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Library of document-centric objects and utilities built on top of GLib
url="https://www.gnome.org"
arch="all"
license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+ AND MIT"
+depends=""
makedepends="librsvg-dev intltool gtk+2.0-dev libtool gtk-doc
libxslt-dev gobject-introspection-dev glib-dev libgsf-dev cairo-dev
libxml2-dev gtk+3.0-dev"
diff --git a/user/gprbuild/APKBUILD b/user/gprbuild/APKBUILD
index 46cd8f81d..4ffe06950 100644
--- a/user/gprbuild/APKBUILD
+++ b/user/gprbuild/APKBUILD
@@ -9,10 +9,12 @@ url="https://github.com/AdaCore/gprbuild"
arch="all"
options="!check" # No test suite.
license="GPL-3.0+"
+depends=""
makedepends="gcc-gnat"
-source="$pkgname-$_pkgver-src.tar.gz::http://mirrors.cdn.adacore.com/art/5cdf8e8031e87a8f1d425093
- xmlada-$_xmlver-src.tar.gz::http://mirrors.cdn.adacore.com/art/5cdf916831e87a8f1d4250b5
- foxkit.xml"
+source="https://distfiles.adelielinux.org/source/$pkgname-$_pkgver-src.tar.gz
+ https://distfiles.adelielinux.org/source/xmlada-$_xmlver-src.tar.gz
+ foxkit.xml
+ "
builddir="$srcdir/$pkgname-$_pkgver-src"
build() {
diff --git a/user/gptfdisk/APKBUILD b/user/gptfdisk/APKBUILD
index 265d5f8c3..21249e469 100644
--- a/user/gptfdisk/APKBUILD
+++ b/user/gptfdisk/APKBUILD
@@ -14,13 +14,10 @@ subpackages="$pkgname-doc"
source="https://www.rodsbooks.com/gdisk/gptfdisk-$pkgver.tar.gz"
build() {
- cd "$builddir"
make LDFLAGS="$LDFLAGS -ltinfo"
}
package() {
- cd "$builddir"
- local _app
for _app in cgdisk fixparts gdisk sgdisk; do
install -D -m755 $_app "$pkgdir"/usr/sbin/$_app
install -D -m644 $_app.8 "$pkgdir"/usr/share/man/man8/$_app.8
diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD
index 59e7264f8..276c468dd 100644
--- a/user/granatier/APKBUILD
+++ b/user/granatier/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=granatier
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Clone of the classic Bomberman game"
url="https://www.kde.org/applications/games/granatier/"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kconfigwidgets-dev kxmlgui-dev knewstuff-dev kdoctools-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/granatier-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/granatier-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="20e7b88ffc6e326f4c0000d7b6a9992141f7c2f2236d235e96aea513be257ec29873d7156da4a12b52bef0d49dd54cd9a07942b6463fcb38273e40640aadd6b7 granatier-19.08.2.tar.xz"
+sha512sums="7c214370418da7e27b2c95ee52cf52ed9674b3dd0a63f8ea493c94aa9b674b22cf62b7509af82cd03f9caa530e8a19bf4c7f9313dd2db90d060a2f43cef2476b granatier-19.12.1.tar.xz"
diff --git a/user/grantlee/APKBUILD b/user/grantlee/APKBUILD
index ddf639728..b76b2d792 100644
--- a/user/grantlee/APKBUILD
+++ b/user/grantlee/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=grantlee
-pkgver=5.1.0
-pkgrel=1
-pkgdesc="Libraries for text templating with Qt"
+pkgver=5.2.0
+pkgrel=0
+pkgdesc="Qt string template engine based on the Django template system"
url="https://github.com/steveire/grantlee/"
arch="all"
license="LGPL-2.1+"
@@ -11,10 +11,9 @@ depends=""
depends_dev="qt5-qtbase-dev"
makedepends="cmake $depends_dev qt5-qtscript-dev doxygen graphviz"
subpackages="$pkgname-dev $pkgname-doc"
-source="grantlee-$pkgver.tar.gz::https://github.com/steveire/grantlee/archive/v$pkgver.tar.gz"
+source="http://downloads.grantlee.org/grantlee-5.2.0.tar.gz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -24,21 +23,19 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make all docs
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E buildertest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/usr/share/doc/grantlee
mv "$builddir"/apidox "$pkgdir"/usr/share/doc/grantlee/
}
-sha512sums="8a4906979f160abf21481d364f0318789c8b5340c62bff06cc62e6714dbf2c52cbfe577a24490052ac25d94f4cc59e11764204236bc7532bd7f1fd5188baa41a grantlee-5.1.0.tar.gz"
+sha512sums="94b53d103aa775e6d45357d44d5634a5214d12ea7178d251fda30c5a88ddc2682ae44501ee8b7dc475793b84fa0998eb0bc13eea3f2e10ab29b1489db6ea60bd grantlee-5.2.0.tar.gz"
diff --git a/user/grfcodec/APKBUILD b/user/grfcodec/APKBUILD
index 7ca60e872..b80f73c3d 100644
--- a/user/grfcodec/APKBUILD
+++ b/user/grfcodec/APKBUILD
@@ -16,12 +16,10 @@ source="https://binaries.openttd.org/extra/grfcodec/$pkgver/grfcodec-$pkgver-sou
"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make prefix=/usr DESTDIR="$pkgdir" install
}
diff --git a/user/gsettings-desktop-schemas/APKBUILD b/user/gsettings-desktop-schemas/APKBUILD
index 47bf9ddf4..eaf6b74a3 100644
--- a/user/gsettings-desktop-schemas/APKBUILD
+++ b/user/gsettings-desktop-schemas/APKBUILD
@@ -6,6 +6,7 @@ pkgdesc="GSettings schemas shared by GNOME desktop components"
url="https://developer.gnome.org/gio/unstable/GSettings.html"
arch="noarch"
license="LGPL-2.0+"
+depends=""
makedepends="glib-dev gobject-introspection-dev intltool meson ninja"
subpackages="$pkgname-dev $pkgname-lang"
source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz"
diff --git a/user/gsl/APKBUILD b/user/gsl/APKBUILD
index 4d2a5d929..a16ec413e 100644
--- a/user/gsl/APKBUILD
+++ b/user/gsl/APKBUILD
@@ -20,7 +20,6 @@ source="https://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz
# https://github.com/SciRuby/rb-gsl/issues/40
build() {
- cd "$builddir"
[ $CTARGET_ARCH != "ppc" ] || export ac_cv_c_ieee_interface=unknown
./configure \
--build=$CBUILD \
@@ -30,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/gsm/APKBUILD b/user/gsm/APKBUILD
index 17ff21e6f..493eac0a3 100644
--- a/user/gsm/APKBUILD
+++ b/user/gsm/APKBUILD
@@ -19,13 +19,11 @@ source="http://www.quut.com/gsm/gsm-$pkgver.tar.gz
builddir="$srcdir"/gsm-${pkgver%.*}-pl${pkgver##*.}
build() {
- cd "$builddir"
export RPM_OPT_FLAGS="$CFLAGS -fPIC"
make all
}
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/usr/bin \
"$pkgdir"/usr/include/gsm \
"$pkgdir"/usr/lib \
diff --git a/user/gst-plugins-good/APKBUILD b/user/gst-plugins-good/APKBUILD
index c9147e89e..0bda3806f 100644
--- a/user/gst-plugins-good/APKBUILD
+++ b/user/gst-plugins-good/APKBUILD
@@ -1,11 +1,12 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gst-plugins-good
-pkgver=1.16.1
+pkgver=1.16.2
pkgrel=0
pkgdesc="GStreamer multimedia framework - Free, well-written plugins"
url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html"
arch="all"
+options="!check" # elements/souphttpsrc fails due to attempt to listen on :443
license="LGPL-2.1+"
depends=""
checkdepends="orc-compiler cmd:which"
@@ -29,7 +30,6 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
- --enable-introspection \
--with-package-origin="${DISTRO_NAME:-Adélie Linux} (${DISTRO_URL:-https://www.adelielinux.org/})"
make
}
@@ -52,5 +52,5 @@ gtk() {
"$subpkgdir"/usr/lib/gstreamer-1.0/
}
-sha512sums="06dc1887626864c30248df53d48e85ffdf0d1660d74f70f23c325c0844e9ca390556846cbae77fe9a4a90cb992e9a55117c15a9031b44a48d45dc07a61b18da4 gst-plugins-good-1.16.1.tar.xz
+sha512sums="ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4 gst-plugins-good-1.16.2.tar.xz
1cecf260cfeb19675a819f9858426aaed3b9627ed90b8facb6cb12dfc0b265232639b1888d7cc03edb87025e3eddab6e3606f16b5f7ca261a6b1c39b0dbdc6f7 endian-test.patch"
diff --git a/user/gtk+/APKBUILD b/user/gtk+/APKBUILD
deleted file mode 100644
index 157afe4e7..000000000
--- a/user/gtk+/APKBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer:
-pkgname=gtk+
-pkgver=2.24.32
-pkgrel=0
-pkgdesc="Metapackage for GTK+ runtime and development"
-url="https://www.gtk.org/"
-arch="all"
-license="LGPL-2.0+"
-options="!check !dbg"
-depends="gtk+2.0>=$pkgver"
-makedepends="$depends_dev"
-subpackages="$pkgname-dev"
-
-dev() {
- depends="gtk+2.0-dev"
- mkdir -p "$subpkgdir"
-}
-
-package() {
- mkdir -p "$pkgdir"
-}
-
diff --git a/user/gtkmm+3.0/APKBUILD b/user/gtkmm+3.0/APKBUILD
index edc9466a4..e2ed4bb8a 100644
--- a/user/gtkmm+3.0/APKBUILD
+++ b/user/gtkmm+3.0/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=gtkmm+3.0
pkgver=3.24.2
pkgrel=0
@@ -15,7 +15,6 @@ source="https://download.gnome.org/sources/gtkmm/${pkgver%.*}/gtkmm-$pkgver.tar.
builddir="$srcdir/gtkmm-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/gtksourceview-3.0/APKBUILD b/user/gtksourceview-3.0/APKBUILD
index 23f34a3c2..82ae71d56 100644
--- a/user/gtksourceview-3.0/APKBUILD
+++ b/user/gtksourceview-3.0/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=gtksourceview-3.0
pkgver=3.24.11
pkgrel=0
@@ -8,14 +8,14 @@ url="https://gnome.org"
arch="all"
options="!check" # testsuite requires X
license="LGPL-2.1+"
-makedepends="gtk+3.0-dev libxml2-dev vala-dev gobject-introspection-dev"
+depends=""
checkdepends="libxml2-utils"
+makedepends="gtk+3.0-dev libxml2-dev vala-dev gobject-introspection-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-$pkgver.tar.xz"
builddir="$srcdir/gtksourceview-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/gtkspell/APKBUILD b/user/gtkspell/APKBUILD
index e76b7f813..df4d65932 100644
--- a/user/gtkspell/APKBUILD
+++ b/user/gtkspell/APKBUILD
@@ -6,7 +6,8 @@ pkgdesc="Highlighting and replacement of misspelled words in Gtk software"
url="http://gtkspell.sourceforge.net/"
arch="all"
license="GPL-2.0-only"
-makedepends="gtk+2.0-dev enchant-dev intltool"
+depends=""
+makedepends="autoconf automake enchant-dev gtk+2.0-dev gtk-doc intltool libtool"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz
enchant-2.patch
@@ -15,13 +16,15 @@ source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz
prepare() {
default_prepare
update_config_sub
+ autoreconf -vif
}
build() {
LIBS="-lintl" ./configure \
--build=$CBUILD \
--host=$CHOST \
- --prefix=/usr
+ --prefix=/usr \
+ --disable-gtk-doc
make
}
diff --git a/user/gucharmap/APKBUILD b/user/gucharmap/APKBUILD
index 9a3d7bfcf..b3575c955 100644
--- a/user/gucharmap/APKBUILD
+++ b/user/gucharmap/APKBUILD
@@ -1,8 +1,8 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=gucharmap
pkgver=12.0.1
-_unicode=12.0.0
+_unicode=12.1.0
pkgrel=0
pkgdesc="Unicode utility for the Gnome desktop environment"
url="https://gnome.org"
@@ -12,10 +12,11 @@ depends=""
makedepends="desktop-file-utils gobject-introspection-dev gtk+3.0-dev intltool
itstool libxml2-utils unicode-data"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.gnome.org/sources/gucharmap/${pkgver%.*}/gucharmap-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/gucharmap/${pkgver%.*}/gucharmap-$pkgver.tar.xz
+ unicode-12.1.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,13 +29,12 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2 gucharmap-12.0.1.tar.xz"
+sha512sums="989034350c73c3f1857167f434aa4a5c140ef7574cb799b874e421a8d0c2bf520dfcee85bc0cf8e52f439fb7d30e0db5172a25c107c80b38ce6da4e703a3ffc2 gucharmap-12.0.1.tar.xz
+aac3a9b95985b1fd2122f1a759a0c571116a94cc429c4e9736a4f2a36e257241e7bdc4e6ba7badaeebca79bd8cca275ff66b6e9f933c707342b8872ab78dbe7f unicode-12.1.patch"
diff --git a/user/gucharmap/unicode-12.1.patch b/user/gucharmap/unicode-12.1.patch
new file mode 100644
index 000000000..60dbb7af5
--- /dev/null
+++ b/user/gucharmap/unicode-12.1.patch
@@ -0,0 +1,25 @@
+diff -Naur gucharmap-12.0.1-orig/gucharmap/gucharmap-unicode-info.h gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h
+--- gucharmap-12.0.1-orig/gucharmap/gucharmap-unicode-info.h 2019-03-07 21:21:27.000000000 +0100
++++ gucharmap-12.0.1/gucharmap/gucharmap-unicode-info.h 2019-11-14 17:43:55.007583238 +0100
+@@ -51,7 +51,8 @@
+ GUCHARMAP_UNICODE_VERSION_10_0,
+ GUCHARMAP_UNICODE_VERSION_11_0,
+ GUCHARMAP_UNICODE_VERSION_12_0,
+- GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_12_0 /* private, will move forward with each revision */
++ GUCHARMAP_UNICODE_VERSION_12_1,
++ GUCHARMAP_UNICODE_VERSION_LATEST = GUCHARMAP_UNICODE_VERSION_12_1 /* private, will move forward with each revision */
+ } GucharmapUnicodeVersion;
+
+ /* return values are read-only */
+diff -Naur gucharmap-12.0.1-orig/gucharmap/gucharmap-window.c gucharmap-12.0.1/gucharmap/gucharmap-window.c
+--- gucharmap-12.0.1-orig/gucharmap/gucharmap-window.c 2019-03-07 21:21:27.000000000 +0100
++++ gucharmap-12.0.1/gucharmap/gucharmap-window.c 2019-11-14 17:45:11.145809820 +0100
+@@ -454,7 +454,7 @@
+ gtk_show_about_dialog (GTK_WINDOW (guw),
+ "program-name", _("GNOME Character Map"),
+ "version", VERSION,
+- "comments", _("Based on the Unicode Character Database 12.0.0"),
++ "comments", _("Based on the Unicode Character Database 12.1.0"),
+ "copyright", "Copyright © 2004 Noah Levitt\n"
+ "Copyright © 1991–2019 Unicode, Inc.\n"
+ "Copyright © 2007–2019 Christian Persch\n"
diff --git a/user/guile20/APKBUILD b/user/guile20/APKBUILD
index ceafb8a28..c088637e0 100644
--- a/user/guile20/APKBUILD
+++ b/user/guile20/APKBUILD
@@ -17,7 +17,6 @@ source="ftp://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz
"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,7 +27,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm "$pkgdir"/usr/lib/charset.alias
}
diff --git a/user/gutenprint/APKBUILD b/user/gutenprint/APKBUILD
index 42198e73d..e3f0d111d 100644
--- a/user/gutenprint/APKBUILD
+++ b/user/gutenprint/APKBUILD
@@ -9,13 +9,13 @@ arch="all"
options="!check" # Times out even on 64-thread POWER9.
license="GPL-2.0-only"
depends=""
-makedepends="cups-dev"
+makedepends="bash cups-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
install="$pkgname.post-install $pkgname.post-upgrade"
source="https://downloads.sourceforge.net/gimp-print/gutenprint-$pkgver.tar.xz"
build() {
- ./configure \
+ bash ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD
index 165e6798a..9b2a0c17e 100644
--- a/user/gvim/APKBUILD
+++ b/user/gvim/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=gvim
_pkgreal=vim
pkgver=8.1.2311
diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD
index eb0de9064..1a5e524b9 100644
--- a/user/gwenview/APKBUILD
+++ b/user/gwenview/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gwenview
-pkgver=19.08.2
-pkgrel=2
+pkgver=19.12.1
+pkgrel=0
pkgdesc="Fast and easy image viewer by KDE"
url="https://www.kde.org/applications/graphics/gwenview/"
arch="all"
@@ -15,7 +15,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev phonon-dev
libkipi-dev libjpeg-turbo-dev libpng-dev lcms2-dev zlib-dev exiv2-dev
baloo-dev libkdcraw-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/gwenview-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/gwenview-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -28,7 +28,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="089bb97a79b2f6853710805d19084334972c86f8c89ddb2e80c7bf30d5a82c8edd5a0be5b68a7ad9e63c1a2b86d75dbd20dccfefe2859a660cd60cfbcbb5d843 gwenview-19.08.2.tar.xz"
+sha512sums="0349a6db6e3a2da78ce00d33fbaac1aa39781c00a1cc8ad9f46ac9338b7d088c226be16a646fc27c2b5c44eed05b541434d59ad6af31fdb9f597d29fe7ee58f5 gwenview-19.12.1.tar.xz"
diff --git a/user/haveged/APKBUILD b/user/haveged/APKBUILD
index 489f85cb5..c3e631de2 100644
--- a/user/haveged/APKBUILD
+++ b/user/haveged/APKBUILD
@@ -3,17 +3,19 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer:
pkgname=haveged
-pkgver=1.9.8
+pkgver=1.9.8c
pkgrel=0
pkgdesc="Entropy harvesting daemon using CPU timings"
url="http://www.issihosts.com/haveged/"
arch="all"
license="GPL-3.0+"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
+depends=""
makedepends="linux-headers"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/v$pkgver.tar.gz
haveged.initd
- haveged.confd"
+ haveged.confd
+ "
build() {
./configure \
@@ -39,6 +41,6 @@ package() {
"$pkgdir"/etc/conf.d/haveged
}
-sha512sums="6a4012c7ab0ad7df77ae61dd3aca072a7aeca942c180d37c8495009fad13a4c9c0e7bf64a3ffce00e50c06679d4b948c3930a960789a06edf074076cf68d37db haveged-1.9.8.tar.gz
+sha512sums="24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa haveged-1.9.8c.tar.gz
5d1e4186580951d4e6e01193e9c8827ceddaf3c2e28a981fc9176cb446bed32b059304796a77d9db6fb761a21f8fd27dd3d31e06a0fb7a5985b4ea94978fcd64 haveged.initd
58fa2c513e26291047b60ea6d6355ad837c1cb07750a2dfb2a5ebf90cc504a4b6ebf3573869410a06cac85d9b634b3df988e8b033921394da8a5abeee574c822 haveged.confd"
diff --git a/user/hdparm/APKBUILD b/user/hdparm/APKBUILD
index f6e5a8f8e..f1ab5fe96 100644
--- a/user/hdparm/APKBUILD
+++ b/user/hdparm/APKBUILD
@@ -6,11 +6,12 @@ pkgrel=0
pkgdesc="Utility for manipulating IDE device parameters"
url="https://sourceforge.net/projects/hdparm"
arch="all"
+options="!check" # This application has no tests.
license="BSD-2-clause OR GPL-2.0-or-later"
+depends=""
makedepends="linux-headers"
-options="!check" # this application has no tests
subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz"
prepare() {
default_prepare
@@ -18,13 +19,11 @@ prepare() {
}
build() {
- cd "$builddir"
export CFLAGS="$CFLAGS -D_GNU_SOURCE"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -D -m755 contrib/idectl "$pkgdir"/sbin
install -D -m755 contrib/ultrabayd "$pkgdir"/sbin
diff --git a/user/hermit/APKBUILD b/user/hermit/APKBUILD
index aa9fbb046..c36f6fe1c 100644
--- a/user/hermit/APKBUILD
+++ b/user/hermit/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
makedepends=""
subpackages=""
source="https://pcaro.es/d/otf-$pkgname-$pkgver.tar.gz"
-builddir="$srcdir"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$srcdir"/*.otf
}
sha512sums="ee41f8cbcdedfff568cd47ab7730c462ddd67d6170c05d35eaf64a7f954a4bb72d6ac99a383749f7032d9cf7b407b7a5ef3270b4209692c1572beb9744a21d42 otf-hermit-2.0.tar.gz"
diff --git a/user/heuristica-otf/APKBUILD b/user/heuristica-otf/APKBUILD
index 728909071..e0438bd67 100644
--- a/user/heuristica-otf/APKBUILD
+++ b/user/heuristica-otf/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
makedepends=""
subpackages=""
source="https://downloads.sourceforge.net/heuristica/heuristica-otf-$pkgver.tar.xz"
-builddir="$srcdir"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$srcdir"/*.otf
}
sha512sums="d3336c6fcfd5ab5bfb041230659c41ecbaa9e2d2f92d5c1c8c0dc8dff89a777ac87d8713467c94b065febde30c131cd05376573308f69d698d63e18eee433783 heuristica-otf-1.0.2.tar.xz"
diff --git a/user/htop/APKBUILD b/user/htop/APKBUILD
index 2dc87cfa7..25b992f1a 100644
--- a/user/htop/APKBUILD
+++ b/user/htop/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=htop
pkgver=2.2.0
-pkgrel=0
+pkgrel=1
pkgdesc="Interactive process viewer"
url="http://hisham.hm/htop"
arch="all"
@@ -12,10 +12,11 @@ depends=""
makedepends="ncurses-dev python3"
subpackages="$pkgname-doc"
source="http://hisham.hm/htop/releases/$pkgver/$pkgname-$pkgver.tar.gz
- fix-python-path.patch"
+ correctness.patch
+ fix-python-path.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,9 +30,9 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
sha512sums="ec1335bf0e3e0387e5e50acbc508d0effad19c4bc1ac312419dc97b82901f4819600d6f87a91668f39d429536d17304d4b14634426a06bec2ecd09df24adc62e htop-2.2.0.tar.gz
+010ca1d42caeea133ba3d0383373a8eca849c73c95bb98fe3222c458c44320d1e2a3aee9431213721f1ccfcbd5af54eb1e54fafd6e0e5ca3b87499ee6d04b49a correctness.patch
16358bcd6d83181cc04dd8a7971f7cc0804dc49995208bad2042bcca7962f562bbd008c2185f24aa6186c58896e94e4ec02e2053dc46ed14789889d64836b679 fix-python-path.patch"
diff --git a/user/htop/correctness.patch b/user/htop/correctness.patch
new file mode 100644
index 000000000..51a9848d2
--- /dev/null
+++ b/user/htop/correctness.patch
@@ -0,0 +1,78 @@
+From: Jonathan Currier <dullfire@yahoo.com>
+
+diff --git a/MainPanel.h b/MainPanel.h
+index 8849659..471870b 100644
+--- a/MainPanel.h
++++ b/MainPanel.h
+@@ -12,6 +12,7 @@ in the source distribution for its full text.
+ #include "Panel.h"
+ #include "Action.h"
+ #include "Settings.h"
++#include "union-arg.h"
+
+ typedef struct MainPanel_ {
+ Panel super;
+@@ -21,11 +22,6 @@ typedef struct MainPanel_ {
+ pid_t pidSearch;
+ } MainPanel;
+
+-typedef union {
+- int i;
+- void* v;
+-} Arg;
+-
+ typedef bool(*MainPanel_ForeachProcessFn)(Process*, Arg);
+
+ #define MainPanel_getFunctionBar(this_) (((Panel*)(this_))->defaultBar)
+diff --git a/Process.c b/Process.c
+index 471f529..ae617a6 100644
+--- a/Process.c
++++ b/Process.c
+@@ -548,7 +548,9 @@ bool Process_changePriorityBy(Process* this, int delta) {
+ return Process_setPriority(this, this->nice + delta);
+ }
+
+-void Process_sendSignal(Process* this, int sgn) {
++
++void Process_sendSignal(Process* this, Arg arg) {
++ int sgn = arg.i;
+ CRT_dropPrivileges();
+ kill(this->pid, (int) sgn);
+ CRT_restorePrivileges();
+diff --git a/Process.h b/Process.h
+index f702ca0..3011845 100644
+--- a/Process.h
++++ b/Process.h
+@@ -29,6 +29,7 @@ in the source distribution for its full text.
+ #include "Object.h"
+
+ #include <sys/types.h>
++#include "union-arg.h"
+
+ #define PROCESS_FLAG_IO 0x0001
+
+@@ -199,7 +200,7 @@ bool Process_setPriority(Process* this, int priority);
+
+ bool Process_changePriorityBy(Process* this, int delta);
+
+-void Process_sendSignal(Process* this, int sgn);
++void Process_sendSignal(Process* this, Arg arg);
+
+ long Process_pidCompare(const void* v1, const void* v2);
+
+diff --git a/union-arg.h b/union-arg.h
+new file mode 100644
+index 0000000..5c8a094
+--- /dev/null
++++ b/union-arg.h
+@@ -0,0 +1,9 @@
++#ifndef UNION_ARG_HEADER
++#define UNION_ARG_HEADER
++
++typedef union {
++ int i;
++ void* v;
++} Arg;
++
++#endif
+
diff --git a/user/humor-sans/APKBUILD b/user/humor-sans/APKBUILD
index af9ba8484..476f85c72 100644
--- a/user/humor-sans/APKBUILD
+++ b/user/humor-sans/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
makedepends=""
subpackages=""
source="http://antiyawn.com/uploads/Humor-Sans-$pkgver.ttf"
-builddir="$srcdir"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ Humor-Sans-$pkgver.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/Humor-Sans-$pkgver.ttf
}
sha512sums="f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd Humor-Sans-1.0.ttf"
diff --git a/user/hunkyfonts/APKBUILD b/user/hunkyfonts/APKBUILD
index c8c2411a5..714812e7b 100644
--- a/user/hunkyfonts/APKBUILD
+++ b/user/hunkyfonts/APKBUILD
@@ -14,8 +14,7 @@ subpackages=""
source="https://downloads.sourceforge.net/hunkyfonts/hunkyfonts-$pkgver.tar.bz2"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ TTF/*.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/TTF/*.ttf
}
sha512sums="0e9a5cff20c467ae441c442f269d3b8a9ea5d2534cbabcf08f65a594121840727003bdb038981e983430602306147e5dca146503b310a742d3c6e44d36ae7375 hunkyfonts-0.3.1.tar.bz2"
diff --git a/user/hyphen/APKBUILD b/user/hyphen/APKBUILD
index a4d891e72..ba0947e7c 100644
--- a/user/hyphen/APKBUILD
+++ b/user/hyphen/APKBUILD
@@ -12,10 +12,10 @@ depends=""
depends_dev="perl"
makedepends="$depends_dev"
source="https://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz
- mawk.patch"
+ mawk.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
# The en_US dictionary that comes with has an unacceptable license
# and it isn't really needed anyway since libreoffice has its own
diff --git a/user/i3status/APKBUILD b/user/i3status/APKBUILD
index 5692f27e7..64a2a2f3f 100644
--- a/user/i3status/APKBUILD
+++ b/user/i3status/APKBUILD
@@ -10,11 +10,12 @@ options="!check" # No test suite
license="MIT"
depends=""
makedepends="alsa-lib-dev asciidoctor confuse-dev libnl3-dev pkgconf
- pulseaudio-dev yajl-dev"
+ pulseaudio-dev yajl-dev autoconf automake"
subpackages="$pkgname-doc"
source="$url/$pkgname-$pkgver.tar.bz2
asciidoctor.patch
- glob_tilde.patch"
+ glob_tilde.patch
+ "
prepare() {
default_prepare
@@ -36,6 +37,7 @@ build() {
package() {
make -C build DESTDIR="$pkgdir" install
}
+
sha512sums="6dadff19e53499d169ba4f491e1f821014b4f92fc3c93d7947c85cbbbdeaba538d02bd8ab98fe266a8f80756a287fd5803ec77a8cd874d50082b5cad309875c2 i3status-2.13.tar.bz2
26527b9a0053d363f2b2991f9be3a15cb5fbf5553dca9498a9cff1c1a65e887f392215b60a484e329e6ef8efd63f9b67727826fb6ccfe1033c653feef34aaab8 asciidoctor.patch
765a5b64d79f61cd68280d77a7316e7f571a3c2e385d9a227885cde5fc057b1a892e92a65c0fc54832bfdda30743df6e9f82a847b55c9e7389575c7fbad9e0d4 glob_tilde.patch"
diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD
index ccbb5f9e5..7cf320dd9 100644
--- a/user/i3wm/APKBUILD
+++ b/user/i3wm/APKBUILD
@@ -7,13 +7,14 @@ pkgrel=0
pkgdesc="Improved dynamic tiling window manager"
url="https://i3wm.org"
arch="all"
-license="BSD-3-Clause"
options="!check" # The test suite requires X
+license="BSD-3-Clause"
+depends=""
+checkdepends="perl-x11-xcb perl-anyevent perl-json-xs perl-ipc-run
+ perl-inline-c perl-dev libxcb-dev xcb-util-dev xorg-server-xephyr"
makedepends="bison flex libxcb-dev xcb-util-cursor-dev xcb-util-keysyms-dev
xcb-util-wm-dev libev-dev pango-dev cairo-dev yajl-dev
startup-notification-dev pcre-dev libxkbcommon-dev xcb-util-xrm-dev"
-checkdepends="perl-x11-xcb perl-anyevent perl-json-xs perl-ipc-run
- perl-inline-c perl-dev libxcb-dev xcb-util-dev xorg-server-xephyr"
subpackages="$pkgname-doc"
source="https://i3wm.org/downloads/i3-$pkgver.tar.bz2
i3wm-musl-glob-tilde.patch
diff --git a/user/iceauth/APKBUILD b/user/iceauth/APKBUILD
index 5f59f51ce..5700b0b24 100644
--- a/user/iceauth/APKBUILD
+++ b/user/iceauth/APKBUILD
@@ -3,16 +3,15 @@ pkgname=iceauth
pkgver=1.0.8
pkgrel=0
pkgdesc="X.Org ICE authority file utility"
-url="http://xorg.freedesktop.org"
+url="https://www.X.org/"
arch="all"
license="MIT"
-subpackages="$pkgname-doc"
+depends=""
makedepends="libice-dev util-macros"
+subpackages="$pkgname-doc"
source="http://www.x.org/releases/individual/app/iceauth-$pkgver.tar.bz2"
-
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -22,12 +21,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD
index d57231f43..0149ef2d6 100644
--- a/user/icewm/APKBUILD
+++ b/user/icewm/APKBUILD
@@ -1,29 +1,21 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=icewm
-pkgver=1.5.5
+pkgver=1.6.4
pkgrel=0
pkgdesc="A window manager designed for speed, usability, and consistency"
url="https://github.com/bbidulock/icewm"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="LGPL-2.0-only AND MirOS"
depends=""
makedepends="libxft-dev libxinerama-dev libxpm-dev libjpeg-turbo-dev
libxrandr-dev glib-dev fribidi-dev gdk-pixbuf-dev librsvg-dev
- alsa-lib-dev libsndfile-dev libao-dev asciidoctor $depends_dev"
-install=""
+ alsa-lib-dev libsndfile-dev libao-dev asciidoctor libxcomposite-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://github.com/ice-wm/icewm/releases/download/$pkgver/icewm-$pkgver.tar.xz"
-
-prepare() {
- default_prepare
- cd "$builddir"
- autoreconf -vif
-}
+source="https://github.com/ice-wm/icewm/releases/download/$pkgver/icewm-$pkgver.tar.lz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,13 +27,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="5d75d33bf6e45ea0b46ace5173d825e9d1a12318cf7a5319b20ea704b019f6c09391f0f199b0fac678ba0f160d8236fc1cfee5d3b47d1895b7ba3721ff62a05e icewm-1.5.5.tar.xz"
+sha512sums="6a8c3b2e561c4471759b0566a4c5dc390f4abd6f266ab738a80a21445dffe9f45b24eca898507ff7c9b84ea12331262b81967b5a76be0b19e737842a66bcb000 icewm-1.6.4.tar.lz"
diff --git a/user/ico/APKBUILD b/user/ico/APKBUILD
index 8f6c2d7dd..8be9ae00c 100644
--- a/user/ico/APKBUILD
+++ b/user/ico/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/ico-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/icon-naming-utils/APKBUILD b/user/icon-naming-utils/APKBUILD
index 1d41aef6b..863107041 100644
--- a/user/icon-naming-utils/APKBUILD
+++ b/user/icon-naming-utils/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev"
source="http://tango.freedesktop.org/releases/icon-naming-utils-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make pkgconfigdir="/usr/lib/pkgconfig" DESTDIR="$pkgdir" install
}
diff --git a/user/id3lib/APKBUILD b/user/id3lib/APKBUILD
index 957ed5eb0..78b50ae07 100644
--- a/user/id3lib/APKBUILD
+++ b/user/id3lib/APKBUILD
@@ -28,7 +28,6 @@ prepare() {
}
build() {
- cd "$builddir"
export CFLAGS="$CFLAGS -fPIC"
export CXXFLAGS="$CXXFLAGS -fPIC"
./configure \
@@ -42,12 +41,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/ido/APKBUILD b/user/ido/APKBUILD
index 9f858605e..329b48ddd 100644
--- a/user/ido/APKBUILD
+++ b/user/ido/APKBUILD
@@ -1,43 +1,46 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ido
-pkgver=12.10.2
+pkgver=13.10.0
pkgrel=0
pkgdesc="Library for indicator display objects"
url="https://launchpad.net/ido"
arch="all"
options="!check" # broken testsuite
license="(LGPL-2.1-only OR LGPL-3.0-only) AND GPL-3.0-only AND LGPL-2.0+"
-makedepends="gtk+3.0-dev"
+depends=""
+makedepends="gtk+3.0-dev autoconf automake libtool gobject-introspection-dev
+ gtk-doc vala xorg-gtest-dev"
subpackages="$pkgname-dev"
-source="https://launchpad.net/ido/12.10/$pkgver/+download/ido-$pkgver.tar.gz"
+source="http://archive.ubuntu.com/ubuntu/pool/universe/i/ido/ido_$pkgver+17.04.20161028.orig.tar.gz
+ ubuntu-private.patch
+ "
+builddir="$srcdir"
prepare() {
- cd "$builddir"
default_prepare
- update_config_sub
+ autoreconf -vif
}
build() {
- cd "$builddir"
CFLAGS="-Wno-error" ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
- --localstatedir=/var
+ --localstatedir=/var \
+ --disable-ubuntu-private-api
make
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="f745380bbc8b97c739691ae4f0dc27d5903ff078e92aaa2280d2c830c77ea2ad29b3abb4a49ffc7cc928b32e3a60ad64de20087980e02e5d5233eeb22978d2dc ido-12.10.2.tar.gz"
+sha512sums="867157c9e316eb5ed69ebdf1017ed86990aabf7a885ba26acab36782f0f27e10b4621a7db15ac90335e808022490a98560d5ff443e6f697c578eed5868385ebd ido_13.10.0+17.04.20161028.orig.tar.gz
+1894f82bd8c2daa25cf41a0c401979941894ec2be165ddbe40eb5b2bc2a4272b22d19a1710e80c975c33bf4f1a6ff91920bf569e536851e65d702f1267fdc367 ubuntu-private.patch"
diff --git a/user/ido/ubuntu-private.patch b/user/ido/ubuntu-private.patch
new file mode 100644
index 000000000..04aa31ac7
--- /dev/null
+++ b/user/ido/ubuntu-private.patch
@@ -0,0 +1,70 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,6 +140,16 @@ dnl = GTK Doc Check ====================
+
+ GTK_DOC_CHECK([1.8])
+
++dnl = GTK+ Ubuntu Private API =================================================
++
++AC_ARG_ENABLE([ubuntu-private-api],
++ [AS_HELP_STRING([--enable-ubuntu-private-api=@<:@no/yes@:>@],
++ [Use Ubuntu GTK+ Private API @<:@default=yes@:>@])],
++ [enable_ubuntu_private_api="$enableval"],
++ [enable_ubuntu_private_api=yes])
++
++AM_CONDITIONAL([USE_UBUNTU_PRIVATE_API], [test "x$enable_ubuntu_private_api" != xno])
++
+ dnl ===========================================================================
+
+ AC_CONFIG_FILES([
+@@ -160,6 +170,7 @@ echo ""
+ echo " Prefix : ${prefix}"
+ echo " gcov : ${use_gcov}"
+ echo " introspection: ${enable_introspection}"
++echo " ubuntu gtk+ : ${enable_ubuntu_private_api}"
+ echo ""
+ echo " Documentation: ${enable_gtk_doc}"
+ echo ""
+--- a/src/idomenuitemfactory.c
++++ b/src/idomenuitemfactory.c
+@@ -17,6 +17,7 @@
+ * Lars Uebernickel <lars.uebernickel@canonical.com>
+ */
+
++#ifdef USE_UBUNTU_PRIVATE_API
+ #include <gtk/gtk.h>
+ #include <gtk/ubuntu-private.h>
+
+@@ -117,3 +118,4 @@ static void
+ ido_menu_item_factory_init (IdoMenuItemFactory *factory)
+ {
+ }
++#endif
+--- a/src/libido.c
++++ b/src/libido.c
+@@ -28,9 +28,11 @@
+ void
+ ido_init (void)
+ {
++#ifdef USE_UBUNTU_PRIVATE_API
+ GType ido_menu_item_factory_get_type (void);
+
+ /* make sure this extension point is registered so that gtk calls it
+ * when finding custom menu items */
+ g_type_ensure (ido_menu_item_factory_get_type ());
++#endif
+ }
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -68,6 +68,10 @@ AM_CPPFLAGS = \
+ $(MAINTAINER_CFLAGS) \
+ -Wall -Werror -Wextra -Wno-unused-parameter -Wno-error=deprecated-declarations
+
++if USE_UBUNTU_PRIVATE_API
++AM_CPPFLAGS += -DUSE_UBUNTU_PRIVATE_API
++endif
++
+ AM_CFLAGS = \
+ $(COVERAGE_CFLAGS)
+
+
diff --git a/user/imake/APKBUILD b/user/imake/APKBUILD
index db1fd9f55..d2092acd9 100644
--- a/user/imake/APKBUILD
+++ b/user/imake/APKBUILD
@@ -4,23 +4,22 @@ pkgname=imake
pkgver=1.0.8
pkgrel=0
pkgdesc="X Windows make utility"
-url="https://www.x.org"
+url="https://www.X.Org/"
arch="all"
+options="!check" # No test suite.
license="X11"
-options="!check" # No testsuite
depends=""
makedepends="util-macros xorgproto-dev"
subpackages="$pkgname-doc"
-source="http://ftp.x.org/pub/individual/util/$pkgname-$pkgver.tar.bz2"
+source="https://www.X.org/releases/individual/util/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
- ./configure --prefix=/usr
+ ./configure \
+ --prefix=/usr
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/imlib2/APKBUILD b/user/imlib2/APKBUILD
index 2984ea32a..09733a11b 100644
--- a/user/imlib2/APKBUILD
+++ b/user/imlib2/APKBUILD
@@ -1,19 +1,19 @@
# Maintainer:
pkgname=imlib2
-pkgver=1.5.1
-pkgrel=0
+pkgver=1.6.1
+pkgrel=2
pkgdesc="Image manipulation library"
url="https://sourceforge.net/projects/enlightenment"
arch="all"
license="Imlib2"
-subpackages="$pkgname-dev"
+depends=""
depends_dev="freetype-dev libxext-dev libsm-dev"
makedepends="$depends_dev tiff-dev giflib-dev bzip2-dev libpng-dev
libid3tag-dev libjpeg-turbo-dev zlib-dev util-linux-dev"
+subpackages="$pkgname-dev"
source="https://downloads.sourceforge.net/enlightenment/$pkgname-src/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,7 +26,6 @@ build() {
--with-x \
--with-bzip2 \
--with-gif \
- --with-id3 \
--with-jpeg \
--with-png \
--with-tiff \
@@ -35,13 +34,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR=$pkgdir install
}
-sha512sums="f9d971674887d4af067c6921e34b6fe598db0317052bc864b676c526b36373ce021d9d49cad95aa64dbbd8e74f1831ddf3ed105900e3df2b66a6b53f7f27c732 imlib2-1.5.1.tar.bz2"
+sha512sums="ecdbdbfe8767ec2b1f22ce664cbab5e1d3f75be7a3c8f37488f5243b3c31dbc433414b8d50d2d1b70c67a80e31e42cc5398161991ce3955e991c114c82ddd58f imlib2-1.6.1.tar.bz2"
diff --git a/user/inconsolata-lgc/APKBUILD b/user/inconsolata-lgc/APKBUILD
index f8d3de1a6..c4748657c 100644
--- a/user/inconsolata-lgc/APKBUILD
+++ b/user/inconsolata-lgc/APKBUILD
@@ -15,8 +15,7 @@ source="https://github.com/MihailJP/Inconsolata-LGC/releases/download/LGC-$pkgve
builddir="$srcdir/InconsolataLGC-OT"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF *.otf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF "$builddir"/*.otf
}
sha512sums="3e985618b0c067d981620a461655d176a41bbef3d225d7d609b8dc9d5c04361b1df322eefab58f9620cfdff323e2bd7127c7e4f5f21f291b173a769cefa93ece InconsolataLGC-OT-1.3.0.tar.xz"
diff --git a/user/intlfonts/APKBUILD b/user/intlfonts/APKBUILD
index 35f39ccb6..ef31cd0be 100644
--- a/user/intlfonts/APKBUILD
+++ b/user/intlfonts/APKBUILD
@@ -14,7 +14,6 @@ subpackages=""
source="https://ftp.gnu.org/gnu/intlfonts/intlfonts-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -30,7 +29,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
mv "$pkgdir"/usr/share/fonts/X11/misc/TrueType \
"$pkgdir"/usr/share/fonts/X11/TTF
diff --git a/user/ipaexfont/APKBUILD b/user/ipaexfont/APKBUILD
index f76922b9a..fd3fb85d5 100644
--- a/user/ipaexfont/APKBUILD
+++ b/user/ipaexfont/APKBUILD
@@ -12,12 +12,11 @@ license="IPA"
depends="fontconfig"
makedepends=""
subpackages=""
-source="https://oscdl.ipa.go.jp/IPAexfont/IPAexfont$_pkgver.zip"
+source="https://distfiles.adelielinux.org/source/IPAexfont$_pkgver.zip"
builddir="$srcdir/IPAexfont$_pkgver"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
}
sha512sums="fe639ded0a25eed66df8cc1e9d5e965b501574a25fab542a749b3cb8464690448e44343ff5845aecd3224ec481c4089ee56e64880cbbc9211a260b22d4cc68cd IPAexfont00401.zip"
diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD
index 906d8cd30..f167ef0c3 100644
--- a/user/iperf3/APKBUILD
+++ b/user/iperf3/APKBUILD
@@ -11,17 +11,16 @@ arch="all"
license="BSD-3-Clause"
depends=""
makedepends=""
-install=""
subpackages="$pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://downloads.es.net/pub/$_pkgname/$_pkgname-$pkgver.tar.gz
$_pkgname.initd
$_pkgname.confd
- build-fixes.patch"
+ build-fixes.patch
+ "
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
CFLAGS="$CFLAGS -D_GNU_SOURCE"
./configure \
--build=$CBUILD \
@@ -35,12 +34,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/$_pkgname.initd \
diff --git a/user/ipmiutil/APKBUILD b/user/ipmiutil/APKBUILD
index b77f2889a..56172ac63 100644
--- a/user/ipmiutil/APKBUILD
+++ b/user/ipmiutil/APKBUILD
@@ -1,17 +1,19 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ipmiutil
-pkgver=3.1.4
+pkgver=3.1.5
pkgrel=0
pkgdesc="IPMI Management Utilities"
url="http://ipmiutil.sourceforge.net/"
arch="all"
options="!check" # No test suite shipped.
license="BSD-2-Clause AND BSD-3-Clause AND GPL-2.0+"
+depends=""
depends_dev="openssl-dev"
makedepends="$depends_dev linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc"
source="https://downloads.sourceforge.net/project/ipmiutil/ipmiutil-$pkgver.tar.gz
- ipmiutil-3.0.7-fix-sha256.patch"
+ ipmiutil-3.0.7-fix-sha256.patch
+ "
prepare() {
default_prepare
@@ -38,5 +40,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e76f3efbd5a15882607f9f141fe1298bfc80a3bc04f616bb0525c4546f19846616ce5aecc4aba658bcd01678724c05f770f893ba3dac91f5fe9c6cabd2acd579 ipmiutil-3.1.4.tar.gz
+sha512sums="a9bd4d99d5bcad8a9f64c3636d6774d09e1d4c20927a6803891777ba035ee3c114b06295185cf00fb0c5d4b4b9afd335fd19c06f64298130e42945dc5f6e8010 ipmiutil-3.1.5.tar.gz
74e8951bccd004f765b99de87dc5f04834e594b3e14ba885148fb971eaf15164ccac2de880e409f201a38cba5c0948a0fabc04e1e34fb396f50b1ecddb6b305b ipmiutil-3.0.7-fix-sha256.patch"
diff --git a/user/iptables/APKBUILD b/user/iptables/APKBUILD
index 1d34a1ce3..3c470fda1 100644
--- a/user/iptables/APKBUILD
+++ b/user/iptables/APKBUILD
@@ -1,14 +1,14 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Molly Miller <adelie@m-squa.red>
-
pkgname=iptables
-pkgver=1.8.3
-pkgrel=1
+pkgver=1.8.4
+pkgrel=0
pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
url="https://www.netfilter.org/projects/iptables/index.html"
arch="all"
-options="!check" # no test suite
+options="!check" # No test suite.
license="GPL-2.0+"
+depends=""
depends_dev="linux-headers"
# extra functionality may be enabled in the future if libmnl and
# libnetfilter_conntrack are packaged.
@@ -60,7 +60,7 @@ package() {
install -D -m644 "$srcdir"/ip6tables.confd "$pkgdir"/etc/conf.d/ip6tables
}
-sha512sums="84b10080646077cbea78b7f3fcc58c6c6e1898213341c69862e1b48179f37a6820c3d84437c896071f966b61aa6d16b132d91948a85fd8c05740f29be3a0986d iptables-1.8.3.tar.bz2
+sha512sums="a7faaab58608ffaa51e26e8056551c0e91a49187439d30fcf5cce2800274cc3c0515db6cfba0f4c85613fb80779cf96089b8915db0e89161e9980a6384faebdb iptables-1.8.4.tar.bz2
726dfa1aa598d9dff802b99347138c861703b3dd28b2721a6b79b12f87d988369d3b4b9daee7cb2f9a930daac8921600de1e5342a347b3eae3791f0b9f0acbeb iptables.initd
cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e iptables.confd
0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4 ip6tables.confd"
diff --git a/user/iputils/APKBUILD b/user/iputils/APKBUILD
index f3cca0f7e..1d625f8f7 100644
--- a/user/iputils/APKBUILD
+++ b/user/iputils/APKBUILD
@@ -8,9 +8,9 @@ url="https://github.com/iputils/iputils/"
arch="all"
options="suid"
license="BSD-3-Clause AND GPL-2.0-or-later"
+depends=""
makedepends="docbook-xsl docbook-xsl-ns libcap-dev libgcrypt-dev libxslt meson
openssl-dev"
-replaces="bbsuid"
subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc"
source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/s$pkgver.tar.gz"
builddir="$srcdir/$pkgname-s$pkgver"
diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD
index 1d63fd4b2..3e6319e30 100644
--- a/user/irssi/APKBUILD
+++ b/user/irssi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=irssi
pkgver=1.2.2
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Text-based IRC client"
url="https://irssi.org"
arch="all"
license="GPL-2.0+ AND ISC"
+depends=""
makedepends="ncurses-dev glib-dev openssl-dev perl-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-perl"
source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz"
diff --git a/user/isync/APKBUILD b/user/isync/APKBUILD
index afe53112f..5b922eb90 100644
--- a/user/isync/APKBUILD
+++ b/user/isync/APKBUILD
@@ -6,15 +6,14 @@ pkgrel=0
pkgdesc="IMAP and MailDir mailbox synchronizer"
url="http://isync.sourceforge.net/"
arch="all"
+options="!check" # No test suite.
license="GPL-2.0+"
-options="!check" # No test suite
depends=""
makedepends="db-dev cyrus-sasl-dev openssl-dev zlib-dev"
subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/isync/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/iw/APKBUILD b/user/iw/APKBUILD
index 760710ea3..4ada251aa 100644
--- a/user/iw/APKBUILD
+++ b/user/iw/APKBUILD
@@ -1,12 +1,12 @@
# Contributor: Luis Ressel <aranea@aixah.de>
# Maintainer:
pkgname=iw
-pkgver=5.3
+pkgver=5.4
pkgrel=0
pkgdesc="CLI configuration utility for wireless devices"
url="https://wireless.wiki.kernel.org/en/users/Documentation/iw"
arch="all"
-options="!check" # no usable test suite
+options="!check" # No usable test suite.
license="ISC"
depends=""
makedepends="libnl3-dev linux-headers pkgconfig"
@@ -21,4 +21,4 @@ package() {
make V=1 DESTDIR="$pkgdir" install
}
-sha512sums="986fb7cf37cc3cab7b4058b5b73fadf1dc101fa764a144c9e4fc400d2327429df53fefbd4ea9ee63821e793a4118d468012a857800521ecf9973a7b9428229c9 iw-5.3.tar.xz"
+sha512sums="84408194e5b3a2f119ae9711d856ecb4343734ebb91150e0441b2410af8f75f460ce9ab1ce7151b0dda3926270bcb80fa684058945b7549c98964a0379e39ba2 iw-5.4.tar.xz"
diff --git a/user/java-cacerts/APKBUILD b/user/java-cacerts/APKBUILD
index b096f7795..c8d2dc7e6 100644
--- a/user/java-cacerts/APKBUILD
+++ b/user/java-cacerts/APKBUILD
@@ -11,11 +11,9 @@ depends="p11-kit p11-kit-trust ca-certificates"
makedepends=""
subpackages=""
source="java-cacerts"
-
builddir="$srcdir"
package() {
- cd "$builddir"
install -D -m755 "$srcdir"/java-cacerts \
"$pkgdir"/etc/ca-certificates/update.d/java-cacerts
mkdir -p "$pkgdir"/etc/ssl/certs/java
diff --git a/user/java-common/APKBUILD b/user/java-common/APKBUILD
index da94e271c..f285c9960 100644
--- a/user/java-common/APKBUILD
+++ b/user/java-common/APKBUILD
@@ -10,8 +10,8 @@ license="Public-Domain"
depends="nss" # for TLS, needed by all OpenJDKs.
makedepends=""
subpackages=""
-source="java.profd"
triggers="java-common.trigger=/usr/lib/jvm"
+source="java.profd"
package() {
mkdir -p "$pkgdir"/usr/bin
diff --git a/user/jomolhari/APKBUILD b/user/jomolhari/APKBUILD
index 566e5db55..2ddb69497 100644
--- a/user/jomolhari/APKBUILD
+++ b/user/jomolhari/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
makedepends=""
subpackages=""
source="https://collab.its.virginia.edu/access/content/group/26a34146-33a6-48ce-001e-f16ce7908a6a/Tibetan%20fonts/Tibetan%20Unicode%20Fonts/Jomolhari-alpha003.zip"
-builddir="$srcdir"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/*.ttf
}
sha512sums="d3dd179c84c5cfb5cdc4a82ea1356b594973ef056cbc8fa4e23e37f21573b138eded19ef7370803dbe796e80a0d2c72a0866eb9f36e4b511627c770a00e08270 Jomolhari-alpha003.zip"
diff --git a/user/jpegoptim/APKBUILD b/user/jpegoptim/APKBUILD
index d86c9c7f8..1556f8552 100644
--- a/user/jpegoptim/APKBUILD
+++ b/user/jpegoptim/APKBUILD
@@ -14,13 +14,11 @@ subpackages="$pkgname-doc"
source="https://www.kokkonen.net/tjko/src/jpegoptim-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,7 +30,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/json-glib/APKBUILD b/user/json-glib/APKBUILD
index a297939df..cdc3df7ab 100644
--- a/user/json-glib/APKBUILD
+++ b/user/json-glib/APKBUILD
@@ -1,19 +1,19 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=json-glib
pkgver=1.4.4
pkgrel=0
pkgdesc="GObject-based library for JSON (de)serialization"
url="https://live.gnome.org/JsonGlib"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="LGPL-2.1+"
+depends=""
makedepends="glib-dev gobject-introspection-dev meson ninja"
subpackages="$pkgname-dev $pkgname-lang"
source="https://download.gnome.org/sources/json-glib/1.4/json-glib-$pkgver.tar.xz"
build() {
- cd "$builddir"
meson \
--prefix=/usr \
--sysconfdir=/etc \
@@ -25,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" ninja -C output install
}
diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD
index 3789a3829..c2d79a343 100644
--- a/user/juk/APKBUILD
+++ b/user/juk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=juk
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KDE Jukebox"
url="https://juk.kde.org/"
@@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
knotifications-dev kxmlgui-dev kwallet-dev kwidgetsaddons-dev
kwindowsystem-dev taglib-dev phonon-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/juk-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/juk-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="1de7d1840eb41e47e29001e1031ad9f31942b0663ba76e83ece84534ca88a22ad03b5482276aa40259a72282e73241b872ff27ef81c1f777e31265564635592b juk-19.08.2.tar.xz"
+sha512sums="7d82956689df59c00d18a1ddf37d811e309428131e6be08684d9c3a11976a774b9a007ca1ffa2200e7ae8b0e2c04b88d0c415b68cd67df6d84ac3b63460df845 juk-19.12.1.tar.xz"
diff --git a/user/kacst_fonts/APKBUILD b/user/kacst_fonts/APKBUILD
index c933369c9..e54b7c35f 100644
--- a/user/kacst_fonts/APKBUILD
+++ b/user/kacst_fonts/APKBUILD
@@ -15,8 +15,7 @@ source="https://downloads.sourceforge.net/arabeyes/${pkgname}_$pkgver.tar.bz2"
builddir="$srcdir"/KacstArabicFonts-$pkgver
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
}
sha512sums="9db8181a4b9db18f648628c10c4c1228aa38186f7ea414887e66fa430ce441b0d0130dd81955ae664558edd46653a290e053b8b126ce4ff7b6e9e1a7169ba4a8 kacst_fonts_2.0.tar.bz2"
diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD
index bbffbd19d..473a03365 100644
--- a/user/kactivities-stats/APKBUILD
+++ b/user/kactivities-stats/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kactivities-stats
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Gather statistics about KDE activities"
url="https://api.kde.org/frameworks/kactivities/html/index.html"
@@ -35,4 +35,4 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="ab67acc4cc88dc2475977c525a02447064c90fd19f595f7c3d78572097fe2d4173c31674fe19aab8e635820c0917b59047626cf15b25d50abf58a56dd9a16f04 kactivities-stats-5.65.0.tar.xz"
+sha512sums="649dbabbad4b6e50363c938f4bf8a881b1b7476c67c638884ee44d879d9ccbdf7e998c59233069bb44fcebcac166750efc8805288dff9b5ec7af808e0dea22b6 kactivities-stats-5.66.0.tar.xz"
diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD
index 59528700c..b2ebfc3e3 100644
--- a/user/kactivities/APKBUILD
+++ b/user/kactivities/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kactivities
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Runtime and library to organize work into separate activities"
url="https://api.kde.org/frameworks/kactivities/html/index.html"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="b13b6da5a725ba7380d61bbf17772dced3e7a57c25f27bb0fcf00829359456c8db3a2863462016a34d3e02aa9da4747450496b4ab456b4d13d709f4bd3193a2e kactivities-5.65.0.tar.xz"
+sha512sums="5acd604b0eb7bc465243cba77adc549e77749801a218bf497ca29b8bf5e948348cf6d35aaaa8101e37fd3bb989718e5a1216db2648d0036a76eed9b311ff7f23 kactivities-5.66.0.tar.xz"
diff --git a/user/kactivitymanagerd/APKBUILD b/user/kactivitymanagerd/APKBUILD
index c2e8a5a3d..941eb5000 100644
--- a/user/kactivitymanagerd/APKBUILD
+++ b/user/kactivitymanagerd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kactivitymanagerd
-pkgver=5.12.9
+pkgver=5.17.90
pkgrel=0
pkgdesc="Service to manage KDE Plasma activities"
url="https://www.kde.org/"
@@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev
boost-dev python3 kconfig-dev kcoreaddons-dev kwindowsystem-dev kio-dev
kglobalaccel-dev kxmlgui-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kactivitymanagerd-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/kactivitymanagerd-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -37,4 +37,4 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="066e32cb94901b947c30116d3bd6c8c0df1e0637d1993be91c801adabf02f8ff4823eb4faa6791acd083710cc6cde2164bbb3d64abb4b56b899a65618d988754 kactivitymanagerd-5.12.9.tar.xz"
+sha512sums="43de13451f39eaa385f07c30867dffbce2d02d519f131d5936ac19087cffd53ce5b24405ad5672262197f826539c4bca83d95c4a63602aabead708d44dbbb151 kactivitymanagerd-5.17.90.tar.xz"
diff --git a/user/kaffeine/APKBUILD b/user/kaffeine/APKBUILD
index 737246458..40c15bb0a 100644
--- a/user/kaffeine/APKBUILD
+++ b/user/kaffeine/APKBUILD
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/kaffeine/kaffeine-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,17 +25,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD
index 96b93cf37..70fa6e642 100644
--- a/user/kalgebra/APKBUILD
+++ b/user/kalgebra/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kalgebra
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Graph calculator and plotter"
url="https://www.kde.org/applications/education/kalgebra/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
qt5-qtsvg-dev analitza-dev ncurses-dev ki18n-dev kdoctools-dev kio-dev
kconfigwidgets-dev kwidgetsaddons-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kalgebra-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kalgebra-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="4cb1013dd20b806a7fcd629328662a8b1c6efa81c685d4bd6b1940a8142dd6fd7ac5ad46636743e26d17b37c283fa51f94203878ae1f255720da71a2e8810654 kalgebra-19.08.2.tar.xz"
+sha512sums="6c5d4c3c2737895f3d0101593a7329120777eb1c812f451df4d90103d7384040c43f8cbeb428e2899af19ec28f3a1f8ec5eef59d0c2332040876b971db2dfd3e kalgebra-19.12.1.tar.xz"
diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD
index 47f9a7770..139cac8fb 100644
--- a/user/kalzium/APKBUILD
+++ b/user/kalzium/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kalzium
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Periodic table of elements (PSE) with calculators"
url="https://www.kde.org/applications/education/kalzium/"
@@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev
kparts-dev kplotting-dev solid-dev kunitconversion-dev
kwidgetsaddons-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kalzium-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kalzium-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,18 +28,16 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="f6956b846345e986f2c5c939e3996effd524804f166edaedaf3c21fe35f529815cdec5674f67bd52bd30fcacd03409262bf592fa6240a2bcafb3bb695830965f kalzium-19.08.2.tar.xz"
+sha512sums="5505bba6066ed7dfc38b9af07e368e4c631ba9f4446330f9e6184c32135676694c2e363faf8410833805461dfb1e40451ffa3feb207ab12c58f0151278af748d kalzium-19.12.1.tar.xz"
diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD
index cd45ba733..91baea079 100644
--- a/user/kanagram/APKBUILD
+++ b/user/kanagram/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kanagram
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Letter order (anagram) game"
url="https://www.kde.org/applications/education/kanagram/"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kcoreaddons-dev kdeclarative-dev kdoctools-dev knewstuff-dev
libkeduvocdocument-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kanagram-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kanagram-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="963f15391452bd78c16360f3f8616143a83e9c3123fa6b74449724bcaaca7bbd2ea113f9a6b17c88904de1b95963571bb6baec39646838e1024f7b3f3e972a09 kanagram-19.08.2.tar.xz"
+sha512sums="77d824d91fa8b52916f6f3a3511e5b6c8eb8226a463ea9016d43b8f5a831055e355bb2f1d34d4b934e402fab98017bda06c0f4f46b21d7ab1bb327ee4cfe3985 kanagram-19.12.1.tar.xz"
diff --git a/user/kanjistrokeorders/APKBUILD b/user/kanjistrokeorders/APKBUILD
index f73660b2c..b5f88df2e 100644
--- a/user/kanjistrokeorders/APKBUILD
+++ b/user/kanjistrokeorders/APKBUILD
@@ -11,12 +11,10 @@ license="BSD-3-Clause"
depends="fontconfig"
makedepends=""
subpackages=""
-source="KanjiStrokeOrders_v$pkgver.ttf::https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${pkgver}.ttf?attredirects=0"
-builddir="$srcdir/"
+source="https://distfiles.adelielinux.org/source/KanjiStrokeOrders_v${pkgver}.ttf"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$srcdir"/*.ttf
}
sha512sums="7382be90761ec63f01fb715154955a76fb78acf1a50a6c3abc3b5b753ebb8bb01d1884e154dce6b15284ac2d7600d1276b098705ee925ee86c42d4194c688721 KanjiStrokeOrders_v4.002.ttf"
diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD
index fff213623..5384efcbf 100644
--- a/user/kapman/APKBUILD
+++ b/user/kapman/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kapman
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Pac-Man clone"
url="https://www.kde.org/applications/games/kapman/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev
kconfigwidgets-dev kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kapman-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kapman-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="0ecad2073517849449017e6b816a90fc0fc696126d9c736f8b69d64a98f751274f1e25ed5f8edeecd12bb35e2019a460a08dad2e7842a33043ac020d34333fbe kapman-19.08.2.tar.xz"
+sha512sums="c7d57746f9990751ad3fa52aa20619deea20cc2324f458a45313cc1ad82f0ad229a860e11ab19a21d86e038b72d442deded2eb7427430d07177f9084165756e9 kapman-19.12.1.tar.xz"
diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD
index 7ed12daa4..cb08f3874 100644
--- a/user/karchive/APKBUILD
+++ b/user/karchive/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=karchive
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for manipulating archive files"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6cb7b1f9a99938485c6d55a254c1325fda7efeb2b17762458c859fe140306eca4239f375d7035374aa42db805f815fa2117adcc7eed53b605cdc1231428549f7 karchive-5.65.0.tar.xz"
+sha512sums="8bcb01f4a897a82014a15fd5f3a387e3d8f0cbcf16e1116cc6559ef939f7d482f01ed7cdd2c0e5bd5aecebe77bfbd0a9c8effade87c43cb2b81ffed2bd1094e1 karchive-5.66.0.tar.xz"
diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD
index 84e79c8d3..d0b34ca8a 100644
--- a/user/kate/APKBUILD
+++ b/user/kate/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kate
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more"
url="https://kate-editor.org/"
@@ -16,10 +16,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev python3
plasma-framework-dev"
subpackages="kwrite kwrite-doc:kwrite_doc kwrite-lang:kwrite_lang
$pkgname-doc $pkgname-lang $pkgname-project"
-source="https://download.kde.org/stable/applications/$pkgver/src/kate-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kate-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -30,17 +29,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -66,8 +63,6 @@ kwrite() {
}
kwrite_doc() {
- local _langpath
-
pkgdesc="Simple GUI text editor (documentation)"
install_if="docs kwrite=$pkgver-r$pkgrel"
for _langpath in "$pkgdir"/usr/share/doc/HTML/*; do
@@ -80,8 +75,6 @@ kwrite_doc() {
}
kwrite_lang() {
- local _langpath
-
pkgdesc="Simple GUI text editor (translations)"
for _langpath in "$pkgdir"/usr/share/locale/*/LC_MESSAGES; do
local _sublangpath="$subpkgdir/${_langpath#"$pkgdir"}"
@@ -92,4 +85,4 @@ kwrite_lang() {
done
}
-sha512sums="3e1608843a749af75f12011e929bec0cd18e28b73e6b531b885855b07aec343007deb3def2de1215ff134f84052ecf956d834029267d790cc99ddd76d36a212a kate-19.08.2.tar.xz"
+sha512sums="fa170041b3f1d3544c85b1e8bec1dabca247e1534dd4b1cc008279051375bfea1190b7be4ffed1572f2c4c348fc3d04219aa0bda61f3091d4c820307757dc219 kate-19.12.1.tar.xz"
diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD
index f8fc04aad..2ef8043de 100644
--- a/user/katomic/APKBUILD
+++ b/user/katomic/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=katomic
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Fun, educational game involving molecular geometry"
url="https://games.kde.org/game.php?game=katomic"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev ki18n-dev
kconfig-dev kcrash-dev kwidgetsaddons-dev kxmlgui-dev knewstuff-dev
kdoctools-dev kdbusaddons-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/katomic-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/katomic-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="75b4c1d2a3ca709c639d2cb1aad61ef145c6fbc00141c26ad0ddd3db4dd7d9a07b705b9875b5b84e8c95b28cbad62b7fbcd304abe07bfdc22af82d15f9251fdd katomic-19.08.2.tar.xz"
+sha512sums="a57f056dbee50363b4f33861ca5221cb1413fbeb1a97994c4da8c2e0a9484f58e99b0e7a813bac1008131ea14b5c2e39722018a5baa53b479ab4af07858f785a katomic-19.12.1.tar.xz"
diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD
index d21d86685..125f2d0f1 100644
--- a/user/kauth/APKBUILD
+++ b/user/kauth/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kauth
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for allowing software to gain temporary privileges"
url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5de70c1ddf73ab7def59d057d596acc657ee54e11a7def29b37e44f8458f4c65422afb8613efd94bad83974eea428e393fe9c2d5aa8482ab410ea83cf7be7a6e kauth-5.65.0.tar.xz"
+sha512sums="dbc05ace539ba19cb4ccb0da995ea7049fc7702d2405f0d71c71423b22309df6194457a625525dcf47f504856d80b640276e60fce9369c8efadc1bb5123ca3d2 kauth-5.66.0.tar.xz"
diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD
index 47ba07a92..752e3a152 100644
--- a/user/kblackbox/APKBUILD
+++ b/user/kblackbox/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kblackbox
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Hide-and-seek logic game"
url="https://www.kde.org/applications/games/kblackbox/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
karchive-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev
kdbusaddons-dev ktextwidgets-dev kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kblackbox-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kblackbox-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="ddaba772eb57a8f3fe1d585d997ba6ea50d7a3af1933ee6afd972edda9530001665210e2436bd8a8f6f2887c58e20a2d486ba11ac057d33f0e3710cd2815f86b kblackbox-19.08.2.tar.xz"
+sha512sums="1bfd0349d4df0b4e85ff6bd4689f85ff02f15a3e9cf0082610f455f42bfc0fb6f698ee4e371d20b6c7dbedc0f3dc1ba1d1f881450c3fca964d87a7b53edb49e7 kblackbox-19.12.1.tar.xz"
diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD
index 49da3c3ba..1e0d2a57f 100644
--- a/user/kblocks/APKBUILD
+++ b/user/kblocks/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kblocks
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Falling blocks game"
url="https://www.kde.org/applications/games/kblocks/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev
kdbusaddons-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kblocks-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kblocks-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="369d447665908bbdf47e7363d47312cd916bfcd89cb0354be6c15e9a749632d229bce3d8084a2b497cc7dcdd49e4b35cc313a3c8dabd82d93a994e43612e4cf2 kblocks-19.08.2.tar.xz"
+sha512sums="cab155ee1268e2103dac1c9c8cdd51183ffa32fb70781ed157a0a09720aeeaf136cdaea856e7f89a34261d2925bd4d804d00e53227a482817f4f00ccd73e4e77 kblocks-19.12.1.tar.xz"
diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD
index 315081ea3..bd3acf99d 100644
--- a/user/kbookmarks/APKBUILD
+++ b/user/kbookmarks/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kbookmarks
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for managing XBEL-format bookmarks"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="192b850a166b2714e7748a6099841b3fbd61ba303633076628b912e07cb9a88e97717f1716025e002da5d9b0f2ced7d4604556ab9c351a522021d45d5ee8d760 kbookmarks-5.65.0.tar.xz"
+sha512sums="89dbe160e82b19fe12da531f748abda7144f466cac83c5e9ba2a5e297c85bb8e3a7e9a9d027fd900cf5a5647702616b76ea6e94646ea953711b748cfe3c6bf9c kbookmarks-5.66.0.tar.xz"
diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD
index ded0218f2..3a0c9e625 100644
--- a/user/kbounce/APKBUILD
+++ b/user/kbounce/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kbounce
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Puzzle/arcade game to build walls"
url="https://games.kde.org/game.php?game=kbounce"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kconfigwidgets-dev kcompletion-dev kxmlgui-dev kio-dev kdoctools-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kbounce-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kbounce-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="745836150ecca4937cac66ff69da813c1b06bc92ae8a20198857362abeb156ceb809fd2a83429c9f8f4bbdba23261751ebdf921a768d3c0be27493e0a423167f kbounce-19.08.2.tar.xz"
+sha512sums="5bb871b07de60b0e2f8dd4c429ea8ac1e1cf9c71def3607c012a9f286cb29865a3eb1b15a94eb936d448158d7565c608db858f8af755168687733edf8c1633cf kbounce-19.12.1.tar.xz"
diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD
index 764af168b..e9182fb0f 100644
--- a/user/kbreakout/APKBUILD
+++ b/user/kbreakout/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kbreakout
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Break-Out like game with a ball and paddle"
url="https://games.kde.org/game.php?game=kbreakout"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kdbusaddons-dev kconfigwidgets-dev kxmlgui-dev kdoctools-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kbreakout-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kbreakout-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="c1d05077716c02a6741bad3e482808e285498139d5abe615fcdfdb048dcfd55b156c7c229b0019359a05f339202e6acdc18f3d3441041299ac4bf52cc2025387 kbreakout-19.08.2.tar.xz"
+sha512sums="5ae019e6f31a1373ec4ab83a421d0d01cb8644124709c19081fa386d2f8155e7613d53450232e88ec2eaf25fdf0e55494ae84b3f3456d7502a9b52167a35e591 kbreakout-19.12.1.tar.xz"
diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD
index 6695744d6..0c78427db 100644
--- a/user/kbruch/APKBUILD
+++ b/user/kbruch/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kbruch
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Practice calculating percentages and fractions"
url="https://www.kde.org/applications/education/kbruch/"
@@ -11,10 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev
kdoctools-dev ki18n-dev kwidgetsaddons-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kbruch-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kbruch-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="4bbe24de8767b1d449ac2b253569b88e8c3d7a7021c78daf057da5b1d153dcb717c03df9dcd416cf787274fda5d6c4825e8d396848da39d585317a472f30f809 kbruch-19.08.2.tar.xz"
+sha512sums="ae595d3b9dbfa8d11af286c104e7558b05e80ba14808896a28de2e5bc03a9c9b22b9d3b7d2748546c92a9e6a47c4b5464c593b90c837df7fc381aaf2b832f836 kbruch-19.12.1.tar.xz"
diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD
index d3b5c81f6..9cd104a66 100644
--- a/user/kcachegrind/APKBUILD
+++ b/user/kcachegrind/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcachegrind
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Profile data visualisation tool and call graph viewer"
url="https://kcachegrind.github.io/html/Home.html"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev
karchive-dev kconfig-dev kcoreaddons-dev kdoctools-dev ki18n-dev kio-dev
kwidgetsaddons-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kcachegrind-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kcachegrind-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="7e2c7dc247e5adce6b68097ae265bbd449634efff581a68a18c725635ac8e976c9e5c92e8dbcde519d57b4fbb904e97afee85407992c8e5b2ab4a9fb04b28208 kcachegrind-19.08.2.tar.xz"
+sha512sums="4fd5e195c8269fd59ed3f565590c45ed4705f96bcb390551cd6561e6ef7d0cbf7708679f7c44905858564724a4d0a3866a411c4f9a4763b9a9e57ba8eeb7bdef kcachegrind-19.12.1.tar.xz"
diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD
index df2832969..dc1c2cc79 100644
--- a/user/kcalc/APKBUILD
+++ b/user/kcalc/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcalc
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Calculator with many mathematical, scientific, and logic functions"
url="https://utils.kde.org/projects/kcalc/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev ki18n-dev
kconfigwidgets-dev kdoctools-dev kguiaddons-dev kinit-dev kxmlgui-dev
knotifications-dev gmp-dev mpfr-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kcalc-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kcalc-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="966e1239c11f77c162d5698708e96e8172bc99bc195df0ceff9b5867b7fd9f452091cc4d39286b8bf2febf9a75ee119d3f5282090d6bf8b02783ff8d0ed75424 kcalc-19.08.2.tar.xz"
+sha512sums="8aa7fdb4bd1d9842f2e2036e3f94649328f9b5bc47b4c031aeb787cec0fdf28697ebf9f41cb60e120e59c38b44a2e6d366542ac9228abb859db6ec5eb28b4cf6 kcalc-19.12.1.tar.xz"
diff --git a/user/kcalcore/APKBUILD b/user/kcalendarcore/APKBUILD
index 62764c297..b35ca9c80 100644
--- a/user/kcalcore/APKBUILD
+++ b/user/kcalendarcore/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
-pkgname=kcalcore
-pkgver=18.12.3
+pkgname=kcalendarcore
+pkgver=5.66.0
pkgrel=0
pkgdesc="Library for managing a calendar of events"
url="https://www.kde.org/"
@@ -9,14 +9,14 @@ arch="all"
license="LGPL-2.0+"
depends=""
depends_dev="qt5-qtbase-dev attica-dev kparts-dev"
-makedepends="$depends_dev cmake extra-cmake-modules bison libical-dev
- kconfig-dev kdelibs4support-dev"
checkdepends="tzdata"
-subpackages="$pkgname-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/kcalcore-$pkgver.tar.xz"
+makedepends="$depends_dev cmake extra-cmake-modules libical-dev
+ doxygen qt5-qttools-dev"
+subpackages="$pkgname-dev $pkgname-doc"
+replaces="kcalcore"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcalendarcore-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +27,17 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ -DBUILD_QCH:BOOL=ON \
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
- TZ=UTC CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E 'Compat-libical3'
+ TZ=UTC CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(Compat-libical3|testicaltimezones)'
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="c347bfba365cb8d88fe11f743f5e5870e31a2d526f0cecda3bdebccadbf8e1ae5d19586d1c7120327e47e30a7a21931ed1e084fbfbdc41c82516e803893effae kcalcore-18.12.3.tar.xz"
+sha512sums="155b229c9903f8f72fc54950810e6efbd3fc81a9e546b747170ef9125115617db248a4936206671b4e7aa2337a95791f43f8532762e761f6ad22d4e2e73d45e2 kcalendarcore-5.66.0.tar.xz"
diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD
index 3334acea7..673268ffd 100644
--- a/user/kcharselect/APKBUILD
+++ b/user/kcharselect/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcharselect
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Tool to select special characters from all installed fonts"
url="https://utils.kde.org/projects/kcharselect/"
@@ -11,10 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kbookmarks-dev kcrash-dev
kdoctools-dev ki18n-dev kwidgetsaddons-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kcharselect-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kcharselect-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="4d618a691d1153952b04ad172dc8bd1d87b56f530f05c88c91af3844eacf24ccd0123aec8978bc623009f68dc84b56d917dc4766376ae78115de73b3bff66b92 kcharselect-19.08.2.tar.xz"
+sha512sums="e2bb6bff6876ebc4bdcc4c77c860f01a2c33933840372bb0d2645cdb4b3a61a83110dc398e4417bc7048d5aed23cf91e7a94c381f4972c86bb2083181df9f4f2 kcharselect-19.12.1.tar.xz"
diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD
index cfbe23fa6..570bee75e 100644
--- a/user/kcmutils/APKBUILD
+++ b/user/kcmutils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcmutils
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for writing System Settings modules"
url="https://api.kde.org/frameworks/kcmutils/html/index.html"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="364986129afa9ba91bc715e43c895c2aeecbea8c41093805d178392fbbdbbbc797416d83f3f91fb2c8427883fda0f4a9581e4f8fb58ee293daada864a990158f kcmutils-5.65.0.tar.xz"
+sha512sums="720cfc3adddd69b8006b971ab3a1a13d8de8abb2d4cbb49839860156405042f8cd20efde695fcdc3008a5a6c6e157f730fbc07dcc80e48a5c6911fb429084b55 kcmutils-5.66.0.tar.xz"
diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD
index 6a21568e4..762db4646 100644
--- a/user/kcodecs/APKBUILD
+++ b/user/kcodecs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcodecs
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for manipulating strings in differing encodings"
url="https://www.kde.org/"
@@ -15,7 +15,7 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcodecs-$pkgver.tar.xz"
# secfixes:
-# 5.65.0-r0:
+# 5.66.0-r0:
# - CVE-2013-0779
build() {
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a8538d954870e65ab92db880a2d3e77857bd8645133afcf402d3abf190d456779a79ed5515a4a3c874391ff70005dd89f0a16432ddffd16d7211ec2208e92725 kcodecs-5.65.0.tar.xz"
+sha512sums="31e73549ad96a19f634a58e79fccb9c1be0b64e0e6eb89242bf890bcb0c51d445499534e795cafa1e09d5fa6ac8f5b607e346071941296613ae1fcfc2641ceee kcodecs-5.66.0.tar.xz"
diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD
index ae86d1eb3..8b417a7d1 100644
--- a/user/kcolorchooser/APKBUILD
+++ b/user/kcolorchooser/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcolorchooser
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Simple application to choose a colour from the screen"
url="https://www.kde.org/applications/graphics/kcolorchooser/"
@@ -10,10 +10,9 @@ license="MIT"
depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev kxmlgui-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kcolorchooser-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kcolorchooser-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -24,18 +23,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="a522900c1e849f875f13064400759f698a6c7aa9988e865ba1b645d735ded3910682cc00945b1a99b02c5c8b2473a5ecdf9d2b3597d96f921532221fb47ffba9 kcolorchooser-19.08.2.tar.xz"
+sha512sums="e5aef0345e28070c0b5fd01ed48fa144bd00c2050306a50e4bcd52efff8c3d7521a4d301ae1e2ef7b5bbed07a9f5a733060681305b9ffe6d1bf9ae1ce168da59 kcolorchooser-19.12.1.tar.xz"
diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD
index 7a3801d0a..7c29e2368 100644
--- a/user/kcompletion/APKBUILD
+++ b/user/kcompletion/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcompletion
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for implementing automatic completion of input"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d35844d13ab695ccf783a509dc0adcd7e39775ea6ebfa1ec2a1e21d81aa81eb422fc4df2c8bd71ba75f72b68c34d1d4a61801cbcc497834cc0d5cbb0dec39459 kcompletion-5.65.0.tar.xz"
+sha512sums="8adec48d62f5e8051e7f3c5b52c55a52a7a66d041536649fd7424d51ae9ee8ed16e4eae9070e9258fdd7797761af3be3550a4fba1e04090d251f676c91f59136 kcompletion-5.66.0.tar.xz"
diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD
index 69a8e57e2..8f55fa65a 100644
--- a/user/kconfig/APKBUILD
+++ b/user/kconfig/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kconfig
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for managing software configuration"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4a15605ac1d573eb01acb06c83c1ad7dc64f1642f295ad162b460f32ef7c77eeab0d7fdf131057da04c669bbb4f35201f580c52b2f034c4bb0129bbf7775800b kconfig-5.65.0.tar.xz"
+sha512sums="bf809e1d1dcdfcc36f970f61d99b943db8583cc5c2b6c2b3d68e011d4503e5d22e659146e21b687acb8da890e002ab93b1deba79041f88d18e52f078ab138f74 kconfig-5.66.0.tar.xz"
diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD
index 7c6131565..6fcca49b8 100644
--- a/user/kconfigwidgets/APKBUILD
+++ b/user/kconfigwidgets/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kconfigwidgets
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework providing widgets for software configuration"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="10b76bce1b90628c3d8d1689146baa1d00cc7b43869c46adde6a39118c2be78f9fa3913f2612514ee588a5cade76bd1105948215767472b3874faaf98b3fb008 kconfigwidgets-5.65.0.tar.xz"
+sha512sums="2646d63cb969b778f12b883f742bdf6d99eeb91b33e88b190ef32bef27a45aa02159cf584c07dcb5cb7bffaebe9e1eedc6ca938826424309d68bd6ff7cb487b0 kconfigwidgets-5.66.0.tar.xz"
diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD
index cf1efe711..0086916f1 100644
--- a/user/kcontacts/APKBUILD
+++ b/user/kcontacts/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcontacts
-pkgver=18.12.3
+pkgver=5.66.0
pkgrel=0
pkgdesc="Library for working with contact information"
url="https://www.kde.org"
@@ -10,12 +10,11 @@ license="LGPL-2.1-only"
depends="iso-codes"
depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kcoreaddons-dev
- ki18n-dev kcodecs-dev iso-codes-dev"
+ ki18n-dev kcodecs-dev iso-codes-dev doxygen graphviz qt5-qttools-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kcontacts-$pkgver.tar.xz"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcontacts-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,20 +25,19 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ -DBUILD_QCH:BOOL=ON \
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
# addresstest requires the library to already be installed.
# picturetest requires X11 running.
CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E "(address|picture)test"
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="3afdc0f3fb304329f0dec37f7db1d4cf457eda726a9276d440d9ada83f946c28806d5a3e69f0c711fb398567a7e3566b7c043b1dfc4ec59eae0b9ed0aa08689a kcontacts-18.12.3.tar.xz"
+sha512sums="8e11b20d7e6fcda4cd59a0faa5d81fcc09f7214c600612835c088ea70bec952cf94a49cb83390cc3a64e38fc27b459f76ea12729565e4c314c3f1f740dbdec4a kcontacts-5.66.0.tar.xz"
diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD
index 18354ff62..f8637699c 100644
--- a/user/kcoreaddons/APKBUILD
+++ b/user/kcoreaddons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcoreaddons
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Core KF5 framework"
url="https://www.kde.org/"
@@ -13,7 +13,9 @@ depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev doxygen
shared-mime-info"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcoreaddons-$pkgver.tar.xz"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kcoreaddons-$pkgver.tar.xz
+ utf8.patch
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -39,4 +41,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2b2d1bf85e3f0a2e226c678107653dd347bf7d8a0d23cab2759057eb6ba74dc45fd1bfcf6da1c176c2ee60bbb0e05d43a85bec1a9955bfedc79aca62f4d8aae8 kcoreaddons-5.65.0.tar.xz"
+sha512sums="86b24604a9d7ff32b5a1e4c43c11a254b788deb0e289625de3c7acf75d435405273b59be2646df9906558f8190124aeedc061f9b963bf336d0200ed799570b60 kcoreaddons-5.66.0.tar.xz
+d462866912d9cc9a768477d872142eb67be6b616c044436a27aa71577546efe4aa323b3dac913f9dbb52fc62dbe27d464b30ac3c4cb23c5d7c414d96138e9300 utf8.patch"
diff --git a/user/kcoreaddons/utf8.patch b/user/kcoreaddons/utf8.patch
new file mode 100644
index 000000000..3fee25313
--- /dev/null
+++ b/user/kcoreaddons/utf8.patch
@@ -0,0 +1,17 @@
+Use UTF-8 for parsing /etc/os-release.
+
+diff --git a/src/lib/util/kosrelease.cpp b/src/lib/util/kosrelease.cpp
+index 0469aba..1d74f2a 100644
+--- a/src/lib/util/kosrelease.cpp
++++ b/src/lib/util/kosrelease.cpp
+@@ -134,9 +134,9 @@ public:
+ QStringList parts;
+ while (!file.atEnd()) {
+ // Trimmed to handle indented comment lines properly
+- line = QString::fromLatin1(file.readLine()).trimmed();
++ line = QString::fromUtf8(file.readLine()).trimmed();
+
+ if (line.startsWith(QLatin1Char('#'))) {
+ // Comment line
+ // Lines beginning with "#" shall be ignored as comments.
+ continue;
diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD
index 4a9d39e79..e57d57a1d 100644
--- a/user/kcrash/APKBUILD
+++ b/user/kcrash/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kcrash
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for gracefully handling software errors~"
url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2fdd67c4d6cb3f0efa200cd18e784e0ac10600566d571397054f9eb2b84b801cb5f94029db8b0d1aed29c12a6b0359800f758972118f5121ddc3cb4be00e1e2d kcrash-5.65.0.tar.xz"
+sha512sums="0bfb2b7211522608c4e2bdf0677074daff4ca4802c02949eb720df87d5c5ba2b4882c69fd908abd34440ef5fa97e1109535aea94071b646b15d1e7819203cf8f kcrash-5.66.0.tar.xz"
diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD
index c723e3273..aec5b7c20 100644
--- a/user/kdbusaddons/APKBUILD
+++ b/user/kdbusaddons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdbusaddons
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for coping with D-Bus"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="192e058f1feb0c390c07755522f3fa6e6c5b676673fe1875c58ecff8d56d37a816a60316f8f2e49217f61d0fde1d73e7461b3d333a3917a233bbb25ee57609f2 kdbusaddons-5.65.0.tar.xz"
+sha512sums="ee85f691f5916135a2cbcaa9dcea945329fa744a1d81f875a73dfe1d64a52d7d4575dc80eded281c08df8327ae6cddb44e1ff5348c76c51d935bb02c27f17383 kdbusaddons-5.66.0.tar.xz"
diff --git a/user/kde-cli-tools/APKBUILD b/user/kde-cli-tools/APKBUILD
index 229cb371e..ab39964c1 100644
--- a/user/kde-cli-tools/APKBUILD
+++ b/user/kde-cli-tools/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kde-cli-tools
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="KDE command-like utilities"
url="https://www.kde.org/"
@@ -9,12 +9,13 @@ arch="all"
options="!check" # MIME types for some reason think .doc == .txt
license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+ AND GPL-2.0-only AND LGPL-2.1-only"
depends=""
+checkdepends="shared-mime-info"
makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev
qt5-qtx11extras-dev kactivities-dev kcmutils-dev kconfig-dev
- kdelibs4support-dev kdesu-dev kdoctools-dev ki18n-dev kiconthemes-dev
- kinit-dev kio-dev kwindowsystem-dev"
+ kdeclarative-dev kdesu-dev kdoctools-dev ki18n-dev kiconthemes-dev
+ kinit-dev kio-dev kservice-dev kwindowsystem-dev libkworkspace-dev"
subpackages="$pkgname-lang $pkgname-doc"
-source="https://download.kde.org/stable/plasma/$pkgver/kde-cli-tools-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/kde-cli-tools-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -27,7 +28,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -39,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="54bed8cd64fb59abdfcea0a346e76cbc79f35b4d7c23e8a072e30b2489d636d47f119c8dc9f254c15b26c3bb69098a864589088ab4e2a1c2669375d1810276c3 kde-cli-tools-5.12.8.tar.xz"
+sha512sums="165794a2e97a31d35f5b81deadf88604b5522481aaaa8361eecee3eb596ee0befb3e67f41e99f0bbb8533393ec0cef1f1c290e426bf158536b812e3621bb37ce kde-cli-tools-5.17.90.tar.xz"
diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD
index 1c4ebcc34..fe2d4e34b 100644
--- a/user/kde-education/APKBUILD
+++ b/user/kde-education/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-education
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Educational software from the KDE Software Collection"
url="https://www.kde.org/applications/education/"
@@ -11,7 +11,7 @@ license="NCSA"
# gcompris-qt is removed until it works with gettext-tiny.
depends="artikulate blinken cantor kalgebra kalzium kanagram kbruch
kgeography khangman kig kiten klettres kmplot ktouch kturtle kwordquiz
- labplot marble minuet rocs step"
+ labplot marble minuet rocs step xdg-utils"
makedepends=""
source="org.adelie-linux.about-education.desktop"
diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD
index 42135b2c0..7a8034f6b 100644
--- a/user/kde-games/APKBUILD
+++ b/user/kde-games/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-games
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="The KDE games collection"
url="https://www.kde.org/applications/games/"
diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD
index 12bd0b039..0e08b12af 100644
--- a/user/kde-graphics/APKBUILD
+++ b/user/kde-graphics/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-graphics
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Graphics software from the KDE Software Collection"
url="https://www.kde.org/applications/graphics/"
diff --git a/user/kde-gtk-config/APKBUILD b/user/kde-gtk-config/APKBUILD
index 4890f6185..1704c93d0 100644
--- a/user/kde-gtk-config/APKBUILD
+++ b/user/kde-gtk-config/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kde-gtk-config
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="KDE System Settings panel for configuring GTK+ application styles"
url="https://www.kde.org/"
@@ -11,8 +11,8 @@ depends="gsettings-desktop-schemas"
makedepends="cmake extra-cmake-modules qt5-qtbase-dev gtk+2.0-dev gtk+3.0-dev
karchive-dev kcmutils-dev kconfigwidgets-dev ki18n-dev kiconthemes-dev
kio-dev knewstuff-dev gsettings-desktop-schemas-dev"
-subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kde-gtk-config-$pkgver.tar.xz"
+subpackages=""
+source="https://download.kde.org/unstable/plasma/$pkgver/kde-gtk-config-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -25,7 +25,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6ed8dd86ed2f0e5e3ac7ee6010b8ef4441380eab5425e2e98fbdfbf6f756c295956f9fbff61524d55961edd66e212a0f2004aed70be2f97a04634751e3553ebd kde-gtk-config-5.12.8.tar.xz"
+sha512sums="e0838b9906272b53d7de1c925ae30f8df1d5d0467e566bfbd841fc6d39badff9dae5a097b8740da07d3cb98b5f749b58cc01cc9bdce29d713b0053d92a091634 kde-gtk-config-5.17.90.tar.xz"
diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD
index 142e010fd..c5e9577f3 100644
--- a/user/kde-multimedia/APKBUILD
+++ b/user/kde-multimedia/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-multimedia
-pkgver=19.08.1
+pkgver=19.12.1
pkgrel=0
pkgdesc="Multimedia software from the KDE Software Collection"
url="https://www.kde.org/applications/multimedia/"
diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD
index f04d4de34..5b5300df8 100644
--- a/user/kde-system/APKBUILD
+++ b/user/kde-system/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-system
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="System utiltiies from the KDE Software Collection"
url="https://www.kde.org/applications/system/"
diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD
index a30c4f7a2..00f0b8670 100644
--- a/user/kde-utilities/APKBUILD
+++ b/user/kde-utilities/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde-utilities
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Desktop utiltiies from the KDE Software Collection"
url="https://www.kde.org/applications/utilities/"
diff --git a/user/kde/APKBUILD b/user/kde/APKBUILD
index dbb054a1e..902ef67d1 100644
--- a/user/kde/APKBUILD
+++ b/user/kde/APKBUILD
@@ -1,16 +1,18 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kde
pkgver=5
-pkgrel=1
+pkgrel=2
pkgdesc="The K Desktop Environment"
url="https://www.kde.org/"
arch="noarch"
-license="NCSA"
options="!check" # Metapacakge
+license="NCSA"
subpackages=""
depends="adelie-kde-theme kde-education kde-games kde-graphics kde-multimedia
kde-system kde-utilities plasma-desktop
+ kcachegrind kget krdc ktorrent umbrello
+
kgamma5 khotkeys kmenuedit ksshaskpass plasma-workspace-wallpapers
user-manager"
source=""
diff --git a/user/kdeclarative/APKBUILD b/user/kdeclarative/APKBUILD
index 9f1e3e2fa..d66bb9325 100644
--- a/user/kdeclarative/APKBUILD
+++ b/user/kdeclarative/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdeclarative
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Frameworks for creating KDE components using QML"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d8cabccb96c7ef820533b0350cd18125a534e75fcf9e9debbb5bb38225c2ad718093574a1ba790b9671550f5ccdefc2ea8363526df0fab91dd692ee34e5c4b8d kdeclarative-5.65.0.tar.xz"
+sha512sums="5353cba20b2b4d22ef3fe34bf12f257b1048577775fbd683d8ac439b5b29677bc4fd10be96d58abaacaa14dd671b2688a480e0c31be82b56563e3d9fa04f2170 kdeclarative-5.66.0.tar.xz"
diff --git a/user/kdecoration/APKBUILD b/user/kdecoration/APKBUILD
index 596214fbf..8f53a27c7 100644
--- a/user/kdecoration/APKBUILD
+++ b/user/kdecoration/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kdecoration
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Window decoration plugin library"
url="https://www.kde.org/"
@@ -10,9 +10,9 @@ options="!check" # Requires running X11 display
license="LGPL-2.1"
depends=""
depends_dev="qt5-qtbase-dev"
-makedepends="$depends_dev cmake extra-cmake-modules"
-subpackages="$pkgname-dev"
-source="https://download.kde.org/stable/plasma/$pkgver/kdecoration-$pkgver.tar.xz"
+makedepends="$depends_dev cmake extra-cmake-modules ki18n-dev"
+subpackages="$pkgname-dev $pkgname-lang"
+source="https://download.kde.org/unstable/plasma/$pkgver/kdecoration-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -25,7 +25,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ee93718d25ebf51a61fd8fab8be7138b3bddcbc87422e88e9500c40b72a0211abfa3df168277e7d1cee759bb995ea993d618024979a4d4127729a40b3e910f61 kdecoration-5.12.8.tar.xz"
+sha512sums="9946f2ad3c1433beff94831e7c129b85974f53b81bf67b877a2e54c2d3fa500bd2b6199c1e6192a91860d9e624141f6d6d506731190003c6eff9823be2249558 kdecoration-5.17.90.tar.xz"
diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD
index aeaab4a3a..24409bf3c 100644
--- a/user/kded/APKBUILD
+++ b/user/kded/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kded
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Central KDE workspace daemon"
url="https://www.kde.org/"
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ec382a920861e666c07f65183ad2548de6d74ad3a55a49a2be889a9f447772aa02845b7e6ea81daac31eb43a23ca6a71157aaf1d4a8c8438f8459b1b85b8f0d3 kded-5.65.0.tar.xz"
+sha512sums="e65d6e18a33142c05f82153fbc234e0ad4a190d8d98ed13baf6b7b376338a63cbacb1dfdad6a8791b517b9de3300a363400a7a24868c808e0e2a7facb80623b8 kded-5.66.0.tar.xz"
diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD
index b38d29ac8..3a801e56e 100644
--- a/user/kdegraphics-thumbnailers/APKBUILD
+++ b/user/kdegraphics-thumbnailers/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdegraphics-thumbnailers
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KDE thumbnailing sofware"
url="https://www.KDE.org/"
@@ -11,10 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kio-dev libkdcraw-dev
libkexiv2-dev"
subpackages=""
-source="https://download.kde.org/stable/applications/$pkgver/src/kdegraphics-thumbnailers-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kdegraphics-thumbnailers-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="72360eac57b541858e6dbaf34036452ace5776f371773194be4b83defb0e512f856430221c83b3a063c532a6181faa2a8821abb16143de1d3aa44b23eda8037d kdegraphics-thumbnailers-19.08.2.tar.xz"
+sha512sums="ece8d5a438f057fe36fa31af885b3ec85acb8980b50508684cd6c654758436071941a79ba764101ab24ffdf5d97f9fef1b5c47981144e85962a10ab2f3cab5c9 kdegraphics-thumbnailers-19.12.1.tar.xz"
diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD
index 7bc25ae53..c8a259af9 100644
--- a/user/kdelibs4support/APKBUILD
+++ b/user/kdelibs4support/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdelibs4support
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Legacy support for KDE 4 software"
url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5d41561a28999d460099fc97e69ba76340f9f46e67725dd9a66a5f8fdf5e6395f17908f997ecf84656d3fb7712490772df561a4122da946041f2c85d2053f341 kdelibs4support-5.65.0.tar.xz"
+sha512sums="bd6e804386495f8ee6a7bd8fa388331c4a16a38319df4ca4f6310921707c628b0c3041216218e5872720782c466697239fc64a25dcaf7c80d3e9d5d65bbb5726 kdelibs4support-5.66.0.tar.xz"
diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD
index b9903e868..4cd8f35a9 100644
--- a/user/kdenlive/APKBUILD
+++ b/user/kdenlive/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdenlive
-pkgver=19.08.1
+pkgver=19.12.1
pkgrel=0
pkgdesc="Libre video editor"
url="https://kdenlive.org/"
@@ -20,10 +20,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev
kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev
kdeclarative-dev qt5-qtmultimedia-dev rttr-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kdenlive-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kdenlive-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -34,18 +33,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="74f007ecdfe2368a1dee9d7b2331e45a56adc157a4d20127659b833e3f045a6edce680593232b9be43e50d16a5222e275af61a4c3a7e4c420ad6721b2e93b502 kdenlive-19.08.1.tar.xz"
+sha512sums="2255dc5e75d75fcde800a9c25e3a3d30ed4022eaa749e9275b3a2ac8604861cb9b3e5f20eeb895e7b16fa3740538c008211e25c54357d40d1de0ed37d17001d3 kdenlive-19.12.1.tar.xz"
diff --git a/user/kdeplasma-addons/APKBUILD b/user/kdeplasma-addons/APKBUILD
index 4bd1c3710..a4eaeba4f 100644
--- a/user/kdeplasma-addons/APKBUILD
+++ b/user/kdeplasma-addons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kdeplasma-addons
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Extra applets and toys for KDE Plasma"
url="https://www.kde.org/"
@@ -11,10 +11,10 @@ depends="qt5-qtquickcontrols qt5-qtquickcontrols2"
makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
qt5-qtx11extras-dev kactivities-dev kconfig-dev kconfigwidgets-dev
kcmutils-dev kcoreaddons-dev kdoctools-dev ki18n-dev knewstuff-dev
- kross-dev krunner-dev kservice-dev kunitconversion-dev
- kdelibs4support-dev plasma-framework-dev plasma-workspace-dev"
+ kross-dev krunner-dev kservice-dev kunitconversion-dev kholidays-dev
+ plasma-framework-dev plasma-workspace-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kdeplasma-addons-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/kdeplasma-addons-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -41,4 +41,4 @@ package() {
make -C build DESTDIR="$pkgdir" install
}
-sha512sums="3b0a92a90770c718de4065ad9e6f2e7937aa047ecea32ba7c28bf2324d9ad2cd2c825e6bc21a37d494b1d2e5409ba2b4efeaae2be811bee09c9ece2cc3a6941f kdeplasma-addons-5.12.8.tar.xz"
+sha512sums="1254682f9a1d5b2e42aa19a9ba1eefcfa09a857180cb1c3a45693918ad44a125f40e7d114d1f96067678273892044ea1b3ae1099ff39a6e92ee1fd6834faefec kdeplasma-addons-5.17.90.tar.xz"
diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD
index f0a43bd46..7f058577e 100644
--- a/user/kdesignerplugin/APKBUILD
+++ b/user/kdesignerplugin/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdesignerplugin
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Qt Designer plugin for KDE widgets"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4caf89f2ea2b52697b967d3025217ac49d4dde8b475af8605e5a7a7e7014a7fb1d6da2433e8b3162e33eb1ed85bf8cdcb8c50cf5bb1de1cb9d4243754a90614a kdesignerplugin-5.65.0.tar.xz"
+sha512sums="04ed2b9a7c75be32d3f9ddd68f33e4a9c36620ffe80ee2d0599279d445d8236fa63f5a0ceb437fbf9cd8c180944178eff1d26e94fcb807441800a9ea0fd23b28 kdesignerplugin-5.66.0.tar.xz"
diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD
index 6e993ec67..3f31dda72 100644
--- a/user/kdesu/APKBUILD
+++ b/user/kdesu/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdesu
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for elevating privileges"
url="https://api.kde.org/frameworks/kdesu/html/index.html"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="46d310407262ec76550273b18f8647443b9952e527d4b8e3d5b869ee894807e2f6eed6597c28d42b3e6b96d2f270f4bf7dd64dfea6c5b4ecfa863e901d697d40 kdesu-5.65.0.tar.xz"
+sha512sums="4a8f076d06cce70e5a81c51c0111df1b944d12788893e86605c24cfec6dfed314f5abe096f274fba671ab0ed2e91a0810898933fc2477a9bec9fbfa9fe6e38ec kdesu-5.66.0.tar.xz"
diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD
index 9d00ce5d9..be2afe3ab 100644
--- a/user/kdewebkit/APKBUILD
+++ b/user/kdewebkit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdewebkit
-pkgver=5.54.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="KDE integration with WebKit"
url="https://www.kde.org/"
@@ -10,12 +10,11 @@ license="LGPL-2.1+"
depends=""
depends_dev="qt5-qtwebkit-dev"
makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kcoreaddons-dev
- kio-dev kparts-dev kwallet-dev"
+ kio-dev kparts-dev kwallet-dev qt5-qttools-dev"
subpackages="$pkgname-dev"
-source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdewebkit-$pkgver.tar.xz"
+source="https://download.kde.org/stable/frameworks/${pkgver%.*}/portingAids/kdewebkit-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="6d4a5cede572653db64826d29470e7f2f1ecded97547c4ee49f5ca51e218c22ffeb84dbd0f0953e4e55d993aff617d262cc6f974902c5dc0219642dffb1611f1 kdewebkit-5.54.0.tar.xz"
+sha512sums="3f41030992aef86f5704d74b9f8b39fae6978adbd817284c672625810be28548695faef648a95c10112a56247cdeddbae6c2ee1229b692494e1d904b45e5c74d kdewebkit-5.66.0.tar.xz"
diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD
index 61226463a..40da0ca99 100644
--- a/user/kdf/APKBUILD
+++ b/user/kdf/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdf
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="View disk usage information"
url="https://utils.kde.org/projects/kdf/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfigwidgets-dev
kcoreaddons-dev kdoctools-dev ki18n-dev kiconthemes-dev kio-dev
kcmutils-dev knotifications-dev kwidgetsaddons-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kdf-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kdf-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="5f3a38e815862e4390191ad9ec23f287aac93c31fcf866d3e1d0ec3828269e9e090c714ed72580d91a311531b9bfd73c397c5ef05eb08647f37f6d89f6d3902a kdf-19.08.2.tar.xz"
+sha512sums="a6d3ca8dc81f03f5d27f0cb2f2896fd3bcdd573c7ddde42635f249cc9c9c122fef0e915c16294baffdad175d6d5487f851a12fda8c5b6f6595d71395c0dedd74 kdf-19.12.1.tar.xz"
diff --git a/user/kdiagram/APKBUILD b/user/kdiagram/APKBUILD
index 3896e76c4..5c5b7e882 100644
--- a/user/kdiagram/APKBUILD
+++ b/user/kdiagram/APKBUILD
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-lang"
source="https://download.kde.org/stable/kdiagram/$pkgver/kdiagram-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,17 +25,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD
index 9e938ea76..8c00b86f2 100644
--- a/user/kdiamond/APKBUILD
+++ b/user/kdiamond/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdiamond
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Three-in-a-row game"
url="https://games.kde.org/game.php?game=kdiamond"
@@ -13,9 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev
ki18n-dev kconfigwidgets-dev kxmlgui-dev knotifications-dev
knotifyconfig-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kdiamond-$pkgver.tar.xz
- ridiculous-qt.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/kdiamond-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -28,7 +26,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -40,5 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3626805431c7acf3a00ed0d3a8c1d3e6f0cf7fe5cd4712235e916d06697a61e1433e97deea5a6eb96411ce08df660cbf008a22fe98c2e0489c9f28c2f9755f76 kdiamond-19.08.2.tar.xz
-b29c091b45376fa83192b0cd2876de7323648caa597e610c3d13d883ee0df269e9aa9e5367469e0d787a147ade590e6cd1b2c04162da0e8405220067d4e44129 ridiculous-qt.patch"
+sha512sums="bfdd172723a968b024e2f31e19d2f81bc51464dc4feb996284023809b3cb3160237f34e90318e71e766328a920e2fb781c80b9c43644c931b26781150bf75fa2 kdiamond-19.12.1.tar.xz"
diff --git a/user/kdiamond/ridiculous-qt.patch b/user/kdiamond/ridiculous-qt.patch
deleted file mode 100644
index 8e042f59a..000000000
--- a/user/kdiamond/ridiculous-qt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdiamond-19.08.0/CMakeLists.txt.old 2019-08-09 00:27:58.000000000 +0000
-+++ kdiamond-19.08.0/CMakeLists.txt 2019-08-15 12:36:41.785854337 +0000
-@@ -1,7 +1,7 @@
- cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
- project(kdiamond)
-
--set (QT_MIN_VERSION "5.10.0")
-+set (QT_MIN_VERSION "5.9.0")
- set (KF5_MIN_VERSION "5.46.0")
-
- find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG)
diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD
index 47014bcb1..922591ca7 100644
--- a/user/kdnssd/APKBUILD
+++ b/user/kdnssd/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdnssd
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for discovering network services using Zeroconf"
url="https://www.kde.org/"
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c11e6fd38c3dff8a0b315b3d6195d94acfb17a2f1ca1e7da5ec642c50a0ffb5f1b576909b33f2be870bfab4613b4c66f0de4a2ea833a7c64dc64a84a331d60b8 kdnssd-5.65.0.tar.xz"
+sha512sums="5465dc85a60790488c21e1e3fc63ea461ec74c371a487e32466ca3263fc1a0449961360d3d5e3ea09bbe1149fc013a9e23555bbac2d406b7d31ebb38290f3bf9 kdnssd-5.66.0.tar.xz"
diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD
index 512fc19db..e6b573ca2 100644
--- a/user/kdoctools/APKBUILD
+++ b/user/kdoctools/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kdoctools
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Tools to generate user-readable documentation from DocBook XML"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="1857d8838cd94dfd5c02dcbbdeba193c3d7aaf976be27cabf9f1b3631b3b55e0446d4f4b082677451b55ffa15b56efb62bfb0fcd0448cd157928dc41cb86b56b kdoctools-5.65.0.tar.xz"
+sha512sums="b830d99bb4c39fd1dd8cb942d0b2b987cdf260ab4547ce7c37650cc9e0b3607d7a0009c02f67cd5b9cc9234cd026bf669d9b17983b569425dff33323ce7df272 kdoctools-5.66.0.tar.xz"
diff --git a/user/keepassxc/APKBUILD b/user/keepassxc/APKBUILD
index 2e58efa7f..739ee75db 100644
--- a/user/keepassxc/APKBUILD
+++ b/user/keepassxc/APKBUILD
@@ -14,27 +14,21 @@ makedepends="argon2-dev cmake libgcrypt-dev libqrencode-dev libsodium-dev
subpackages="$pkgname-doc"
source="https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"
-prepare() {
- default_prepare
- mkdir build
-}
-
build() {
- cd "$builddir/build"
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo ..
- make
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -Bbuild
+ make -C build
}
check() {
- cd "$builddir/build"
- make test
+ make -C build test
}
package() {
- cd "$builddir/build"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d keepassxc-2.4.3-src.tar.xz"
diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD
index 1de6f877e..76945a7ce 100644
--- a/user/kemoticons/APKBUILD
+++ b/user/kemoticons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kemoticons
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Emoticons to express emotions in KDE"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6cc7ae2581c4de3010658ca7941c983737fd68fd7f57405977e7fe5103d715509c3b2a3caa9b29262f6ec1e90c62ddc2e0cc6afdb2b85421c207617c8e5339df kemoticons-5.65.0.tar.xz"
+sha512sums="0dc33b7ca48b19b76428e0eccb4e51156f92ad20067c535a3329a0ace3c536cb55fc7771f0f9ae2bdb03a3ce7ff92b50a8acd613b947654c9b55c8c2414d7c68 kemoticons-5.66.0.tar.xz"
diff --git a/user/keybinder-3.0/APKBUILD b/user/keybinder-3.0/APKBUILD
index 8340209fb..63d1a84ca 100644
--- a/user/keybinder-3.0/APKBUILD
+++ b/user/keybinder-3.0/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=keybinder-3.0
pkgver=0.3.2
pkgrel=0
@@ -7,12 +7,12 @@ pkgdesc="GTK+ library for managing global keybindings"
url="https://github.com/kupferlauncher/keybinder"
arch="all"
license="Public-Domain AND MIT"
+depends=""
makedepends="gtk+3.0-dev vala gobject-introspection-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://github.com/kupferlauncher/keybinder/releases/download/keybinder-3.0-v$pkgver/keybinder-3.0-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/keychain/APKBUILD b/user/keychain/APKBUILD
index e3dc1306b..114843930 100644
--- a/user/keychain/APKBUILD
+++ b/user/keychain/APKBUILD
@@ -6,22 +6,18 @@ pkgrel=0
pkgdesc="Agent manager for OpenSSH and GnuPG"
url="https://funtoo.org/Keychain"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends=""
makedepends="perl"
-install=""
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/funtoo/$pkgname/archive/$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
install -Dm755 "./${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
install -Dm644 "./${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
}
diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD
index b3437d091..5f5051dd2 100644
--- a/user/kfilemetadata/APKBUILD
+++ b/user/kfilemetadata/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kfilemetadata
-pkgver=5.54.0
-pkgrel=3
+pkgver=5.66.0
+pkgrel=0
pkgdesc="File metadata extraction framework"
url="https://www.kde.org/"
arch="all"
@@ -11,11 +11,10 @@ depends="catdoc"
depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules python3 doxygen graphviz
qt5-qtmultimedia-dev qt5-qttools-dev exiv2-dev karchive-dev ki18n-dev
- poppler-qt5-dev taglib-dev kcoreaddons-dev ffmpeg-dev"
+ poppler-dev poppler-qt5-dev taglib-dev kcoreaddons-dev ffmpeg-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kfilemetadata-$pkgver.tar.xz
- add-formatting-fn.patch
- add-mimeutils.patch
+ test-mimetype.patch
"
build() {
@@ -30,7 +29,7 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_QCH:BOOL=ON \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -42,6 +41,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="bfa8287e5c8df363908a441419d377d33ea2cd93a4fc69fc47c69da80ad0e3a80e60f26b4856c3d3e04128e6ac59b214ee0613e37dda29f2537f502789bd4801 kfilemetadata-5.54.0.tar.xz
-f6d8b9fe9353fdf380d073b8a7dfa4dd8c822a64c1a978dbe8ce13d0f8327d3af5d314be41f9cecc32afb19896711452289b78e09b6fffb010d8c89843ebc4e0 add-formatting-fn.patch
-c94c57b7dacfdf35c19db10f6a4b2724673fc542adac3dde57ac34cb4f09d063fd37404343d265075a88a397d3543da038b6b5832f481de3b05640279ef19a8c add-mimeutils.patch"
+sha512sums="6672aabad03b77d35a3f21ef344ef7e41683188b1ec9acda4756e8b6ebd9681d689b8a5249277eed7bf7996d0aeee3c94f5dd89cb693e41561483d02a819d8b5 kfilemetadata-5.66.0.tar.xz
+17aad7d1e223c5668d7b61b125843d89d7f2598e94173d451e731f96d6322d93ab7b967a9f04dd83020e77cd2f84471c46d81b595b2ea484d2b423af6d1c332b test-mimetype.patch"
diff --git a/user/kfilemetadata/add-formatting-fn.patch b/user/kfilemetadata/add-formatting-fn.patch
deleted file mode 100644
index 5c3a1db91..000000000
--- a/user/kfilemetadata/add-formatting-fn.patch
+++ /dev/null
@@ -1,479 +0,0 @@
-From 4bedfd6609c6efe5dc327d305feac8985d4658e3 Mon Sep 17 00:00:00 2001
-From: Alexander Stippich <a.stippich@gmx.net>
-Date: Sat, 9 Feb 2019 17:41:46 +0100
-Subject: Add string formatting function to property info
-
-Summary:
-Adds the ability to format the metadata value
-for displaying purposes individually for each
-property. Currently, users of KFileMetaData
-must implement their own custom formatting
-functions.
-All custom formatting functions from
-Baloo-Widgets and Dolphin are copied into
-KFileMetaData. This can be extended later.
-
-This adds a dependency on KCoreAddons to
-KFileMetaData.
-
-FEATURE: 398581
-
-Test Plan: tests pass
-
-Reviewers: broulik, bruns, mgallien, #frameworks
-
-Reviewed By: bruns
-
-Subscribers: ngraham, kde-frameworks-devel, #baloo
-
-Tags: #frameworks, #baloo
-
-Differential Revision: https://phabricator.kde.org/D17245
----
- CMakeLists.txt | 5 +++
- autotests/propertyinfotest.cpp | 29 ++++++++++++++
- autotests/propertyinfotest.h | 1 +
- src/CMakeLists.txt | 2 +
- src/formatstrings.cpp | 86 ++++++++++++++++++++++++++++++++++++++++++
- src/formatstrings_p.h | 50 ++++++++++++++++++++++++
- src/propertyinfo.cpp | 27 +++++++++++++
- src/propertyinfo.h | 7 ++++
- 8 files changed, 207 insertions(+)
- create mode 100644 src/formatstrings.cpp
- create mode 100644 src/formatstrings_p.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa481a9..7ef0a40 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,6 +40,11 @@ set_package_properties(KF5Archive PROPERTIES DESCRIPTION "KDE Frameworks 5: Arch
- URL "https://download.kde.org/stable/frameworks/" TYPE OPTIONAL
- PURPOSE "Archive is needed to build ODF and OOXML 2007 extractors")
-
-+find_package(KF5 ${KF5_DEP_VERSION} COMPONENTS CoreAddons)
-+set_package_properties(KF5CoreAddons PROPERTIES DESCRIPTION "KDE Frameworks 5: Core Addons Framework"
-+ URL "https://download.kde.org/stable/frameworks/" TYPE REQUIRED
-+ PURPOSE "Needed for the formatting of properties for display purposes")
-+
- find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS I18n)
-
- find_package(Poppler 0.12.1 COMPONENTS Qt5)
-diff --git a/autotests/propertyinfotest.cpp b/autotests/propertyinfotest.cpp
-index ae8b1b8..e203dcd 100644
---- a/autotests/propertyinfotest.cpp
-+++ b/autotests/propertyinfotest.cpp
-@@ -45,4 +45,33 @@ void PropertyInfoTest::testNameIdMapping()
- }
- }
-
-+void PropertyInfoTest::testFormatAsDisplayString()
-+{
-+ auto emptyProperty = PropertyInfo::fromName(QStringLiteral("no valid property name"));
-+ QCOMPARE(emptyProperty.formatAsDisplayString(QVariant("empty")), QStringLiteral("empty"));
-+
-+ PropertyInfo year(Property::DiscNumber);
-+ QCOMPARE(year.formatAsDisplayString(QVariant(2018)), QStringLiteral("2018"));
-+
-+ QStringList artistList = {"Artist1", "Artist2"};
-+ PropertyInfo artist(Property::Artist);
-+ QCOMPARE(artist.formatAsDisplayString(QVariant(artistList)), QStringLiteral("Artist1, Artist2"));
-+
-+ QStringList authorList = {"Author1"};
-+ PropertyInfo author(Property::Author);
-+ QCOMPARE(artist.formatAsDisplayString(QVariant(authorList)), QStringLiteral("Author1"));
-+
-+ PropertyInfo duration(Property::Duration);
-+ QCOMPARE(duration.formatAsDisplayString(QVariant(1800)), QStringLiteral("0:30:00"));
-+
-+ PropertyInfo sampleRate(Property::SampleRate);
-+ QCOMPARE(sampleRate.formatAsDisplayString(QVariant(44100)), QString(QLocale().toString(44.1) + QStringLiteral(" kHz")));
-+
-+ PropertyInfo bitRate(Property::BitRate);
-+ QCOMPARE(bitRate.formatAsDisplayString(QVariant(128000)), QStringLiteral("128 kB/s"));
-+
-+ PropertyInfo orientation(Property::ImageOrientation);
-+ QCOMPARE(orientation.formatAsDisplayString(QVariant(5)), QStringLiteral("Transposed"));
-+}
-+
- QTEST_GUILESS_MAIN(PropertyInfoTest)
-diff --git a/autotests/propertyinfotest.h b/autotests/propertyinfotest.h
-index 677ade1..15e6a10 100644
---- a/autotests/propertyinfotest.h
-+++ b/autotests/propertyinfotest.h
-@@ -30,6 +30,7 @@ class PropertyInfoTest : public QObject
- Q_OBJECT
- private Q_SLOTS:
- void testNameIdMapping();
-+ void testFormatAsDisplayString();
- };
-
- }
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 52fa8e5..c3cbe8c 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -13,6 +13,7 @@ set(KF5FileMetaData_SRCS
- writerplugin.cpp
- writercollection.cpp
- externalwriter.cpp
-+ formatstrings.cpp
- )
- ecm_qt_declare_logging_category(KF5FileMetaData_SRCS HEADER kfilemetadata_debug.h IDENTIFIER KFILEMETADATA_LOG CATEGORY_NAME kf5.kfilemetadata)
-
-@@ -34,6 +35,7 @@ target_link_libraries(KF5FileMetaData
- Qt5::Core
- PRIVATE
- KF5::I18n
-+ KF5::CoreAddons
- )
-
- if(TAGLIB_FOUND)
-diff --git a/src/formatstrings.cpp b/src/formatstrings.cpp
-new file mode 100644
-index 0000000..b0bfdf8
---- /dev/null
-+++ b/src/formatstrings.cpp
-@@ -0,0 +1,86 @@
-+/*
-+ * Copyright (C) 2018 Alexander Stippich <a.stippich@gmx.net>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "formatstrings_p.h"
-+
-+#include <QDateTime>
-+#include <KLocalizedString>
-+
-+using namespace KFileMetaData;
-+
-+QString FormatStrings::toStringFunction(const QVariant& value)
-+{
-+ return value.toString();
-+}
-+
-+QString FormatStrings::joinStringListFunction(const QVariant& value)
-+{
-+ return value.toStringList().join(i18nc("Separation between multiple entries in a list", ", "));
-+}
-+
-+QString FormatStrings::formatDate(const QVariant& value)
-+{
-+ KFormat form;
-+ QDateTime dt;
-+ if (value.type() == QVariant::DateTime) {
-+ dt = value.toDateTime();
-+ } else {
-+ dt = QDateTime::fromString(value.toString(), Qt::ISODate);
-+ }
-+ if (dt.isValid()) {
-+ return form.formatRelativeDateTime(dt, QLocale::LongFormat);
-+ }
-+ return QString();
-+}
-+
-+QString FormatStrings::formatDuration(const QVariant& value)
-+{
-+ KFormat form;
-+ return form.formatDuration(value.toInt() * 1000);
-+}
-+
-+QString FormatStrings::formatBitRate(const QVariant& value)
-+{
-+ KFormat form;
-+ return i18nc("@label bitrate (per second)", "%1/s", form.formatByteSize(value.toInt(), 0, KFormat::MetricBinaryDialect));
-+}
-+
-+QString FormatStrings::formatSampleRate(const QVariant& value)
-+{
-+ return i18nc("@label samplerate in kilohertz", "%1 kHz", QLocale().toString(value.toDouble() / 1000));
-+}
-+
-+QString FormatStrings::formatOrientationValue(const QVariant& value)
-+{
-+ QString string;
-+ switch (value.toInt()) {
-+ case 1: string = i18nc("Description of image orientation", "Unchanged"); break;
-+ case 2: string = i18nc("Description of image orientation", "Horizontally flipped"); break;
-+ case 3: string = i18nc("Description of image orientation", "180° rotated"); break;
-+ case 4: string = i18nc("Description of image orientation", "Vertically flipped"); break;
-+ case 5: string = i18nc("Description of image orientation", "Transposed"); break;
-+ case 6: string = i18nc("Description of image orientation, counter clock-wise rotated", "90° rotated CCW "); break;
-+ case 7: string = i18nc("Description of image orientation", "Transversed"); break;
-+ case 8: string = i18nc("Description of image orientation, counter clock-wise rotated", "270° rotated CCW"); break;
-+ default:
-+ break;
-+ }
-+ return string;
-+}
-+
-diff --git a/src/formatstrings_p.h b/src/formatstrings_p.h
-new file mode 100644
-index 0000000..125c31e
---- /dev/null
-+++ b/src/formatstrings_p.h
-@@ -0,0 +1,50 @@
-+/*
-+ * Copyright (C) 2018 Alexander Stippich <a.stippich@gmx.net>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef KFILEMETADATA_FORMATSTRINGS_P_H
-+#define KFILEMETADATA_FORMATSTRINGS_P_H
-+
-+#include <QString>
-+#include <QVariant>
-+#include <KFormat>
-+
-+namespace KFileMetaData {
-+
-+class Q_DECL_HIDDEN FormatStrings
-+{
-+public:
-+ static QString toStringFunction(const QVariant& value);
-+
-+ static QString joinStringListFunction(const QVariant& value);
-+
-+ static QString formatDate(const QVariant& value);
-+
-+ static QString formatDuration(const QVariant& value);
-+
-+ static QString formatBitRate(const QVariant& value);
-+
-+ static QString formatSampleRate(const QVariant& value);
-+
-+ static QString formatOrientationValue(const QVariant& value);
-+
-+};
-+
-+}
-+
-+#endif
-diff --git a/src/propertyinfo.cpp b/src/propertyinfo.cpp
-index 5439a58..56fc596 100644
---- a/src/propertyinfo.cpp
-+++ b/src/propertyinfo.cpp
-@@ -24,6 +24,8 @@
-
- #include <KLocalizedString>
-
-+#include "formatstrings_p.h"
-+
- using namespace KFileMetaData;
-
- class Q_DECL_HIDDEN PropertyInfo::Private
-@@ -34,6 +36,7 @@ public:
- QString displayName;
- QVariant::Type valueType;
- bool shouldBeIndexed;
-+ QString (*formatAsString)(const QVariant& value) = nullptr;
- };
-
- PropertyInfo::PropertyInfo(Property::Property property)
-@@ -41,6 +44,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
- {
- d->prop = property;
- d->shouldBeIndexed = true;
-+ d->formatAsString = &FormatStrings::toStringFunction;
-
- switch (property) {
- case Property::Album:
-@@ -53,12 +57,14 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("albumArtist");
- d->displayName = i18nc("@label", "Album Artist");
- d->valueType = QVariant::StringList;
-+ d->formatAsString = &FormatStrings::joinStringListFunction;
- break;
-
- case Property::Artist:
- d->name = QStringLiteral("artist");
- d->displayName = i18nc("@label", "Artist");
- d->valueType = QVariant::StringList;
-+ d->formatAsString = &FormatStrings::joinStringListFunction;
- break;
-
- case Property::AspectRatio:
-@@ -71,12 +77,14 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("author");
- d->displayName = i18nc("@label", "Author");
- d->valueType = QVariant::StringList;
-+ d->formatAsString = &FormatStrings::joinStringListFunction;
- break;
-
- case Property::BitRate:
- d->name = QStringLiteral("bitRate");
- d->displayName = i18nc("@label", "Bitrate");
- d->valueType = QVariant::Int;
-+ d->formatAsString = &FormatStrings::formatBitRate;
- break;
-
- case Property::Channels:
-@@ -117,12 +125,14 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("creationDate");
- d->displayName = i18nc("@label", "Creation Date");
- d->valueType = QVariant::String;
-+ d->formatAsString = &FormatStrings::formatDate;
- break;
-
- case Property::Duration:
- d->name = QStringLiteral("duration");
- d->displayName = i18nc("@label", "Duration");
- d->valueType = QVariant::Int;
-+ d->formatAsString = &FormatStrings::formatDuration;
- break;
-
- case Property::Empty:
-@@ -147,6 +157,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("genre");
- d->displayName = i18nc("@label music genre", "Genre");
- d->valueType = QVariant::StringList;
-+ d->formatAsString = &FormatStrings::joinStringListFunction;
- d->shouldBeIndexed = false;
- break;
-
-@@ -160,6 +171,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("imageDateTime");
- d->displayName = i18nc("@label EXIF", "Image Date Time");
- d->valueType = QVariant::DateTime;
-+ d->formatAsString = &FormatStrings::formatDate;
- break;
-
- case Property::ImageMake:
-@@ -180,12 +192,14 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("imageOrientation");
- d->displayName = i18nc("@label EXIF", "Image Orientation");
- d->valueType = QVariant::Int;
-+ d->formatAsString = &FormatStrings::formatOrientationValue;
- break;
-
- case Property::Keywords:
- d->name = QStringLiteral("keywords");
- d->displayName = i18nc("@label", "Keywords");
- d->valueType = QVariant::StringList;
-+ d->formatAsString = &FormatStrings::joinStringListFunction;
- d->shouldBeIndexed = false;
- break;
-
-@@ -206,6 +220,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("lyricist");
- d->displayName = i18nc("@label", "Lyricist");
- d->valueType = QVariant::StringList;
-+ d->formatAsString = &FormatStrings::joinStringListFunction;
- d->shouldBeIndexed = false;
- break;
-
-@@ -225,6 +240,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("photoDateTimeOriginal");
- d->displayName = i18nc("@label EXIF", "Photo Original Date Time");
- d->valueType = QVariant::DateTime;
-+ d->formatAsString = &FormatStrings::formatDate;
- break;
-
- case Property::PhotoExposureBiasValue:
-@@ -345,6 +361,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("sampleRate");
- d->displayName = i18nc("@label", "Sample Rate");
- d->valueType = QVariant::Int;
-+ d->formatAsString = &FormatStrings::formatSampleRate;
- break;
-
- case Property::Subject:
-@@ -382,6 +399,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("performer");
- d->displayName = i18nc("@label", "Performer");
- d->valueType = QVariant::StringList;
-+ d->formatAsString = &FormatStrings::joinStringListFunction;
- break;
-
- case Property::Ensemble:
-@@ -394,12 +412,14 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->name = QStringLiteral("arranger");
- d->displayName = i18nc("@label", "Arranger");
- d->valueType = QVariant::StringList;
-+ d->formatAsString = &FormatStrings::joinStringListFunction;
- break;
-
- case Property::Conductor:
- d->name = QStringLiteral("conductor");
- d->displayName = i18nc("@label", "Conductor");
- d->valueType = QVariant::StringList;
-+ d->formatAsString = &FormatStrings::joinStringListFunction;
- break;
-
- case Property::Compilation:
-@@ -503,6 +523,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->displayName = i18nc("@label translations last update", "Last Update");
- d->valueType = QVariant::String;
- d->shouldBeIndexed = false;
-+ d->formatAsString = &FormatStrings::formatDate;
- break;
-
- case Property::TranslationTemplateDate:
-@@ -510,6 +531,7 @@ PropertyInfo::PropertyInfo(Property::Property property)
- d->displayName = i18nc("@label date of template creation8", "Template Creation");
- d->valueType = QVariant::String;
- d->shouldBeIndexed = false;
-+ d->formatAsString = &FormatStrings::formatDate;
- break;
-
- case Property::OriginUrl:
-@@ -600,6 +622,11 @@ bool PropertyInfo::shouldBeIndexed() const
- return d->shouldBeIndexed;
- }
-
-+QString PropertyInfo::formatAsDisplayString(const QVariant &value) const
-+{
-+ return (d->formatAsString)(value);
-+}
-+
- PropertyInfo PropertyInfo::fromName(const QString& name)
- {
- static QHash<QString, Property::Property> propertyHash = {
-diff --git a/src/propertyinfo.h b/src/propertyinfo.h
-index c1767c4..3c426e8 100644
---- a/src/propertyinfo.h
-+++ b/src/propertyinfo.h
-@@ -85,6 +85,13 @@ public:
- */
- static PropertyInfo fromName(const QString& name);
-
-+ /**
-+ * Returns the value of the property as a QString with added formatting,
-+ * added units if needed, and translated enums.
-+ * @since 5.56
-+ */
-+ QString formatAsDisplayString(const QVariant& value) const;
-+
- private:
- class Private;
- Private* d;
---
-cgit v1.1
-
diff --git a/user/kfilemetadata/add-mimeutils.patch b/user/kfilemetadata/add-mimeutils.patch
deleted file mode 100644
index 5ea2cef37..000000000
--- a/user/kfilemetadata/add-mimeutils.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From 69c25514cf6a08ceaaacbc4092cc02ff40853228 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Mon, 25 Mar 2019 17:40:41 +0100
-Subject: Add helper function to determine mime type based on content and
- extension
-
-Summary:
-The QMimeDatabase::MatchDefault only falls back to content matching
-if the extension is not known. This fails for e.g. Matroska files, where
-the content allows to distinguish between audio and video files.
-
-CCBUG: 403902
-
-Reviewers: #baloo, #frameworks, astippich, ngraham, poboiko
-
-Reviewed By: #baloo, astippich, ngraham
-
-Subscribers: kde-frameworks-devel
-
-Tags: #frameworks, #baloo
-
-Differential Revision: https://phabricator.kde.org/D20045
----
- src/CMakeLists.txt | 1 +
- src/mimeutils.cpp | 50 +++++++++++++++++++++++++++++++++++++++++++++++++
- src/mimeutils.h | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 106 insertions(+)
- create mode 100644 src/mimeutils.cpp
- create mode 100644 src/mimeutils.h
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index c3cbe8c..fc4ce19 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -14,6 +14,7 @@ set(KF5FileMetaData_SRCS
- writercollection.cpp
- externalwriter.cpp
- formatstrings.cpp
-+ mimeutils.cpp
- )
- ecm_qt_declare_logging_category(KF5FileMetaData_SRCS HEADER kfilemetadata_debug.h IDENTIFIER KFILEMETADATA_LOG CATEGORY_NAME kf5.kfilemetadata)
-
-diff --git a/src/mimeutils.cpp b/src/mimeutils.cpp
-new file mode 100644
-index 0000000..7ea4dc8
---- /dev/null
-+++ b/src/mimeutils.cpp
-@@ -0,0 +1,50 @@
-+/*
-+ * This file is part of KFileMetaData
-+ * Copyright (C) 2019 Stefan Brüns <stefan.bruens@rwth-aachen.de>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#include "mimeutils.h"
-+
-+namespace KFileMetaData {
-+namespace MimeUtils {
-+
-+QMimeType strictMimeType(const QString& filePath, const QMimeDatabase& db)
-+{
-+ auto extensionMimes = db.mimeTypesForFileName(filePath);
-+ auto contentMime = db.mimeTypeForFile(filePath, QMimeDatabase::MatchContent);
-+
-+ if (extensionMimes.contains(contentMime)) {
-+ // content based mime type is one of the types for the file extension, e.g.:
-+ // *.ogg -> [ audio/ogg, audio/x-vorbis+ogg, ...]
-+ // content -> audio/x-vorbis+ogg
-+ return contentMime;
-+ }
-+
-+ for (auto mime : extensionMimes) {
-+ // check if the content is generic and the extension is more specific, e.g.:
-+ // *.mkv -> [ video/matroska ]
-+ // content -> application/matroska
-+ if (mime.inherits(contentMime.name())) {
-+ return mime;
-+ }
-+ }
-+ // content mime type does not match the extension, trust the content
-+ return contentMime;
-+}
-+
-+}} // namespace KFileMetaData::MimeUtils
-diff --git a/src/mimeutils.h b/src/mimeutils.h
-new file mode 100644
-index 0000000..f33e100
---- /dev/null
-+++ b/src/mimeutils.h
-@@ -0,0 +1,55 @@
-+/*
-+ * This file is part of KFileMetaData
-+ * Copyright (C) 2019 Stefan Brüns <stefan.bruens@rwth-aachen.de>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ *
-+ */
-+
-+#ifndef KFILEMETADATA_MIMEUTILS
-+#define KFILEMETADATA_MIMEUTILS
-+
-+#include <QMimeDatabase>
-+#include "kfilemetadata_export.h"
-+
-+namespace KFileMetaData
-+{
-+namespace MimeUtils
-+{
-+
-+/**
-+ * Returns the mimetype for a file
-+ *
-+ * The function uses both content and filename to determine the
-+ * \c QMimeType. In case the extension mimetype is more specific
-+ * than the content mimetype, and the first inherits the latter,
-+ * the extension mimetype is preferred.
-+ * If the extension does not match the content, the content has
-+ * higher priority.
-+ * The file must exist and be readable.
-+ *
-+ * @since 5.57
-+ *
-+ * \sa QMimeDatabase::mimeTypesForFileName
-+ * \sa QMimeType::inherits
-+ */
-+KFILEMETADATA_EXPORT
-+QMimeType strictMimeType(const QString& filePath, const QMimeDatabase& db);
-+
-+
-+} // namespace MimeUtils
-+} // namespace KFileMetaData
-+
-+#endif // KFILEMETADATA_MIMEUTILS
---
-cgit v1.1
-
-From b56d0cb5b90baeef2ada6ba0cbaea91506df1270 Mon Sep 17 00:00:00 2001
-From: Alexander Stippich <a.stippich@gmx.net>
-Date: Wed, 27 Mar 2019 20:41:49 +0100
-Subject: Generate header for new MimeUtils
-
----
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index fc4ce19..73bf7d0 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -75,6 +75,7 @@ ecm_generate_headers(KF5FileMetaData_CamelCase_HEADERS
- WriterPlugin
- WriterCollection
- EmbeddedImageData
-+ MimeUtils
-
- PREFIX kfilemetadata
- REQUIRED_HEADERS KF5FileMetaData_HEADERS
---
-cgit v1.1
-
diff --git a/user/kfilemetadata/test-mimetype.patch b/user/kfilemetadata/test-mimetype.patch
new file mode 100644
index 000000000..87b994920
--- /dev/null
+++ b/user/kfilemetadata/test-mimetype.patch
@@ -0,0 +1,13 @@
+Our version of shared-mime-info differs for the AppImage MIME type.
+
+--- kfilemetadata-5.65.0/autotests/extractorcoveragetest.cpp.old 2019-12-12 22:37:05.000000000 +0000
++++ kfilemetadata-5.65.0/autotests/extractorcoveragetest.cpp 2019-12-29 15:56:30.981925832 +0000
+@@ -48,7 +48,7 @@
+ m_knownFiles = {
+ { "test.aif", "audio/x-aifc"},
+ { "test.ape", "audio/x-ape"},
+- { "test.AppImage", "application/vnd.appimage"},
++ { "test.AppImage", "application/x-iso9660-appimage"},
+ { "test_apple_systemprofiler.spx", "application/xml"},
+ { "test.dot", "text/vnd.graphviz"},
+ { "test.eps", "image/x-eps"},
diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD
index d32ebcd9f..e3a68acbc 100644
--- a/user/kfind/APKBUILD
+++ b/user/kfind/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kfind
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Standalone search utility for KDE"
url="https://www.kde.org/applications/utilities/kfind/"
@@ -11,10 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdelibs4support-dev
karchive-dev kdoctools-dev kfilemetadata-dev kwidgetsaddons-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kfind-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kfind-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="36cc81a744e4bf81015e5611c6811034a1c236ce8603ed3c3fa2e0d8acf6cb38e86a0e92a55a726a96043805be91dc4e10e7c12be960a22b97f43928a089fa70 kfind-19.08.2.tar.xz"
+sha512sums="89410d3008beea2af2ddcc19eb4c891d17eeb0089b600cdfdf2fcc9894cec5da10aacdae7b7248dd2dac61e9fbb851d8a094d87cde35fbedc80347e251f05d07 kfind-19.12.1.tar.xz"
diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD
index f487c3871..07872c642 100644
--- a/user/kfloppy/APKBUILD
+++ b/user/kfloppy/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kfloppy
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Utility for formatting floppy diskettes"
url="https://utils.kde.org/projects/kfloppy/"
@@ -11,10 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev kcoreaddons-dev
kcompletion-dev kdoctools-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kfloppy-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kfloppy-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="3da10bcc6b47fd846e20f300b63a114e2742294f9031463bdbcd0d6bae0cef8469bfa477d0e04f3719c639ead81bc97c7617456d8b6b4753b0a508ef55ab2536 kfloppy-19.08.2.tar.xz"
+sha512sums="21fadc6e11a97e317d57c866de9e4bcae1d6f52f468178801c5e2d856894659ec9ecb121cb434f7f0d0e0b051cfc7e3cc48b62b65d1131138ac194864426bc87 kfloppy-19.12.1.tar.xz"
diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD
index 67d3db187..e29686cdd 100644
--- a/user/kfourinline/APKBUILD
+++ b/user/kfourinline/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kfourinline
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Two player board game based on Connect Four"
url="https://games.kde.org/game.php?game=kfourinline"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdnssd-dev kdoctools-dev
ki18n-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kfourinline-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kfourinline-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="8fc1e224d2f0b3daf9745172607aa75c6257043928dd2193576e161c019f0f9bba746fee45ce3822e364359eab6c8e0786a7739a0118341c38a50741d1e3629f kfourinline-19.08.2.tar.xz"
+sha512sums="a6b4025e3aa04ffe4f456cab4ca875041d0b71bbe5f41c997383e3b4e4032bebaeb29741f974c980fd17235336c48907b79f9f94f631b0ffe155b2c3886dd618 kfourinline-19.12.1.tar.xz"
diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD
index bd2d6cbb9..c7d0347d5 100644
--- a/user/kgamma5/APKBUILD
+++ b/user/kgamma5/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kgamma5
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Control monitor gamma from KDE 5"
url="https://www.KDE.org/"
@@ -11,7 +11,7 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev
kconfigwidgets-dev kdoctools-dev ki18n-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kgamma5-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/kgamma5-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -24,7 +24,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fdb359cb5b4b48df023657ffbd919421f45f938a7b430f20d0fad6b27d060b9aeaf886cab411d143b8698f041ffa273bc2a5ce4ab468e5e0b3d46bdbe7f6a65d kgamma5-5.12.8.tar.xz"
+sha512sums="f725805b5f82429f0690dc4b4afbfcd28047ebf1ffa6d0d7070f6f1228d8ce0c9ed8b3da725faab12e23396135aa67b97fa74d716fc704a119efd34fd1c9e2e3 kgamma5-5.17.90.tar.xz"
diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD
index 6af6620a6..9d43d0ddf 100644
--- a/user/kgeography/APKBUILD
+++ b/user/kgeography/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kgeography
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Geography learning tool and trainer"
url="https://www.kde.org/applications/education/kgeography/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kxmlgui-dev kcrash-dev
kwidgetsaddons-dev kcoreaddons-dev kconfigwidgets-dev ki18n-dev
kitemviews-dev kiconthemes-dev kdoctools-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kgeography-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kgeography-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="7eba48bf95972a4733ece313f3553af8e76bb3ff2de29c0154ee98e75e1561191f2b1d0d5c53ce7c7cb8ed11f74cedb28fb1c68a6c25aaf96ac8324dec5c9ca0 kgeography-19.08.2.tar.xz"
+sha512sums="068206c3bc2fb498e8470019b376074c1b19bf7ca1326fd1230f7cadf426800729ed5b1e67395ecad363d7d9996d1498ab013f9b2070d614419688cece2ef1fb kgeography-19.12.1.tar.xz"
diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD
index 18ac5f9c8..2f357fd5d 100644
--- a/user/kget/APKBUILD
+++ b/user/kget/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kget
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Versatile download manager"
url="https://www.kde.org/applications/internet/kget/"
@@ -15,9 +15,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev
solid-dev ktextwidgets-dev kwallet-dev kwidgetsaddons-dev kxmlgui-dev
kwindowsystem-dev gpgme-dev qca-dev boost-dev libktorrent-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kget-$pkgver.tar.xz
- kf5.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/kget-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -30,7 +28,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -42,5 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="aec147c2f4e7927b85e660b84d082de4a2ef9d3345cc9e8246da80f46f9eca5a098afc12e3d5c8c5fa14db81decd6087d87002bdce14fc393964bdf3d9d1ea0d kget-19.08.2.tar.xz
-d66fb3988aa26c2cb9e243ef446679e715cb3bd10ee8cb1b0b39a68d424ab9fca71428fa0c6004a1671093201e71e371331b069d6bb0325d0e7b936a9b95a73c kf5.patch"
+sha512sums="3a0e5a26a7726ac1b07a181e3aecd46bd9489d8230419e10b3104bf4d70031b9936f7589f6b60753b19634fdb096318ee71889b6bc3a031ace919d1b11fc20ed kget-19.12.1.tar.xz"
diff --git a/user/kget/kf5.patch b/user/kget/kf5.patch
deleted file mode 100644
index 0630603d3..000000000
--- a/user/kget/kf5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kget-19.08.0/CMakeLists.txt.old 2019-08-09 00:42:54.000000000 +0000
-+++ kget-19.08.0/CMakeLists.txt 2019-08-15 15:24:02.319818769 +0000
-@@ -8,7 +8,7 @@
-
- project(kget VERSION ${KDE_APPLICATIONS_VERSION})
-
--set(KF5_VERSION "5.55.0")
-+set(KF5_VERSION "5.54.0")
- set(REQUIRED_QT_VERSION "5.7.0")
-
- find_package(ECM ${KF5_VERSION} REQUIRED NO_MODULE)
diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD
index 87f3efa32..cdca5f9b5 100644
--- a/user/kglobalaccel/APKBUILD
+++ b/user/kglobalaccel/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kglobalaccel
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for implementing global shortcuts/accelerators"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="24f9c8658e066f18d2340cc22937791dcb391b11560e6999bf47a9a78a0382c606a9c14cadfbf75e1dcf1c099456135506c2a5f56a9d634a7e129d2aa1d57226 kglobalaccel-5.65.0.tar.xz"
+sha512sums="49f876984162d6d9d008f8cbc9c08f4d8a8b0a1707d206d0f556c8356730bf6eafa4b000af7d258f39162a1b13a3170b720142de3a39f45983352c17e39b9953 kglobalaccel-5.66.0.tar.xz"
diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD
index e5d23e1b2..49c93c1d1 100644
--- a/user/kgoldrunner/APKBUILD
+++ b/user/kgoldrunner/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kgoldrunner
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around"
url="https://games.kde.org/game.php?game=kgoldrunner"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kdbusaddons-dev kdoctools-dev ki18n-dev kio-dev kxmlgui-dev phonon-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kgoldrunner-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kgoldrunner-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="1d6d875d2d660dbac12daa2e04111a590bf3cd5e5e4d9cc14ee433e7d1ddec0d4186560f765ae783423afee0b346a1d403ac8fc78326d5a44127bddca500c0dd kgoldrunner-19.08.2.tar.xz"
+sha512sums="514d4f015660f000b46aeb19f2f9a3c3315ba78c0603f9022afeb94af8f4e233b235c5c64c12082aadad9af24ba1d4410433e74b29b375380e7bfb3bfb56f405 kgoldrunner-19.12.1.tar.xz"
diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD
index 82fa032b7..2feda9184 100644
--- a/user/kgpg/APKBUILD
+++ b/user/kgpg/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kgpg
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Simple interface for GnuPG, a powerful encryption utility"
url="https://utils.kde.org/projects/kgpg/"
@@ -15,10 +15,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kcodecs-dev
ktextwidgets-dev kxmlgui-dev kwidgetsaddons-dev kwindowsystem-dev
akonadi-contacts-dev kcontacts-dev gpgme-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kgpg-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kgpg-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,18 +28,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="c6dd268fc3e007d4e4fb93317b64606e2b87299352a460f9c2889f61d9828dda93c6c2767e4a1b787fb62fd3b0288eccb466f0e08fb89af6fae845d2bff38654 kgpg-19.08.2.tar.xz"
+sha512sums="5c5e191bbdbfbf3c4c65334e8c532953049f91eec5df16978fac89d0be6d00432f9e0a14acc85a314aab23da5f647bacae78f38e50be6ef07ed6621d26bf01e7 kgpg-19.12.1.tar.xz"
diff --git a/user/kgraphviewer/APKBUILD b/user/kgraphviewer/APKBUILD
index 58b1dc410..db2f22ca1 100644
--- a/user/kgraphviewer/APKBUILD
+++ b/user/kgraphviewer/APKBUILD
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/kgraphviewer/$pkgver/kgraphviewer-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,17 +25,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD
index 57e00d481..479cd279b 100644
--- a/user/kguiaddons/APKBUILD
+++ b/user/kguiaddons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kguiaddons
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for creating high-level user interfaces"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="dc184f03100093671f2d6df20f89c6a3f7a3c382b56862e2a65241d853ddfe532c2344e39c72fa443b3df8f61a1af4da3e9d09a57f674a8d217f2b513c498f4d kguiaddons-5.65.0.tar.xz"
+sha512sums="d5fabe9069e404c91172e9bb73d570abc325c32b82d3265e03822ed89c43025337e371e3970248a2021401f90c406491a2dd4f2a8aff1fbc852aa052a5e8fa9e kguiaddons-5.66.0.tar.xz"
diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD
index 1e5023f9c..439d47840 100644
--- a/user/khangman/APKBUILD
+++ b/user/khangman/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=khangman
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Hangman word game"
url="https://www.kde.org/applications/education/khangman/"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kcoreaddons-dev kconfigwidgets-dev kdeclarative-dev kdoctools-dev
knewstuff-dev knotifications-dev kxmlgui-dev libkeduvocdocument-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/khangman-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/khangman-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="03aa4e4de1042c433205a51f187f115b3648580e47337ff84cba6de2dffbec0fdb031231b8195330a0b572853b775be78b5cf354ce45a07df70051c7b589de41 khangman-19.08.2.tar.xz"
+sha512sums="f83b2d7d0f402a6971b0790313dd88e682ac76a11e55d01048f4834228c6131ad62aabcf0e06a7b5f9ed9fd9c7f7e8acfeb5b1a0fd262655ea88f02221760235 khangman-19.12.1.tar.xz"
diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD
index 8d84d1afb..598eb2f5e 100644
--- a/user/khelpcenter/APKBUILD
+++ b/user/khelpcenter/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=khelpcenter
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Graphical documentation viewer"
url="https://www.kde.org/applications/system/khelpcenter/"
@@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev
xapian-core-dev libxml2-dev"
subpackages="$pkgname-doc $pkgname-lang"
install_if="plasma-desktop docs"
-source="https://download.kde.org/stable/applications/$pkgver/src/khelpcenter-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/khelpcenter-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -27,7 +27,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="902276720c1b7366fab2cd88091c0baa06a66814a2bcc0360c87a3a2137d65a3482348c351dcc729bdcb674d92351791c9a46bcf36962c52bd190ee1749799f9 khelpcenter-19.08.2.tar.xz"
+sha512sums="fdeadfc81ed406d0d99da483321b3557866ee117a520d43bc2bd67fbcb60fdb7827835d8bf76fcc20c1b547196b8860281d464b40cbf7b290c78d52a613728b3 khelpcenter-19.12.1.tar.xz"
diff --git a/user/khmeros-fonts/APKBUILD b/user/khmeros-fonts/APKBUILD
index 4eca9227a..2b2b992aa 100644
--- a/user/khmeros-fonts/APKBUILD
+++ b/user/khmeros-fonts/APKBUILD
@@ -15,8 +15,7 @@ source="https://downloads.sourceforge.net/khmer/All_KhmerOS_$pkgver.zip"
builddir="$srcdir/All_KhmerOS_$pkgver"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
}
sha512sums="5fded88a9149d0fd59a377f08d9e1ea63ecffede58cde42e28504a48b12b35dec699b1ea0e0bbb95465c281d5b19ddfbe808a3c4ef40cd46295aaa069bd9127f All_KhmerOS_5.0.zip"
diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD
index 35bba4923..d026588ce 100644
--- a/user/kholidays/APKBUILD
+++ b/user/kholidays/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kholidays
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="List of national holidays for many countries"
url="https://www.kde.org/"
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b8d45522052a5c48bd9219041d394fabe1f1a3ba29c3ccc649c73f01e40c85b3746f47f083bb1db0242bf2e59f3725ce86cb046cc3e99f56e638e9f990af04f5 kholidays-5.65.0.tar.xz"
+sha512sums="67599e550da9391cab48925e5d12f8c526e9fc6d9739dc6e4e6db8a5aba91b1c48f2b5a391a4d3b3194abd0c64f7caf27414e8795430cc147a07904a7beb7e31 kholidays-5.66.0.tar.xz"
diff --git a/user/khotkeys/APKBUILD b/user/khotkeys/APKBUILD
index 0d53161a8..2c95b4184 100644
--- a/user/khotkeys/APKBUILD
+++ b/user/khotkeys/APKBUILD
@@ -1,21 +1,18 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=khotkeys
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Hot key mapping for KDE Plasma 5"
url="https://www.KDE.org/"
arch="all"
license="LGPL-2.0+"
depends=""
-makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev libx11-dev
kdbusaddons-dev kdelibs4support-dev kglobalaccel-dev ki18n-dev kio-dev
- kxmlgui-dev libice-dev libx11-dev plasma-framework-dev
- plasma-workspace-dev"
+ kxmlgui-dev libice-dev libkworkspace-dev plasma-framework-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/khotkeys-$pkgver.tar.xz
- cmake-fixes.patch
- "
+source="https://download.kde.org/unstable/plasma/$pkgver/khotkeys-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -28,7 +25,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -40,5 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="df60c9d9be901cfeb6cc41e006015b98f373493362c10cf54bc479eb60a3d7ef33aca557497cdae32e351fd413a615620bbc04d53b42bd7ff7de458c36f8c170 khotkeys-5.12.8.tar.xz
-1c2558d8b142bc1de236e35b8f55a825f55d4c38c2b5cb2fbf02dcae1128325f45b15246f9c9d874d1afd2a4483df8501877121c6052b6d067892c5fbeca1dc5 cmake-fixes.patch"
+sha512sums="2a31751706a68c3481291a7e925225d6310fdc2838cc841ce31f0f15a2f38d52f91d49489aec2e3796a87ba27036959080bb9d099e12590c7266e72730404558 khotkeys-5.17.90.tar.xz"
diff --git a/user/khotkeys/cmake-fixes.patch b/user/khotkeys/cmake-fixes.patch
deleted file mode 100644
index 6f6bfcc5d..000000000
--- a/user/khotkeys/cmake-fixes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From ae5743738245437332b1bb670b9a3f8c429211e2 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 10 Feb 2019 20:26:25 +0100
-Subject: Harmonize usage of HAVE_X11, using #if and #cmakedefine01.
-
----
- CMakeLists.txt | 1 +
- config-X11.h.cmake | 2 +-
- libkhotkeysprivate/conditions/existing_window_condition.h | 1 -
- 3 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2a96e3b..0955f4e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,6 +37,7 @@ find_package(LibKWorkspace CONFIG REQUIRED)
- if(X11_FOUND)
- find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras )
- set(HAVE_XTEST ${X11_XTest_FOUND})
-+ set(HAVE_X11 1)
- endif()
-
- configure_file(config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
-diff --git a/config-X11.h.cmake b/config-X11.h.cmake
-index 60286dd..ae8978a 100644
---- a/config-X11.h.cmake
-+++ b/config-X11.h.cmake
-@@ -41,4 +41,4 @@
- #cmakedefine HAS_RANDR_1_3 1
-
- /* Define if you have X11 at all */
--#define HAVE_X11 ${X11_FOUND}
-\ No newline at end of file
-+#cmakedefine01 HAVE_X11
-diff --git a/libkhotkeysprivate/conditions/existing_window_condition.h b/libkhotkeysprivate/conditions/existing_window_condition.h
-index 92815eb..b6a4278 100644
---- a/libkhotkeysprivate/conditions/existing_window_condition.h
-+++ b/libkhotkeysprivate/conditions/existing_window_condition.h
-@@ -26,7 +26,6 @@
-
- #include <KConfig> // Needed because of some Qt Status redefinitions
- #include <KConfigGroup> // Needed because of some Qt Status redefinitions
--#include <config-kwindowsystem.h> // Needed for HAVE_X11
- #include <config-X11.h>
- #include <kdemacros.h>
-
---
-cgit v1.1
-
diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD
index ede27308c..723d35b45 100644
--- a/user/khtml/APKBUILD
+++ b/user/khtml/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=khtml
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="The KDE HTML library, ancestor of WebKit"
url="https://konqueror.org/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="8ec0bbf79e2bddadd67eecb8d2e310b4a4ea1d68413a27ab8139f42faee6b14a488e84842eee21d1be8083d2c3b66d96b84ff48a6f06328a45c909fbabb98e10 khtml-5.65.0.tar.xz"
+sha512sums="15171d70fe86a688203b514607a3368f6af05f5021d9139d59f1b8d3012084bf7d269a1481535983df2a13a9a02033b9bd02c17b983b76dd9939db0163fecdbb khtml-5.66.0.tar.xz"
diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD
index f9e750820..b1962fb2b 100644
--- a/user/ki18n/APKBUILD
+++ b/user/ki18n/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ki18n
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for creating multi-lingual software"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5d18b42d9026d49543ac58728870d9b1367c6f2d5bec2d5edc88844fc6f2b3077d164d617c5ff3166d663e920886c1742bc60374d3fb6bacae6ab2457ebce323 ki18n-5.65.0.tar.xz"
+sha512sums="00d310f84af139946864cb17cd85e80bc3ef07d9ede2c92ca56a66b4f31ad79071acf60caad7e8ed758954d396984e1e3f12b5dbf336bb8be2be3349fbfa9245 ki18n-5.66.0.tar.xz"
diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD
index 38b776a55..baa8f0d89 100644
--- a/user/kiconthemes/APKBUILD
+++ b/user/kiconthemes/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kiconthemes
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for icon theming"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6d40cd396eaf3d0e297b3d55c3b019f33e030f1ca4f5f0743717d1134a4ea3cb23edaf63cfadeb96de0ecadbade37f5961f2143548764cfdbaf53eeb25b85246 kiconthemes-5.65.0.tar.xz"
+sha512sums="d220b7c33b42ba08f3d3e2aa5b8b7e2a81e64172fd99b2213a13116f52148f9793b0234466758907ef52bf2287f3f370a59a2c30d6bb9cda7b46f8dbe7e14a8f kiconthemes-5.66.0.tar.xz"
diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD
index 30ee87581..aa9500baf 100644
--- a/user/kidletime/APKBUILD
+++ b/user/kidletime/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kidletime
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for determining a user's idle time"
url="https://api.kde.org/frameworks/kidletime/html/index.html"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b3a31a3813571ab415020e7653b04768e99fe2347dd9b2eabaadba2054015e5b157f95a89857d26911133e50a643d2ba656e22f72ca1fce918bcbd9faec10aa1 kidletime-5.65.0.tar.xz"
+sha512sums="9020dea8f401a2f4331de6495122ab8fae3c52c5b91c3558d0059c0b0c05c456c2930be8cf35c97da0673a73c9e165b0902c5a9c2da91280740b163ce1c69a5a kidletime-5.66.0.tar.xz"
diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD
index 7af219b7c..d744cb85c 100644
--- a/user/kig/APKBUILD
+++ b/user/kig/APKBUILD
@@ -1,10 +1,10 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kig
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Interactive geometry learning and exploration tool"
-url=" https://www.kde.org/applications/education/kig/"
+url="https://www.kde.org/applications/education/kig/"
arch="all"
license="GPL-2.0+"
depends=""
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kparts-dev
qt5-qtxmlpatterns-dev ki18n-dev ktexteditor-dev kiconthemes-dev
kconfigwidgets-dev karchive-dev kxmlgui-dev kcrash-dev kcoreaddons-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kig-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kig-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="643fa3c0a737420ce269f1c191cba75b6f15576c72b43fdabe74d6a2196eeb099071bfa94cf61174e7e41945cd8785c8198aba36cd7878ec9b5b82b3cfcc80f1 kig-19.08.2.tar.xz"
+sha512sums="f5c681c1f491f2b6e0d34376b12eb75ed85b7f2d159fba3bf26a3e2b2fee15919e5bbe426e0d4021581a71899853c19a65db4f56263874a2a710b53617260784 kig-19.12.1.tar.xz"
diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD
index b92e9c234..5edef8613 100644
--- a/user/kigo/APKBUILD
+++ b/user/kigo/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kigo
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Go or Igo game for KDE"
url="https://www.kde.org/applications/games/kigo/"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kconfigwidgets-dev ktextwidgets-dev kxmlgui-dev kio-dev knewstuff-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kigo-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kigo-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="dd7eab7f721646e6324637c19ef504491a34fbda110195c96e5bb7f2c6e357628d695b208d00527abc7d32889e2b84233ff1f586dc657b2dd6c522735c442051 kigo-19.08.2.tar.xz"
+sha512sums="15075a8f9cc2fca4dc972939e2a03e6991d4d3da9b58f05f0f68b81533c1354d52e86b21661f12e5b554a630cb14dd6b63b544ed24863263192a479f1d26125e kigo-19.12.1.tar.xz"
diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD
index f60c0ade6..af56f0ece 100644
--- a/user/killbots/APKBUILD
+++ b/user/killbots/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=killbots
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Simple game of evading killer robots"
url="https://www.kde.org/applications/games/killbots/"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev
kxmlgui-dev kcompletion-dev kdoctools-dev kdbusaddons-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/killbots-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/killbots-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="e2891b1fa00f57bd2fbc2308dd4df7625e43ecbf089644bebf47923c5c8c1cf2aa57ce4b3f584371b4c5f22953f0ba4fb331277a5d9ef2a7df051f7d3f22bc11 killbots-19.08.2.tar.xz"
+sha512sums="e5f2388220bfb0f40ed74f108cac896ef7b0a8592ae745bbdbd4d3ca382337735cbb2ab2da936949a2e151efe5bafb76906eb784cd7dce84232489a6fc3c2dcf killbots-19.12.1.tar.xz"
diff --git a/user/kinfocenter/APKBUILD b/user/kinfocenter/APKBUILD
index b757698dd..d000f5ed1 100644
--- a/user/kinfocenter/APKBUILD
+++ b/user/kinfocenter/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kinfocenter
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Information about the running computer"
url="https://www.kde.org/applications/system/kinfocenter/"
@@ -12,9 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev
kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kio-dev
kdoctools-dev kiconthemes-dev kcmutils-dev kdelibs4support-dev glu-dev
kservice-dev solid-dev kwidgetsaddons-dev kxmlgui-dev kdeclarative-dev
- kpackage-dev libraw1394-dev pciutils-dev kwayland-dev"
+ kpackage-dev libraw1394-dev pciutils-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kinfocenter-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/kinfocenter-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -27,7 +27,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3c473afa486b80a679d6f78c8000b115b65465b7fc5a6c95af35899f6cb50971422203fc28149b534ad6107e1a78b646b96e60fa5be0182fa5cd0b92a2c6da71 kinfocenter-5.12.8.tar.xz"
+sha512sums="f20934e3c043992c9e90354ba9656d005e20c1105d56fc5bdaa629af2339b351f1274cc26b059f5b7ae1bb03d1e377ed0263d5d9dc31689ad2159552b8c7a9cd kinfocenter-5.17.90.tar.xz"
diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD
index a26f077ca..cb2268f1d 100644
--- a/user/kinit/APKBUILD
+++ b/user/kinit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kinit
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="KDE initialisation routines"
url="https://www.kde.org/"
@@ -34,4 +34,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f88f81cd6312a37e8faada705d811e3a40d4ae859ad46b00a2830d92b3db4fe3ccc0abac0683d9971a2709bf08e0b37343588f1f4f43bb47a12e57eb031fa68a kinit-5.65.0.tar.xz"
+sha512sums="a8cf86e53cdfb4c361b492f3a8dfe05cea0f1fb5e798e6a043912e9ab229088e0656f60ea9eb92d9e44a3fd882cc0eab93994aa1ffa1646d7ae18c6729d0438a kinit-5.66.0.tar.xz"
diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD
index c95ecc194..c3c9f08f8 100644
--- a/user/kio-extras/APKBUILD
+++ b/user/kio-extras/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kio-extras
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KIO plugins for various data tasks"
url="https://www.kde.org/"
@@ -13,13 +13,15 @@ depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev
kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev
kiconthemes-dev ki18n-dev solid-dev kbookmarks-dev kguiaddons-dev
kdnssd-dev kpty-dev kactivities-dev phonon-dev libtirpc-dev
- taglib-dev libmtp-dev gperf khtml-dev syntax-highlighting-dev"
+ taglib-dev libmtp-dev gperf khtml-dev syntax-highlighting-dev
+ kactivities-stats-dev"
makedepends="$depends_dev cmake extra-cmake-modules shared-mime-info"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kio-extras-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kio-extras-$pkgver.tar.xz
+ D17205-nfs-tirpc.patch
+ "
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,20 +30,19 @@ build() {
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
- -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS -I/usr/include/tirpc" \
+ -DCMAKE_C_FLAGS="$CFLAGS -I/usr/include/tirpc" \
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="a7a7e9c0ef5e9539b810484027ef7febf81487ea258d5e2e857b2cfa1d59ba1fed52245a0f18fabf9c79c67b3ec3825e32ee1415b818a0ef942067d9516f39fc kio-extras-19.08.2.tar.xz"
+sha512sums="1a4bdcd63898b5780aff648abccb596225379b5130133b5bd285a1095198d62e4af262c4be69ca8e5351a3ad4092321ca0834d55745a25d810342cbb938a5567 kio-extras-19.12.1.tar.xz
+dbc58b5d8a7783d5697a24fe6232f0aa3d6222cf15eeb8ce94f0ea99c81dce067ab1ef20261f77107cc9f75ecae506458a828a5ad3437b589ca00b93ad52b1e2 D17205-nfs-tirpc.patch"
diff --git a/user/kio-extras/D17205-nfs-tirpc.patch b/user/kio-extras/D17205-nfs-tirpc.patch
new file mode 100644
index 000000000..b12c0a2c5
--- /dev/null
+++ b/user/kio-extras/D17205-nfs-tirpc.patch
@@ -0,0 +1,143 @@
+Subject: Build kio_nfs against standalone libtirpc
+From: asturmlechner
+Date: Wed 28 Nov 07:41:00 UTC 2018
+
+Summary
+
+Since glibc-2.26, cmake skipped over nfs when standalone tirpc
+was installed in tirpc subdir (as done by Debian, Fedora, Arch, Gentoo...)
+
+Use FindTIRPC and make kio_nfs optional that way
+FindTIRPC taken from https://phabricator.kde.org/D12761
+
+Test Plan
+
+Built with libtirpc successfully.
+
+https://phabricator.kde.org/D17205
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -132,6 +132,11 @@
+ set_package_properties(KF5KHtml PROPERTIES TYPE OPTIONAL
+ PURPOSE "Needed to build the man kioslave"
+ )
++
++ find_package(TIRPC)
++ set_package_properties(TIRPC PROPERTIES TYPE OPTIONAL
++ PURPOSE "Needed to build the NFS kioslave"
++ )
+ else()
+ # FIXME: on windows we ignore support until trash gets integrated
+ endif()
+@@ -174,9 +179,7 @@
+ if(Gperf_FOUND AND KF5KHtml_FOUND)
+ add_subdirectory( man )
+ endif()
+- check_include_files(rpc/rpc.h HAVE_RPC_RPC_H)
+- add_feature_info("NFS kioslave" HAVE_RPC_RPC_H "The RPC library is needed to build the NFS kioslave")
+- if(HAVE_RPC_RPC_H)
++ if(TIRPC_FOUND)
+ add_subdirectory( nfs )
+ endif()
+ endif()
+diff --git a/cmake/FindTIRPC.cmake b/cmake/FindTIRPC.cmake
+new file mode 100644
+--- /dev/null
++++ b/cmake/FindTIRPC.cmake
+@@ -0,0 +1,60 @@
++# - Try to find TI-RPC
++#
++# The following variables will be available once found :
++#
++# TIRPC_INCLUDE_DIRS - The TI-RPC headers location
++# TIRPC_LIBRARIES - Link these to use TI-RPC
++# TIRPC_VERSION - The TIRPC version
++#
++#=============================================================================
++# Copyright (c) 2017 Christophe Giboudeaux <christophe@krop.fr>
++#
++#
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++#
++# 1. Redistributions of source code must retain the copyright
++# notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the copyright
++# notice, this list of conditions and the following disclaimer in the
++# documentation and/or other materials provided with the distribution.
++# 3. The name of the author may not be used to endorse or promote products
++# derived from this software without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++#=============================================================================
++
++find_package(PkgConfig QUIET)
++pkg_check_modules(PC_TIRPC libtirpc)
++
++find_path(TIRPC_INCLUDE_DIRS
++ NAMES netconfig.h
++ PATH_SUFFIXES tirpc
++ HINTS ${PC_TIRPC_INCLUDE_DIRS}
++)
++
++find_library(TIRPC_LIBRARIES
++ NAMES tirpc
++ HINTS ${PC_TIRPC_LIBRARY_DIRS}
++)
++
++set(TIRPC_VERSION ${PC_TIRPC_VERSION})
++
++include(FindPackageHandleStandardArgs)
++
++find_package_handle_standard_args(TIRPC
++ REQUIRED_VARS TIRPC_LIBRARIES TIRPC_INCLUDE_DIRS
++ VERSION_VAR TIRPC_VERSION
++)
++
++mark_as_advanced(TIRPC_INCLUDE_DIRS TIRPC_LIBRARIES)
+diff --git a/nfs/CMakeLists.txt b/nfs/CMakeLists.txt
+--- a/nfs/CMakeLists.txt
++++ b/nfs/CMakeLists.txt
+@@ -1,10 +1,12 @@
+ ## Check for XDR functions
+-include(CheckFunctionExists)
++include(CheckSymbolExists)
+
+-CHECK_FUNCTION_EXISTS(xdr_u_int64_t HAVE_XDR_U_INT64_T)
+-CHECK_FUNCTION_EXISTS(xdr_uint64_t HAVE_XDR_UINT64_T)
+-CHECK_FUNCTION_EXISTS(xdr_u_hyper HAVE_XDR_U_HYPER)
+-CHECK_FUNCTION_EXISTS(xdr_u_longlong_t HAVE_XDR_U_LONGLONG_T)
++set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${TIRPC_LIBRARIES})
++set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${TIRPC_INCLUDE_DIRS})
++check_symbol_exists(xdr_u_int64_t "rpc/xdr.h" HAVE_XDR_U_INT64_T)
++check_symbol_exists(xdr_uint64_t "rpc/xdr.h" HAVE_XDR_UINT64_T)
++check_symbol_exists(xdr_u_hyper "rpc/xdr.h" HAVE_XDR_U_HYPER)
++check_symbol_exists(xdr_u_longlong_t "rpc/xdr.h" HAVE_XDR_U_LONGLONG_T)
+
+ if (NOT HAVE_XDR_U_INT64_T AND NOT HAVE_XDR_UINT64_T AND NOT HAVE_XDR_U_HYPER AND NOT HAVE_XDR_U_LONGLONG_T)
+ message(FATAL_ERROR "Could not find 64-bit XDR datatype functions!")
+@@ -24,9 +26,10 @@
+ endif (HAVE_XDR_U_LONGLONG_T)
+
+ add_definitions(-DTRANSLATION_DOMAIN=\"kio5_nfs\")
++include_directories(${TIRPC_INCLUDE_DIRS})
+
+ add_library(kio_nfs MODULE kio_nfs.cpp nfsv2.cpp nfsv3.cpp rpc_nfs3_prot_xdr.c rpc_nfs2_prot_xdr.c)
+-target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network)
++target_link_libraries(kio_nfs KF5::KIOCore KF5::I18n Qt5::Network ${TIRPC_LIBRARIES})
+ set_target_properties(kio_nfs PROPERTIES OUTPUT_NAME "nfs")
+
+ install(TARGETS kio_nfs DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kio)
+
diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD
index a88a93d31..f1d393761 100644
--- a/user/kio/APKBUILD
+++ b/user/kio/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kio
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for data and file management"
url="https://www.kde.org/"
@@ -43,5 +43,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e8e758595c0ab7457798d69b0a4adc5749169122c3a82fee6083ecc1cac1bf75e343dc74e5b2e34c633d2d9d2b9d2a2705f1c3e86ce8e6c26a7ab589bd76116a kio-5.65.0.tar.xz
+sha512sums="7be872029fb93e76663291e868e829603f14fadfb0264c2c7dff351eba64a8574776a595ae57ca920a394e56940b220fc1065c01d0d88858fe3b7a3e5757ce87 kio-5.66.0.tar.xz
a21e700948317e460f273276aee36359b5bba8a69da1e43714169002ca4bf4538f1cc3663e823be30a0fa838d61103769afb7445caa6e8ceba29830f8532b6db strcpy-ppc.patch"
diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD
index ef697ad43..6f49a6cdd 100644
--- a/user/kirigami2/APKBUILD
+++ b/user/kirigami2/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kirigami2
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for rapidly designing usable interfaces"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="3ca024c0b8a875f566a209d018a528209e8c6e8f46fd079e4e08bd52dc6ce8a448c06d8fe36da820d306bec18ab61b28990076241c7b5b843fda8f80af70d6f8 kirigami2-5.65.0.tar.xz"
+sha512sums="9ffebb47c026547dd4471cd7e56d4c236a60636543158994349d8e48ebfa451f7153c447bbf467108304ade1768894e14bb0afe3d166906874ae48ee3a5378ed kirigami2-5.66.0.tar.xz"
diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD
index 1974b3aaa..0673ac241 100644
--- a/user/kiriki/APKBUILD
+++ b/user/kiriki/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kiriki
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Yahtzee-like dice game for one or more players"
url="https://games.kde.org/game.php?game=kiriki"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev
kconfig-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev
kconfigwidgets-dev kiconthemes-dev kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kiriki-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kiriki-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="042645213bf8fa3e32ea7dca5fbdb3a54663a202ae70131a3f2f75702bdf2a80b09ca1449ac9ac8e4f9200158f465819fc81a4c9d9e1006cda50ac548c28fd63 kiriki-19.08.2.tar.xz"
+sha512sums="4bf2745be4a704a8eae62733add39606abf4e7502360511e5e307daf3c2c193e52beee3b8f6751f6b1f9f9cd83efa423a6b73c29cad0ca1ea4ee10e2f3337b1f kiriki-19.12.1.tar.xz"
diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD
index 2a35b717e..8f846aa16 100644
--- a/user/kitemmodels/APKBUILD
+++ b/user/kitemmodels/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kitemmodels
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for sorting and searching objects"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="981d8f2301f0a5314f504aff983f8eac8d2d299ec775586151097f1f8d2e6ed809e5a72947b75fa5d20cdbf081ddef5c79d3aee1b993338a74eaf8fe69977b3b kitemmodels-5.65.0.tar.xz"
+sha512sums="2eebf85b69ac6090203fda419bb98052852f5a9feda72833a993374398e4d9fe6ac5520455630dae1e8c542515d44ad8d2163987591fc9bb9dd67f79eda8a5f5 kitemmodels-5.66.0.tar.xz"
diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD
index 096e89bcb..ec4d44f7d 100644
--- a/user/kitemviews/APKBUILD
+++ b/user/kitemviews/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kitemviews
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for displaying collections of items"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="aafcb832a105fd51b2ea768155fb6aee197b5e11cdfc900c1ee3086839896d208eaed599d4b40b0b7245e88dc233a68b69798bad6af3f883797a6e7a95449104 kitemviews-5.65.0.tar.xz"
+sha512sums="e9aaa815dc687ac7287a974e66ef8089524a46ed23937bfad19783e9cc563a0d71c64eac4ee6b2c2460ef624f551d475a86fba6806cca5d03f77cf4594c239b8 kitemviews-5.66.0.tar.xz"
diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD
index c091eb686..5b6dfddf9 100644
--- a/user/kiten/APKBUILD
+++ b/user/kiten/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kiten
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Japanese reference and study tool"
url="https://www.kde.org/applications/education/kiten/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev
kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev ki18n-dev
kdoctools-dev khtml-dev knotifications-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kiten-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kiten-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="5b897cba7a38e6d18241e1f7e4670500c0f9cd696ebcd8fc584e5456caa168c735011e7de5856e069978d0aecb8c841a02b32a9377e9f4c9f9c4d794a017dd04 kiten-19.08.2.tar.xz"
+sha512sums="8307b6b67e20c1ad8ecffd1a3bcd5b941a16fb693fe46be1c384b0f163be36b3a75c3e96ac06af9e247df0b2572767077347da95a6a0558c60b5e145ca29870f kiten-19.12.1.tar.xz"
diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD
index e68485cfe..3a969477c 100644
--- a/user/kjobwidgets/APKBUILD
+++ b/user/kjobwidgets/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kjobwidgets
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework providing widgets that show job progress"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="27d4275dde16a270fb77410efcbd519ce564de668a8eb741fc5de6acfd5791df6f92d9216d265c610e5f899237074bf777e8544de4d8658de8a343e77ec1ade4 kjobwidgets-5.65.0.tar.xz"
+sha512sums="c4f83c2f362b67a32e930f87dea8f71b8340b8847231688644007c55783380b9f6c22861965f42fdf4b0a423e9ad77c3f9b6af770db1826dca9e2679149aee11 kjobwidgets-5.66.0.tar.xz"
diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD
index 948f52089..367af5c10 100644
--- a/user/kjs/APKBUILD
+++ b/user/kjs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kjs
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Independent, free JavaScript engine"
url="https://www.kde.org/"
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="f222364a0ecfff9440a0714a1d3e52116d1e75148f7dab08a9c7c27dd44aac2aa4a36be77194100ef60dd31b5d16c6ef430670a5988a41c3091062d94919f413 kjs-5.65.0.tar.xz"
+sha512sums="8f35f1f8b7d6b581801c3c6d17dc8925aa94d5102d8018c50ebaf86a7f513ec271a1689e3afa0dee30ed1a1794e66601485e0b47cf1b1f25f4da20d1821c699a kjs-5.66.0.tar.xz"
diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD
index 2be17aca4..5381ae290 100644
--- a/user/kjsembed/APKBUILD
+++ b/user/kjsembed/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kjsembed
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="JavaScript bindings for QObject"
url="https://www.kde.org/"
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d0c14853af065ea6679290f9e1f0d71b5a544a790897a8b445c63c9b444ee138164eba1a1fa8c2a0980a5dda2a0043667cb3e6bc723f63615c2afabbf710dde1 kjsembed-5.65.0.tar.xz"
+sha512sums="eba7badb454370ba2671703c01760f97bfa637aa949b297268780afdca91cd4232abb87f4a52fe8cc7cee86377d6853e278408eece034ed54447c26864c7b69f kjsembed-5.66.0.tar.xz"
diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD
index 505696c59..5dbc5e783 100644
--- a/user/kjumpingcube/APKBUILD
+++ b/user/kjumpingcube/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kjumpingcube
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Dice-driven tactical game"
url="https://games.kde.org/game.php?game=kjumpingcube"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kcoreaddons-dev kconfigwidgets-dev kcrash-dev kdbusaddons-dev kio-dev
kdoctools-dev ki18n-dev kxmlgui-dev kwidgetsaddons-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kjumpingcube-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kjumpingcube-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="f00be92f4a4e4b014962b9b767f2dc174272059db81aa257033424d3150076896a72d9a9260d9f57ed33bad6196413c8e30bc5288d077b1a3337fed1318d1213 kjumpingcube-19.08.2.tar.xz"
+sha512sums="b630bd9c7cb8c1e55a374d15b8614a06a2d611dc1beea087668b265cc3e4eee5c7edce7f509943157b610e2331ee8ac11f03b665eeea2d0427a90d3fc7c5f53d kjumpingcube-19.12.1.tar.xz"
diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD
index f8ed88504..b21731082 100644
--- a/user/kleopatra/APKBUILD
+++ b/user/kleopatra/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kleopatra
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Certificate manager and cryptography GUI"
url="https://www.kde.org/applications/utilities/kleopatra/"
@@ -12,12 +12,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev libkleo-dev kcmutils-dev
libassuan-dev kitemmodels-dev kmime-dev knotifications-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kleopatra-$pkgver.tar.xz
- qt5.9.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/kleopatra-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,19 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="d2eb5a02e937a93a1c8c20e418203e580f37548e4dcc2ba9519dec244a04f355a32e9daa9acecfc51e6b63f7f1274882a7eb4ac23e6c73f67d5c292d05a50027 kleopatra-19.08.2.tar.xz
-4f1330881b582d3b730ee8001eedd6cd18ba14d21d7e80056c8bec1052691f580fd055fa762565449e2c820dbdcd133077ab61f98de8215f88459e32afd609bd qt5.9.patch"
+sha512sums="25fd4a5458e3695351c8dbc2acc750902f1b438e3da0988fa525f243bdbe17b5b45cf5ca7ca57a706bfe0d0f8f1e3d03e0b7c70c137f47c2353db5dc98625f6f kleopatra-19.12.1.tar.xz"
diff --git a/user/kleopatra/qt5.9.patch b/user/kleopatra/qt5.9.patch
deleted file mode 100644
index b6f182029..000000000
--- a/user/kleopatra/qt5.9.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From e3a467d6221d15015ccd5166d6dc53335482c5c8 Mon Sep 17 00:00:00 2001
-Date: Mon, 17 Dec 2018 08:12:46 +0100
-Subject: Revert "Remove QT_CHECK"
-
----
- src/commands/certifycertificatecommand.cpp | 4 ++++
- src/commands/importcertificatescommand.cpp | 4 ++++
- src/dialogs/certificateselectiondialog.cpp | 4 ++++
- 3 files changed, 12 additions(+)
-
-diff --git a/src/commands/certifycertificatecommand.cpp b/src/commands/certifycertificatecommand.cpp
-index 524b5a6..5577f2f 100644
---- a/src/commands/certifycertificatecommand.cpp
-+++ b/src/commands/certifycertificatecommand.cpp
-@@ -215,7 +215,11 @@ void CertifyCertificateCommand::doStart()
- cmd->setParentWidget(d->parentWidgetOrView());
- cmd->setProtocol(GpgME::OpenPGP);
- loop.connect(cmd, SIGNAL(finished()), SLOT(quit()));
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
- QMetaObject::invokeMethod(cmd, &Commands::NewCertificateCommand::start, Qt::QueuedConnection);
-+#else
-+ QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection);
-+#endif
- loop.exec();
- } else {
- Q_EMIT(canceled());
-diff --git a/src/commands/importcertificatescommand.cpp b/src/commands/importcertificatescommand.cpp
-index 49294b6..89542cc 100644
---- a/src/commands/importcertificatescommand.cpp
-+++ b/src/commands/importcertificatescommand.cpp
-@@ -392,7 +392,11 @@ bool ImportCertificatesCommand::Private::showPleaseCertify(const GpgME::Import &
- auto cmd = new Commands::CertifyCertificateCommand(key);
- cmd->setParentWidget(parentWidgetOrView());
- loop.connect(cmd, SIGNAL(finished()), SLOT(quit()));
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
- QMetaObject::invokeMethod(cmd, &Commands::CertifyCertificateCommand::start, Qt::QueuedConnection);
-+#else
-+ QMetaObject::invokeMethod(cmd, "start", Qt::QueuedConnection);
-+#endif
- loop.exec();
- }
- return true;
-diff --git a/src/dialogs/certificateselectiondialog.cpp b/src/dialogs/certificateselectiondialog.cpp
-index 003872e..020310d 100644
---- a/src/dialogs/certificateselectiondialog.cpp
-+++ b/src/dialogs/certificateselectiondialog.cpp
-@@ -384,7 +384,11 @@ void CertificateSelectionDialog::Private::slotDoubleClicked(const QModelIndex &i
- QItemSelectionModel *const sm = view->selectionModel();
- Q_ASSERT(sm);
- sm->select(idx, QItemSelectionModel::ClearAndSelect | QItemSelectionModel::Rows);
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
- QMetaObject::invokeMethod(q, [this]() {q->accept();}, Qt::QueuedConnection);
-+#else
-+ QMetaObject::invokeMethod(q, "accept", Qt::QueuedConnection);
-+#endif
- }
-
- void CertificateSelectionDialog::accept()
---
-cgit v1.1
-
---- kleopatra-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:10.000000000 +0000
-+++ kleopatra-19.04.0/CMakeLists.txt 2019-04-19 06:34:58.511578506 +0000
-@@ -11,10 +11,10 @@
- option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)
-
- # Standalone build. Find / include everything necessary.
--set(KF5_MIN_VERSION "5.60.0")
-+set(KF5_MIN_VERSION "5.54.0")
- set(KMIME_VERSION "5.12.1")
- set(LIBKLEO_VERSION "5.12.1")
--set(QT_REQUIRED_VERSION "5.11.0")
-+set(QT_REQUIRED_VERSION "5.9.0")
- set(GPGME_REQUIRED_VERSION "1.8.0")
-
- find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
---- kleopatra-19.08.0/CMakeLists.txt.old 2019-08-15 15:07:20.717152888 +0000
-+++ kleopatra-19.08.0/CMakeLists.txt 2019-08-15 15:09:48.141370261 +0000
-@@ -143,7 +143,7 @@
- add_subdirectory(tests)
- add_subdirectory(autotests)
- endif()
--install(FILES kleopatra.renamecategories kleopatra.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-+#install(FILES kleopatra.renamecategories kleopatra.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-
- if(KF5DocTools_FOUND)
- add_subdirectory(doc)
diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD
index 49b6f77f4..bdf25bdb6 100644
--- a/user/klettres/APKBUILD
+++ b/user/klettres/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=klettres
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Learn alphabets for multiple languages"
url="https://www.kde.org/applications/education/klettres/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev phonon-dev
kcompletion-dev kcrash-dev kdoctools-dev kemoticons-dev ki18n-dev
knewstuff-dev kwidgetsaddons-dev kconfigwidgets-dev kcoreaddons-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/klettres-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/klettres-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="59325fc8df2d71066980b6a44339311603d70dbb55a104f5e549094d38bac84c6a0e180c34aae426d158258104d35101f835df064556a8fccbb4ff248a3caa87 klettres-19.08.2.tar.xz"
+sha512sums="93c61c67c6503dda9087ed8662d27cad1a8fbf075f85cb2d5ab0e61cec8196b78a7396ca3a9ef794ff60f6269f6cfe5323c87f077b1c4275174213bc33add4fb klettres-19.12.1.tar.xz"
diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD
index 6df9f2be2..65e00f948 100644
--- a/user/klickety/APKBUILD
+++ b/user/klickety/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=klickety
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Fun, simple colour matching game"
url="https://www.kde.org/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kio-dev
kconfig-dev kcrash-dev kwidgetsaddons-dev ki18n-dev kconfigwidgets-dev
kxmlgui-dev kdoctools-dev kdbusaddons-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/klickety-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/klickety-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="14a21769140889fd45da420d31867c2723b4218b31325e4830a3226a3316aeb89e47130d7c1cbc643ae4dd125932d00f8b9393abee575dc72e82148fa9ae3808 klickety-19.08.2.tar.xz"
+sha512sums="44d88230b64cf4ae8e496160f501a5ae9187016ed0308f701ed5505d341cf5c6c75ebd95d85eefc153fa9a8fa24e79d4c37c7e4db3d4e3520cebb07342a4e54b klickety-19.12.1.tar.xz"
diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD
index 54bbd9d41..5103a5fc4 100644
--- a/user/klines/APKBUILD
+++ b/user/klines/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=klines
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Simple yet addictive single-player game"
url="https://games.kde.org/game.php?game=klines"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev
kconfig-dev kcrash-dev kwidgetsaddons-dev kdbusaddons-dev ki18n-dev
kconfigwidgets-dev kxmlgui-dev kdoctools-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/klines-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/klines-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="b1bf8d6960f5a48f687574b10abed362cacfdd4b644f9148e913206a809b4a9215b08bd4492be5df3c5e02d76a0894a5c9290f692f74779c476c5d2862c698cb klines-19.08.2.tar.xz"
+sha512sums="46a032816eb324925959a9e71993d48d33b5ffc1d4e8209d342c5c6b86fc1f267d2b36952868b65e5e5d436e675e18dc522603e01639258ae4e638390fbd5e85 klines-19.12.1.tar.xz"
diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD
index c98936950..99e33f9f7 100644
--- a/user/kmag/APKBUILD
+++ b/user/kmag/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmag
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Screen magnification utility"
url="https://www.kde.org/applications/utilities/kmag/"
@@ -11,10 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev ki18n-dev
kio-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kmag-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kmag-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="cb3c7b41244af293f2aa81998e234008e30a20d7182fe235cb5e8bf09f080f1369b0fb1ea9dd6c803caa1c0b6a7bf269eed0cd8587d0fc858d5dc5e03344d9fa kmag-19.08.2.tar.xz"
+sha512sums="a203109cd79e12f599e63ae44d1a065404399c644fe0a53992f0a41345b0039996d6f6da9acc791036aaaff720d37e0dec93649f39b5e41b2d17c006ea22cfe1 kmag-19.12.1.tar.xz"
diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD
index 06779b2f7..6c0a5960c 100644
--- a/user/kmahjongg/APKBUILD
+++ b/user/kmahjongg/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmahjongg
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Mah Jongg desktop game"
url="https://games.kde.org/game.php?game=kmahjongg"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kcoreaddons-dev kcrash-dev kdbusaddons-dev kdeclarative-dev kxmlgui-dev
kdoctools-dev knewstuff-dev libkdegames-dev libkmahjongg-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kmahjongg-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kmahjongg-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="be220ff401ea1de3ffd18a9db4e3a40ab1d8cf43e016c8c3891f31dc68ed8bfff0df7c5e5fe580afd0818ad23b1248c971d8fc0f2fa2dd044711a2d73cdb06e6 kmahjongg-19.08.2.tar.xz"
+sha512sums="3b492c1ddb87d8559ced449fd7a060e7f8333ef7cc8ea55434ea0b2c76ff4235cf396b07b428c8523b753436d8414e834b7ed3557816971d2738d8c91dc3bdbb kmahjongg-19.12.1.tar.xz"
diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD
index 541f26417..17283aa8a 100644
--- a/user/kmediaplayer/APKBUILD
+++ b/user/kmediaplayer/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmediaplayer
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Media player framework for KDE 5"
url="https://www.kde.org/"
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b92d63cb8bafdc7a953d1e08ac1b4014f5bc5f5554b5c7a3138452bdc775e57a8f0f2cc8fe492364c149c5a65996cc3b645c96538ec181e5ccff879dd267a416 kmediaplayer-5.65.0.tar.xz"
+sha512sums="ea4d99ebc345ab42a943652e5d5033c14eb11672218d586bcc809cf977dd0e779babd96237bdb2a93755fb4c19730adac63057ef1019c7ee9caded12ca767c5f kmediaplayer-5.66.0.tar.xz"
diff --git a/user/kmenuedit/APKBUILD b/user/kmenuedit/APKBUILD
index f28736562..4dddf6f67 100644
--- a/user/kmenuedit/APKBUILD
+++ b/user/kmenuedit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kmenuedit
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Menu editor for Plasma 5"
url="https://www.KDE.org/"
@@ -9,9 +9,10 @@ arch="all"
license="GPL-2.0+ AND GPL-2.0-only"
depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev
- kiconthemes-dev kio-dev kxmlgui-dev sonnet-dev kdelibs4support-dev"
+ kiconthemes-dev kglobalaccel-dev kinit-dev kio-dev kitemviews-dev kxmlgui-dev
+ sonnet-dev kdoctools-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kmenuedit-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/kmenuedit-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -24,7 +25,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -36,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="1de4301df485237c0c0c855e7d2f8a4774fb3054ee5c458ea2d58acd2899965cf960a1020e157f394c9a0786e47efb9f0dfa1201718d5ccfbedaeca041974ea2 kmenuedit-5.12.8.tar.xz"
+sha512sums="51749e07f377188649e53706d473a346547a0b8761af92a5a75d76728b24625a0e5e43650b9e71dd32e388c692dad03ded07543929a1a730152eeff708a7b7a0 kmenuedit-5.17.90.tar.xz"
diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD
index cdb6ce528..9e2d37295 100644
--- a/user/kmime/APKBUILD
+++ b/user/kmime/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmime
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KDE support library for MIME"
url="https://www.kde.org/"
@@ -12,12 +12,9 @@ depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules python3 kcodecs-dev
ki18n-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kmime-$pkgver.tar.xz
- egregious-versions.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/kmime-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,20 +25,17 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
# https://bugs.kde.org/show_bug.cgi?id=385479
CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(headertest|messagetest|dateformattertest)'
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="2c7b4332197c7fec915cedde4faf2726abd5ca1c0ae9c57642b35807cd9e75f1ef549802a71a6fc22515ab914759f3b01bc88ff964591aceb3c50b39de7b6157 kmime-19.08.2.tar.xz
-ae8e5836cefbf19f2aa5c775e3189a24b558840799c93fefc4d3863567d152bd14a2597241fcf0967d134cefedcf2c258f75f3c3bda4ec2cd2623f81a9c37c9f egregious-versions.patch"
+sha512sums="5b150837f5876c0950e9306914fc03e008122244ecfb66330a6feee4857380684118c2e86b7d5512c65803e1306b486a65299b29da036b42222b2450fd3f1bcd kmime-19.12.1.tar.xz"
diff --git a/user/kmime/egregious-versions.patch b/user/kmime/egregious-versions.patch
deleted file mode 100644
index 49b8f8024..000000000
--- a/user/kmime/egregious-versions.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-There is absolutely NO REQUIREMENT on these newer versions by KMime.
-
-This is only done to keep in sync with the rest of KDE PIM.
-
---- kmime-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:19.000000000 +0000
-+++ kmime-19.04.0/CMakeLists.txt 2019-04-19 06:18:49.665558623 +0000
-@@ -4,7 +4,7 @@
- project(KMime VERSION ${PIM_VERSION})
-
- # ECM setup
--set(KF5_MIN_VERSION "5.60.0")
-+set(KF5_MIN_VERSION "5.54.0")
-
- find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
- set(CMAKE_MODULE_PATH ${KMime_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
-@@ -22,7 +22,7 @@
-
-
- set(KMIME_LIB_VERSION ${PIM_VERSION})
--set(QT_REQUIRED_VERSION "5.11.0")
-+set(QT_REQUIRED_VERSION "5.9.0")
- find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core)
-
- ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME
diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD
index 1a6890eb0..6b84cb904 100644
--- a/user/kmines/APKBUILD
+++ b/user/kmines/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmines
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Classic Minesweeper game"
url="https://games.kde.org/game.php?game=kmines"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfigwidgets-dev
ki18n-dev ktextwidgets-dev kwidgetsaddons-dev kxmlgui-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kmines-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kmines-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="6bd15215023753cd42abcd9564f71ef98f303c9af80417ff9f18792cc10d70de0f84883538e0b22953e100428b8d6679ee253592ed336bd67caf43af09131138 kmines-19.08.2.tar.xz"
+sha512sums="b80a45a8520411bcc5bf07c7a6689566cd91f2c1ef5d8c8ac16ddef1d50105d4e010a99f85c5f52982199f4fcac0bb731171c57d674048c9eb213392e3dde02e kmines-19.12.1.tar.xz"
diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD
index 93e04c36f..6a979b99e 100644
--- a/user/kmix/APKBUILD
+++ b/user/kmix/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmix
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KDE sound mixer"
url="https://www.kde.org/applications/multimedia/kmix/"
@@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev ki18n-dev
plasma-framework-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev
alsa-lib-dev libcanberra-dev pulseaudio-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kmix-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kmix-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="79e6ffc966faa5586c711a1af094b4cddbc18e99531dd2849c79b7d9fa9a3603dfcedd4c375b60a0af30e33533a4317eb2c3f05dde53e81430ae1fd677d6a82b kmix-19.08.2.tar.xz"
+sha512sums="1b17f1af2078aa2ebb368c3473ef98e509da13342c12b9e7e8d768cfb0bbf7e2b6a54ea7ce73e957471c9b31d0d3042492979db96ac2f076552f563f91d96dca kmix-19.12.1.tar.xz"
diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD
index 38d9f4cf8..bbe83fed3 100644
--- a/user/kmousetool/APKBUILD
+++ b/user/kmousetool/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmousetool
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Tool to assist with clicking the mouse button"
url="https://userbase.kde.org/KMouseTool"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev
kdoctools-dev kiconthemes-dev knotifications-dev kxmlgui-dev phonon-dev
libxtst-dev libxt-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kmousetool-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kmousetool-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="a77de3d5a5e5601db7a276e4f14d11ac9d4a63a19231606fafcb959db34ce1d8232b3699dba6749fcf6f7f559f008b43e44e1cecf7746a7764695ec1b482f8ad kmousetool-19.08.2.tar.xz"
+sha512sums="fb368e92bd2963b29bc91f5b0069bbd28783d31cc04cc198ab2b74b0ca6bb71b1e0b5c0ed0990042a880f28df1929ceafadc3997d2dbc34e543fb4c3e821850e kmousetool-19.12.1.tar.xz"
diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD
index d71e58346..e4b5d72fc 100644
--- a/user/kmplot/APKBUILD
+++ b/user/kmplot/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kmplot
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Mathematical function plotter"
url="https://www.kde.org/applications/education/kmplot/"
@@ -10,12 +10,11 @@ license="GPL-2.0-only"
depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kcrash-dev
kguiaddons-dev ki18n-dev kparts-dev kwidgetsaddons-dev kdoctools-dev
- kdelibs4support-dev kdbusaddons-dev"
+ kdbusaddons-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kmplot-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kmplot-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="4f6f9f6d5aa3f995ac5d5b9173c90dc02427bdbcab0b825120d6281e6fadb7c3c3730abc347e882e6a854b462fa4dfdc0f807359310495e2c2bdd3124e59cb40 kmplot-19.08.2.tar.xz"
+sha512sums="79689ce9c9b629845dff01d676aac0af991f5da4183b3b5a9f8a8a09b94fc52aa48958ea6733800e263c8b71c4a557f863265408850d931ead2f94467a842195 kmplot-19.12.1.tar.xz"
diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD
index e8a63c611..80a4143ac 100644
--- a/user/knavalbattle/APKBUILD
+++ b/user/knavalbattle/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=knavalbattle
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Ship sinking game from KDE"
url="https://www.kde.org/applications/games/knavalbattle/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev
kdbusaddons-dev kdnssd-dev kdoctools-dev ki18n-dev ktextwidgets-dev
kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/knavalbattle-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/knavalbattle-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="9f438467e138594b2d45e426d7a0295c07dc20508e21f0753b51de5394122dad9832bd47c1faa93b13f2d9d88909e7f46f16a9752fd9c4b8d39d9b9b8e6a754a knavalbattle-19.08.2.tar.xz"
+sha512sums="d01f4ced36848b049af07dcf6d57097bab20ca5be5325f3453d828212f4010c3e217907f694efb3019034435b5d71a9b05afb9deee56b0a556873339a1e4de86 knavalbattle-19.12.1.tar.xz"
diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD
index d3bc4df61..b50f73779 100644
--- a/user/knetwalk/APKBUILD
+++ b/user/knetwalk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=knetwalk
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Build up a computer network by placing the wires correctly"
url="https://www.kde.org/applications/games/knetwalk/"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kdbusaddons-dev ki18n-dev ktextwidgets-dev kwidgetsaddons-dev
kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/knetwalk-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/knetwalk-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="b19c846f0d2c909f0f84d0bc04c10306761ea202ab24f9f11ddc03daede7dd01f182f25e172043d7e65b43027235b255815f4fb0a6709d1d5aee28657c0047d9 knetwalk-19.08.2.tar.xz"
+sha512sums="9ed8be8d3fcf59d19a519121e72451001e249bf86d2aa0b4f2ba67b234f71969c332531b263d715cd524cfca32ea4ba574f1f26e291598fa79de0c263ceb9830 knetwalk-19.12.1.tar.xz"
diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD
index c6d67720f..253c62bd6 100644
--- a/user/knewstuff/APKBUILD
+++ b/user/knewstuff/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=knewstuff
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for discovering and downloading plugins, themes, and more"
url="https://www.kde.org/"
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="cd41d73f65abc72820876bf4bffb79890f8d6bb465aee41e75b8aeda6c75aebc345d7f47532b5cd28d33b55b82685eab00013b14b4c2d75e90fc523112011d58 knewstuff-5.65.0.tar.xz"
+sha512sums="2d431b27b41a7fef2a024741c9b7746a33297e0f6465f8191a33c48fc1fe88004cb9edd01029c478b8970da465d48679f302ecdb5d7bb190e4bc565d69aac379 knewstuff-5.66.0.tar.xz"
diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD
index 4a8cd8bee..5e172a9b7 100644
--- a/user/knotifications/APKBUILD
+++ b/user/knotifications/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=knotifications
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for sending notifications to users"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="36b314546a0591df7e2c9d9b3870e3faefc86feac01f4d95924b4e721714ec1934592aa14948265230f0972cd523bee245637e17964faac5035382c45d6ed44f knotifications-5.65.0.tar.xz"
+sha512sums="f5a2f809204e87714577e24dc6a9e5d8556bab4a19a491b6dd45ef62f379861e6a2bcba9e023ab60a004f574cf8ec41a3c4764e301cfd085d4eb90c1d7561ec1 knotifications-5.66.0.tar.xz"
diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD
index 5afbf219e..45a35774a 100644
--- a/user/knotifyconfig/APKBUILD
+++ b/user/knotifyconfig/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=knotifyconfig
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for configuring notifications"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="0a20c6cde98ebfd0d905e91b0c1f75367df5eb89a56321062bb859398dcfec193f901a53d91cfd315b69ddfc350d10d0ebcdf77ad85dc2d67ae1aa792f2f4f6c knotifyconfig-5.65.0.tar.xz"
+sha512sums="94eda2fef5f7449791cf34f9b58f7729d435d9cdb5cd6627963912b4bc6fae4ff8da7d4d1e99f8461f60ab38c940f697b4f83906ca314243c083eb62e0518d71 knotifyconfig-5.66.0.tar.xz"
diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD
index c97f10a06..f9ae39bda 100644
--- a/user/kolf/APKBUILD
+++ b/user/kolf/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kolf
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="2D miniature golf game from KDE"
url="https://www.kde.org/applications/games/kolf/"
@@ -10,13 +10,12 @@ license="GPL-2.0-only"
depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcompletion-dev
kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev
- kdbusaddons-dev kdelibs4support-dev kdoctools-dev ki18n-dev kio-dev
- kwidgetsaddons-dev kxmlgui-dev libkdegames-dev"
+ kdbusaddons-dev kdoctools-dev ki18n-dev kio-dev kwidgetsaddons-dev
+ kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kolf-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kolf-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="456ac17fb28a4bfbb449f31c2400fcfbac5cd5bf0d3596d359eae69b05c89adab517bd2cbbf83358d529bf228ba217f0d8c6fd3648013762dab9cfca1003ecef kolf-19.08.2.tar.xz"
+sha512sums="66fa239b1fe49f881eb8dc54f48412ae0709393de45a551b1d46568ea1d721f07cf456583c603e8f7301e2195f2ae99a85afe1279028ce21c6458da9a6f61f62 kolf-19.12.1.tar.xz"
diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD
index e0a369a0b..da97fbcbb 100644
--- a/user/kollision/APKBUILD
+++ b/user/kollision/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kollision
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Simple ball dodging game"
url="https://games.kde.org/game.php?game=kollision"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev ki18n-dev
kconfig-dev kcrash-dev kdbusaddons-dev kdoctools-dev kwidgetsaddons-dev
kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kollision-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kollision-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="3f53ddda075ccc0afb41d2a85db7fd2192fb6c78703b11ea09969f77c8c860efa45a86aafb870d911fd5d5486af280fa235f9ba204f42539d2bbbe61d7dbe921 kollision-19.08.2.tar.xz"
+sha512sums="d39de5111c60d33858fa24b96f5b32b53ec06cc1f27345ab12a03abd689ea44f0d143dc71ddf1b107cab811c0f139a7c4d7325fbe021736d4049b360477aa1e2 kollision-19.12.1.tar.xz"
diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD
index 88c903bda..8826c87a6 100644
--- a/user/kolourpaint/APKBUILD
+++ b/user/kolourpaint/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kolourpaint
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Simple painting program for KDE"
url="http://kolourpaint.org/"
@@ -12,10 +12,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdelibs4support-dev
libksane-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kolourpaint-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kolourpaint-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="beaf80f8cdc13f23ad19e0832fdb7d95d17fa11a84137e0d2c84c8f5fadd57e4c6cfa03583ebfa52d2c55923dfd9802362f63e04e59829ef205947033b47590f kolourpaint-19.08.2.tar.xz"
+sha512sums="1e1ac2e423c972b900588f6f1f20d46a9201958bb0c6cb349b38ef8ff1c88d67b1240ad9c4b5fadfe4aa6c72df432e4962d4ff82d722f63e1235baee9a17d8ab kolourpaint-19.12.1.tar.xz"
diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD
index 2fecc74f3..7d9ace550 100644
--- a/user/konquest/APKBUILD
+++ b/user/konquest/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=konquest
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Galactic strategy game"
url="https://games.kde.org/game.php?game=konquest"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev kguiaddons-dev
ki18n-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/konquest-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/konquest-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="bb5e0b6c1b17b64f54aa74907a5a47bd15ddeb0c3c10093db0bc80a014e1bf82d70c455728c66fe0e6b34dc2dc776adb68ef48f6a9ee910b3326da41b16f39e3 konquest-19.08.2.tar.xz"
+sha512sums="0df54754c210256ac8729cf937f7981bc83af3bfeff6cb6095c51a3e9fcbe4797467e2fe6c95a687a2ec75e52adb31140f4751c1903ca94793073fe0328e7367 konquest-19.12.1.tar.xz"
diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD
index f7249a682..b96b46a0d 100644
--- a/user/konsole/APKBUILD
+++ b/user/konsole/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=konsole
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Terminal emulator for Qt/KDE"
url="https://konsole.kde.org/"
@@ -16,10 +16,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kbookmarks-dev
kpty-dev kservice-dev ktextwidgets-dev kwidgetsaddons-dev python3
kwindowsystem-dev kxmlgui-dev kdbusaddons-dev knewstuff-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/konsole-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/konsole-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -30,18 +29,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="b781e1e6a19b81a49722fa04d568a53dda2c22f72ee197ebf7bacb9142d260ce3071a12cfada905d029dc2ab43a047205175cde5906a4033fb8bdd20876c1af5 konsole-19.08.2.tar.xz"
+sha512sums="f838d68733935f7e082ebb0c09036987bf2c13fc27bbd75ff3dbca2cd67bc4c5f9d63b52d032e3f4f5205079711d4f57eaab2133f5fe56a956ddb0aba204f5cd konsole-19.12.1.tar.xz"
diff --git a/user/konversation/APKBUILD b/user/konversation/APKBUILD
index dd280d582..36e0efe17 100644
--- a/user/konversation/APKBUILD
+++ b/user/konversation/APKBUILD
@@ -15,10 +15,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev
kdbusaddons-dev knotifications-dev kwindowsystem-dev kiconthemes-dev
kitemviews-dev phonon-dev qca-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/konversation/$pkgver/src/konversation-$pkgver.tar.xz"
+source="https://download.kde.org/stable/konversation/$pkgver/src/konversation-$pkgver.tar.xz
+ qt5.patch
+ "
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,18 +30,17 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504 konversation-1.7.5.tar.xz"
+sha512sums="001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504 konversation-1.7.5.tar.xz
+a407be142c896eeef3edc4b3b6fa9451341b660c80b300573a2029c6a2b3a4340a2b351ee13e9f0f65aeddf1e47e164faf13d81e626e17093d0ec84f35255b6a qt5.patch"
diff --git a/user/konversation/qt5.patch b/user/konversation/qt5.patch
new file mode 100644
index 000000000..d9d29bbd1
--- /dev/null
+++ b/user/konversation/qt5.patch
@@ -0,0 +1,24 @@
+From 4d0036617becc26a76fd021138c98aceec4c7b53 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 21 Jul 2019 09:14:32 +0200
+Subject: Fix build with Qt 5.13
+
+---
+ src/irc/outputfilter.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/irc/outputfilter.cpp b/src/irc/outputfilter.cpp
+index f9e6253..45d11fb 100644
+--- a/src/irc/outputfilter.cpp
++++ b/src/irc/outputfilter.cpp
+@@ -32,6 +32,7 @@
+
+ #include <QStringList>
+ #include <QFile>
++#include <QMetaMethod>
+ #include <QRegExp>
+ #include <QTextCodec>
+ #include <QByteArray>
+--
+cgit v1.1
+
diff --git a/user/koruri/APKBUILD b/user/koruri/APKBUILD
index 95ba170d1..4f6f28ace 100644
--- a/user/koruri/APKBUILD
+++ b/user/koruri/APKBUILD
@@ -11,7 +11,7 @@ license="Apache-2.0 AND custom:M+-FONTS"
depends="fontconfig"
makedepends=""
subpackages=""
-source="https://mirrors.gigenet.com/OSDN//koruri/70038/Koruri-$pkgver.tar.xz"
+source="https://distfiles.adelielinux.org/source/Koruri-$pkgver.tar.xz"
builddir="$srcdir/Koruri-$pkgver"
package() {
diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD
index 857542951..f842c7273 100644
--- a/user/kpackage/APKBUILD
+++ b/user/kpackage/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kpackage
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Frameworks for managing KDE data packages"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="789fa54ddc4a117fb1d233f7810fdf5c85a6aa5e41c46766ae8d93f60322c441611927a5e163cc8fa6f36780ad06cdbb82d82db80ab6eca4720a45536164101f kpackage-5.65.0.tar.xz"
+sha512sums="e8fa4ac749bacac93d005d9ab1de2f8a4c68eacf6f6c1e6524bce5ae7bbfd2e7278eb26425094f003c0286bc5e482fc01200ebfa6d03ebac3a33e565dc732b82 kpackage-5.66.0.tar.xz"
diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD
index 01e8428fa..77f058006 100644
--- a/user/kparts/APKBUILD
+++ b/user/kparts/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kparts
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for user interface components"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="1b5c1671f3b00703607bee0d04e5052f9745fa0a0e7db4c077bf9e8aa372de5e2328616fc9af358b0ff8ac29ca39f66e003f72a8520d2954ab66f1d166a5b139 kparts-5.65.0.tar.xz"
+sha512sums="44882ca93e641958d690db6ae685f142f95c3192b599c911909464b492374d75e950feeca1121b124e59b55b7690873014534f78905ce6a03c6188621c48c0c8 kparts-5.66.0.tar.xz"
diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD
index ed65a4f5b..7449a9c4c 100644
--- a/user/kpat/APKBUILD
+++ b/user/kpat/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kpat
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Collection of card games for KDE"
url="https://games.kde.org/game.php?game=kpat"
@@ -15,10 +15,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kwidgetsaddons-dev kxmlgui-dev libkdegames-dev shared-mime-info
freecell-solver-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kpat-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kpat-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,18 +28,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="4ac8068a5f8eb7385245a9accae9652eb8c0b1919f5b96995968f961288e36dcaff3762cfec3e5a307601e3df0b1d31942881d8d90869a8a930c678593b17107 kpat-19.08.2.tar.xz"
+sha512sums="271d577b716e38ad3fcc675070dc93be4a78a8a9c5dfcc51a374336c9238959e83c9411cb8eaa08a263ee19be093eab95a8de526619aeb9b7c7fad62d37dd3f4 kpat-19.12.1.tar.xz"
diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD
index c0e952933..37e5eab29 100644
--- a/user/kpeople/APKBUILD
+++ b/user/kpeople/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kpeople
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Provides access to all contacts and groups them by physical person"
url="https://api.kde.org/frameworks/kpeople/html/index.html"
@@ -42,5 +42,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="013a02fe885b726490560892828f811c2d0134cafc5a8390ad061afebb9eecdb7a41913036729acfae45cd3b98b45b788734f095efa86bca0b71e78497dda3a6 kpeople-5.65.0.tar.xz
+sha512sums="5bfc5641a02f198f5eea3569923f06c4afce48db9e985ebe74e058b319159a6343b880a122ff645f7628017dda41c5d6ac5162a139f9b23956593b6c8ce8f36b kpeople-5.66.0.tar.xz
77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9 dont-crash-test.patch"
diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD
index e47058f3d..7968c5e45 100644
--- a/user/kphotoalbum/APKBUILD
+++ b/user/kphotoalbum/APKBUILD
@@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/kphotoalbum/$pkgver/kphotoalbum-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,17 +26,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD
index 686b891b4..76608f0db 100644
--- a/user/kpimtextedit/APKBUILD
+++ b/user/kpimtextedit/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kpimtextedit
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Text editor for Personal Information Managers (PIMs)"
url="https://pim.kde.org/"
@@ -16,12 +16,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev ki18n-dev
kdesignerplugin-dev kemoticons-dev kiconthemes-dev kio-dev kxmlgui-dev
qt5-qtspeech-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kpimtextedit-$pkgver.tar.xz
- qt5.9.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/kpimtextedit-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -32,19 +29,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="ef28ec4732fa1322143ded1f4efa27f15111cef2d038d38454b9cd22d32219f63398d764cf1a7cbd29635e9885c2d16463a5b345c22be3b2ea2937727fbff061 kpimtextedit-19.08.2.tar.xz
-3cf800dfc537029588a4701faa2dd1fceb9e0b851c7d7675d468414d45dc2c07aadd4eb687a6b8cfeea4068e1e81b2fe2ad3de7c3c183650d43ab13cf20f4645 qt5.9.patch"
+sha512sums="43b0b68462dbf0b6edec1d0be1b57a793917e98bd2ec0e12d4d9c5834525edc07f2f3c78909002a433b9542758a4782ed0d16c54d5b50d3a99931d97dd379d4e kpimtextedit-19.12.1.tar.xz"
diff --git a/user/kpimtextedit/qt5.9.patch b/user/kpimtextedit/qt5.9.patch
deleted file mode 100644
index 6ae06c8a0..000000000
--- a/user/kpimtextedit/qt5.9.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 6961b54d1c814f2e7aafd7db8256f82688f014a3 Mon Sep 17 00:00:00 2001
-Date: Mon, 17 Dec 2018 07:23:52 +0100
-Subject: Revert "Remove QT_CHECK"
-
----
- .../plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp b/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp
-index 8ce0fe9..c07699c 100644
---- a/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp
-+++ b/src/texteditor/plaintexteditor/plaintextsyntaxspellcheckinghighlighter.cpp
-@@ -144,9 +144,13 @@ void PlainTextSyntaxSpellCheckingHighlighter::highlightBlock(const QString &text
-
- const auto nextBlock = currentBlock().next();
- if (nextBlock.isValid()) {
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
- QMetaObject::invokeMethod(this, [this, nextBlock] {
- rehighlightBlock(nextBlock);
- }, Qt::QueuedConnection);
-+#else
-+ QMetaObject::invokeMethod(this, "rehighlightBlock", Qt::QueuedConnection, Q_ARG(QTextBlock, nextBlock));
-+#endif
- }
- }
-
---
-cgit v1.1
-
---- kpimtextedit-19.04.0/CMakeLists.txt.old 2019-04-12 00:14:22.000000000 +0000
-+++ kpimtextedit-19.04.0/CMakeLists.txt 2019-04-19 06:21:56.055556133 +0000
-@@ -4,7 +4,7 @@
- project(KPimTextEdit VERSION ${PIM_VERSION})
-
- # ECM setup
--set(KF5_MIN_VERSION "5.60.0")
-+set(KF5_MIN_VERSION "5.54.0")
-
- find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-@@ -36,7 +36,7 @@
- SOVERSION 5
- )
-
--set(QT_REQUIRED_VERSION "5.11.0")
-+set(QT_REQUIRED_VERSION "5.9.0")
- find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Widgets)
- find_package(Grantlee5 "5.1" CONFIG REQUIRED)
- set_package_properties(Grantlee5 PROPERTIES
---- kpimtextedit-19.08.0/CMakeLists.txt.old 2019-08-15 14:58:32.623688389 +0000
-+++ kpimtextedit-19.08.0/CMakeLists.txt 2019-08-15 14:59:20.798530990 +0000
-@@ -114,7 +114,7 @@
- COMPONENT Devel
- )
-
--install(FILES kpimtextedit.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-+#install(FILES kpimtextedit.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-
-
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
---- kpimtextedit-19.08.0/CMakeLists.txt.old 2019-08-15 14:59:35.306977776 +0000
-+++ kpimtextedit-19.08.0/CMakeLists.txt 2019-08-15 15:00:30.421077488 +0000
-@@ -68,7 +68,6 @@
- add_definitions(-DTRANSLATION_DOMAIN=\"libkpimtextedit\")
-
- add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
--add_definitions(-DQT_NO_FOREACH)
-
- find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS TextToSpeech)
-
diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD
index 96da8f042..105c8d685 100644
--- a/user/kplotting/APKBUILD
+++ b/user/kplotting/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kplotting
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for data plotting functions"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a97c0a0ad6be40fc35044e9d9b58483025e6f13d76e1fc20a3a6a50aba49bdc2c58f8ef4e13c04021d6caf04ab0e952c5d767a62d010ea87a502750b839ae687 kplotting-5.65.0.tar.xz"
+sha512sums="8f3ba8dcece142274b754fae7f6b51632f5f4c573dd04032f11adf4991afc6afb129db428f6b6691188338a734349ee32b16519875a16eb2b168a46937f1e59b kplotting-5.66.0.tar.xz"
diff --git a/user/kpmcore/APKBUILD b/user/kpmcore/APKBUILD
index a6fef6476..654bf76a1 100644
--- a/user/kpmcore/APKBUILD
+++ b/user/kpmcore/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kpmcore
-pkgver=3.3.0
+pkgver=4.0.1
pkgrel=0
pkgdesc="Core routines for KDE Partition Manager"
url="https://www.kde.org/applications/system/partitionmanager"
@@ -10,12 +10,15 @@ license="LGPL-2.1+"
depends=""
depends_dev="libatasmart-dev parted-dev qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules kcoreaddons-dev ki18n-dev
- kwidgetsaddons-dev util-linux-dev"
+ kwidgetsaddons-dev util-linux-dev kauth-dev qca-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/kpmcore/$pkgver/src/kpmcore-$pkgver.tar.xz"
+source="https://download.kde.org/stable/kpmcore/$pkgver/src/kpmcore-$pkgver.tar.xz
+ fat32.patch
+ nullptr-segfault.patch
+ test.patch
+ "
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +29,19 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="62a0a341fbbec426291e2c9dd183a20466fce48ffaa360dd816c58402ee03c1f61c4ef7887d0a66c4693d77c2183a5da3477b828ba4ac2ed405f684ffb27125e kpmcore-3.3.0.tar.xz"
+sha512sums="982ad77246f59ade74edba15effca6490ac9ac7bb6db7f6194bcdbfddfa735c9bc1b58020affccd945fcdfc96fce3488167f492d6a13dcd6d19c5692505303ac kpmcore-4.0.1.tar.xz
+904897b7e9292a33c131af9c65d3aa4eaca8cb84a437b83ac76bd8ee7347b49c7c098254ca03f72ab17a8c4f224b31e950978f3bc2c76953d60e38835faab9d7 fat32.patch
+cfcce896034c636bdea7ef36548e8116cfd7c0d92e76c4034f6b87b93efc943bb7a475325b2ac178dfb753178cff615603b2aca42a245a3bfda80ffa9c444ea4 nullptr-segfault.patch
+2b51fc26188f88fe5d6942ece062d19810ba35471f47005838fa812e8ecc78d25240a08e9e5d824f37da1284dd991323542d295519a6bdc89138c48d256e331b test.patch"
diff --git a/user/kpmcore/fat32.patch b/user/kpmcore/fat32.patch
new file mode 100644
index 000000000..1f308d5c7
--- /dev/null
+++ b/user/kpmcore/fat32.patch
@@ -0,0 +1,26 @@
+From 59c9ba2f8d644357e759e6584b4cddad545d4feb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
+Date: Tue, 15 Oct 2019 21:19:33 +0100
+Subject: Set MBR partition type of FAT32 partitions to 0x0c.
+
+BUG: 412959
+---
+ src/plugins/sfdisk/sfdiskpartitiontable.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/sfdisk/sfdiskpartitiontable.cpp b/src/plugins/sfdisk/sfdiskpartitiontable.cpp
+index bf0ae6b..552c973 100644
+--- a/src/plugins/sfdisk/sfdiskpartitiontable.cpp
++++ b/src/plugins/sfdisk/sfdiskpartitiontable.cpp
+@@ -178,7 +178,7 @@ static struct {
+ { FileSystem::Type::LinuxSwap, { QLatin1String("0657FD6D-A4AB-43C4-84E5-0933C84B4F4F"), QLatin1String("82") } },
+ { FileSystem::Type::Fat12, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("6") } },
+ { FileSystem::Type::Fat16, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("6") } },
+- { FileSystem::Type::Fat32, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("7") } },
++ { FileSystem::Type::Fat32, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("c") } },
+ { FileSystem::Type::Nilfs2, { QLatin1String("0FC63DAF-8483-4772-8E79-3D69D8477DE4"), QLatin1String("83") } },
+ { FileSystem::Type::Ntfs, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("7") } },
+ { FileSystem::Type::Exfat, { QLatin1String("EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"), QLatin1String("7") } },
+--
+cgit v1.1
+
diff --git a/user/kpmcore/nullptr-segfault.patch b/user/kpmcore/nullptr-segfault.patch
new file mode 100644
index 000000000..3caeecbdf
--- /dev/null
+++ b/user/kpmcore/nullptr-segfault.patch
@@ -0,0 +1,35 @@
+From c02d59aa6d314678cef9683f96b28e2a1abd82b7 Mon Sep 17 00:00:00 2001
+From: Hartmut Goebel <h.goebel@crazy-compilers.com>
+Date: Thu, 7 Nov 2019 22:16:36 +0000
+Subject: Stop helper only if formerly started.
+
+Differential Revision: https://phabricator.kde.org/D25161
+BUG: 413851
+---
+ src/util/externalcommand.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/util/externalcommand.cpp b/src/util/externalcommand.cpp
+index 30b98a2..6f45127 100644
+--- a/src/util/externalcommand.cpp
++++ b/src/util/externalcommand.cpp
+@@ -433,6 +433,8 @@ bool ExternalCommand::startHelper()
+
+ void ExternalCommand::stopHelper()
+ {
++ if (!helperStarted)
++ return;
+ auto *interface = new org::kde::kpmcore::externalcommand(QStringLiteral("org.kde.kpmcore.externalcommand"),
+ QStringLiteral("/Helper"), QDBusConnection::systemBus());
+ QByteArray request;
+@@ -441,6 +443,7 @@ void ExternalCommand::stopHelper()
+ QByteArray hash = QCryptographicHash::hash(request, QCryptographicHash::Sha512);
+ interface->exit(privateKey->signMessage(hash, QCA::EMSA3_Raw), nonce);
+
++ helperStarted = false;
+ delete privateKey;
+ delete init;
+ }
+--
+cgit v1.1
+
diff --git a/user/kpmcore/test.patch b/user/kpmcore/test.patch
new file mode 100644
index 000000000..35b83452a
--- /dev/null
+++ b/user/kpmcore/test.patch
@@ -0,0 +1,140 @@
+From c9a08a593bac8b8610a647db118fea6f2958156d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
+Date: Thu, 7 Nov 2019 22:12:00 +0000
+Subject: Remove broken smart unit test.
+
+BUG: 413853
+---
+ test/CMakeLists.txt | 9 -----
+ test/testsmart.cpp | 102 ----------------------------------------------------
+ 2 files changed, 111 deletions(-)
+ delete mode 100644 test/testsmart.cpp
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 67f63a2..6a300d3 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -53,12 +53,3 @@ find_package (Threads)
+ # Execute external commands as root
+ kpm_test(testexternalcommand testexternalcommand.cpp)
+ add_test(NAME testexternalcommand COMMAND testexternalcommand ${BACKEND})
+-
+-# Including SMART files reference
+-set(SMARTPARSER ${CMAKE_SOURCE_DIR}/src/core/smartdiskinformation.cpp
+- ${CMAKE_SOURCE_DIR}/src/core/smartattributeparseddata.cpp
+- ${CMAKE_SOURCE_DIR}/src/core/smartparser.cpp)
+-
+-# Test SMART support
+-kpm_test(testsmart testsmart.cpp ${SMARTPARSER})
+-add_test(NAME testsmart COMMAND testsmart ${BACKEND})
+diff --git a/test/testsmart.cpp b/test/testsmart.cpp
+deleted file mode 100644
+index 2236af7..0000000
+--- a/test/testsmart.cpp
++++ /dev/null
+@@ -1,102 +0,0 @@
+-#include "helpers.h"
+-
+-#include "util/externalcommand.h"
+-#include "backend/corebackend.h"
+-#include "backend/corebackendmanager.h"
+-#include "core/smartstatus.h"
+-#include "core/smartparser.h"
+-
+-#include <QCoreApplication>
+-#include <QDebug>
+-
+-static QString getDefaultDevicePath();
+-static bool testSmartStatus();
+-static bool testSmartParser();
+-
+-int main(int argc, char **argv)
+-{
+- QCoreApplication app(argc, argv);
+-
+- KPMCoreInitializer i;
+-
+- if (argc == 2)
+- i = KPMCoreInitializer(argv[1]);
+-
+- if (!i.isValid())
+- return 1;
+-
+- CoreBackend *backend = CoreBackendManager::self()->backend();
+-
+- if (!backend)
+- {
+- qWarning() << "Couldn't get backend.";
+- return 1;
+- }
+-
+- if (!testSmartStatus() || !testSmartParser())
+- return 1;
+-
+- return app.exec();
+-}
+-
+-static QString getDefaultDevicePath()
+-{
+- // Getting default home partition using 'df -P /home | awk 'END{print $1}'' command
+- ExternalCommand command(QStringLiteral("df"), { QStringLiteral("-P"), QStringLiteral("/home"), QStringLiteral("|"),
+- QStringLiteral("awk"), QStringLiteral("\'END{print $1}\'") });
+-
+- if (command.run() && command.exitCode() == 0) {
+- QString output = command.output();
+- return output;
+- }
+-
+- return QString();
+-}
+-
+-static bool testSmartStatus()
+-{
+- QString devicePath = getDefaultDevicePath();
+-
+- SmartStatus smart(devicePath);
+-
+- if (smart.devicePath() != devicePath)
+- return false;
+-
+- if (!smart.status())
+- return false;
+-
+- if (smart.modelName() == QString())
+- return false;
+-
+- if (smart.firmware() == QString())
+- return false;
+-
+- if (smart.serial() == QString())
+- return false;
+-
+- if (smart.selfTestStatus() != SmartStatus::SelfTestStatus::Success)
+- return false;
+-
+- if (!smart.isValid())
+- return false;
+-
+- return true;
+-}
+-
+-static bool testSmartParser()
+-{
+- QString devicePath = getDefaultDevicePath();
+-
+- SmartParser parser(devicePath);
+-
+- if (!parser.init())
+- return false;
+-
+- if (parser.devicePath() != devicePath)
+- return false;
+-
+- if (!parser.diskInformation())
+- return false;
+-
+- return true;
+-}
+--
+cgit v1.1
+
diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD
index b94683f2c..6104138c5 100644
--- a/user/kpty/APKBUILD
+++ b/user/kpty/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kpty
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for implementing terminal emulation"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="04b3ae8a2ff00219ad1e712b3f7ffa2fad95431bc67f6ed4a609dc93fc85fea357669f00dd0d8510392c3c9f938cb0ed7ab84c398827299ef530b8d29cdec592 kpty-5.65.0.tar.xz"
+sha512sums="313bd90f8cd168ae45f4ac101ee3a54987f43233b7acf6c92a234915eb887efb61c1f3765af2f45adf320f364eac8f76f3a7d5283cc21b3f8483192ebdc65c6a kpty-5.66.0.tar.xz"
diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD
index 37b1ba618..500b2ed84 100644
--- a/user/krdc/APKBUILD
+++ b/user/krdc/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=krdc
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="View and control remote desktops (RDP and VNC)"
url="https://www.kde.org/applications/internet/krdc/"
@@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules kcmutils-dev kdnssd-dev kiconthemes-dev
kcompletion-dev kwallet-dev kwidgetsaddons-dev knotifyconfig-dev
libvncserver-dev $depends_dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/krdc-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/krdc-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="45ce82235899e6b090fa3c2d015dfd9e80c436317fe3f288276dabad7568ec3caaba7225e2641dbc8084e71e31ee4a633cc91e6bc5dd9d91676fd4f5f7bc9db3 krdc-19.08.2.tar.xz"
+sha512sums="bf193164e21c509559c7bdbb064aa4273a1f9e0ca528f8b1ff98ff72fc980dd9b3b370d042ce8c222dc2360006175df996b9b9cb1a73b2842030ad40e533e3c2 krdc-19.12.1.tar.xz"
diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD
index 422e37922..39bf58a73 100644
--- a/user/kreversi/APKBUILD
+++ b/user/kreversi/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kreversi
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Reversi game"
url="https://games.kde.org/game.php?game=kreversi"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kdbusaddons-dev kdeclarative-dev ki18n-dev kiconthemes-dev kio-dev
kxmlgui-dev kwidgetsaddons-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kreversi-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kreversi-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="c32bc80bc05133cbf10c59cba7d661ecdf25d5119857219ff72f3f0e583e1c96995e42256aa784fbe26bb34f060c1782edc8d8071451e9a827ea71cdf19512a5 kreversi-19.08.2.tar.xz"
+sha512sums="24253f3bdcd1da5f59a118eb8422b645def3a0d458b57f35301ea67be3b1586cc551b69511317a48ca665ba27d5dadb436c9f2e2cf9ecbadeef9f1f08fe628de kreversi-19.12.1.tar.xz"
diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD
index 0c447fa07..054447fe1 100644
--- a/user/krfb/APKBUILD
+++ b/user/krfb/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=krfb
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Share your screen with others for remote watching or assistance"
url="https://www.kde.org/applications/system/krfb/"
@@ -13,10 +13,9 @@ makedepends="cmake qt5-qtbase-dev qt5-qtx11extras-dev extra-cmake-modules
kdbusaddons-dev kdnssd-dev kdoctools-dev knotifications-dev kwallet-dev
kwidgetsaddons-dev kxmlgui-dev xcb-util-image-dev libvncserver-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/krfb-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/krfb-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="dc1842ce4f3641d29e879f510f42a0fff1b83d2be18fa396fae113f0a3321195b56da2df32102dedaf5588eb57814d8d532a3a15ced889239c667d2220a32f82 krfb-19.08.2.tar.xz"
+sha512sums="95c3f3eb9734beb5991077ac1057066be392e59ede823c25ebef88067c2b7b1879db9d8cd2592a308cb544bbe262d58ac0b25f8e66578d19d18798fe51d5e964 krfb-19.12.1.tar.xz"
diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD
index 448b4561c..44dcca839 100644
--- a/user/krita/APKBUILD
+++ b/user/krita/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=krita
-pkgver=4.2.7.1
+pkgver=4.2.8.2
pkgrel=0
pkgdesc="Digital painting program by KDE"
url="https://krita.org/"
@@ -15,9 +15,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev
qt5-qtsvg-dev qt5-qtmultimedia-dev kcrash-dev libice-dev libx11-dev
libxcb-dev fftw-dev libpng-dev boost-dev tiff-dev libjpeg-turbo-dev
kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev
- libraw-dev quazip-dev"
+ libraw-dev quazip-dev giflib-dev poppler-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/krita/4.2.7/krita-$pkgver.tar.gz"
+source="https://download.kde.org/stable/krita/4.2.8/krita-$pkgver.tar.gz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -46,4 +46,4 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="e1ce1eb9e38d4dc9de3fb6d48a6b5364dad8da1782f3e5780949bed4d819ad1c70be62d5d61748bec04e18c7b46279d393e976e8f8209f35587eacd96b1a84ef krita-4.2.7.1.tar.gz"
+sha512sums="aab4096bef81a7205a04e3a4080d95ccbd1ba84a0cdb959fca8a0e6e7e8183f79857bde0b301dd9db642bd71042ef43b99768dbb7cd91d32e93df3da391d1a4b krita-4.2.8.2.tar.gz"
diff --git a/user/kronometer/APKBUILD b/user/kronometer/APKBUILD
index 37905401a..e06dcb3e8 100644
--- a/user/kronometer/APKBUILD
+++ b/user/kronometer/APKBUILD
@@ -25,7 +25,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/kross/APKBUILD b/user/kross/APKBUILD
index e87039f90..2888af16c 100644
--- a/user/kross/APKBUILD
+++ b/user/kross/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kross
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for scripting KDE applications"
url="https://www.kde.org/"
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="3a6b05c221aa2caad140b9c406181acd80822c896cd98a11574fd106b2388074899debf1c10941bc37f8c4ad7f2ffb2037fa2910b2b93723df21fd980f80ab19 kross-5.65.0.tar.xz"
+sha512sums="8b3a2876e367749a1f50aed6813521efa16e0551fec5fb8d57f5081bf4a1c27063f53c3c64efc85a986c77244a92bf8c8d4bf9fa38a886fd7b267f426ea9107d kross-5.66.0.tar.xz"
diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD
index e0faebf2b..dbd6d6ef1 100644
--- a/user/kruler/APKBUILD
+++ b/user/kruler/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kruler
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Screen ruler"
url="https://www.kde.org/applications/graphics/kruler/"
@@ -11,10 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev ki18n-dev
knotifications-dev kwindowsystem-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kruler-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kruler-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="88d45697d29a887b32a98a577fd438cdc2f73c23483522de3e3ee0ac9ee88977548ee423db827f94d69588ed929e54e1eee073f6a98045e7cabadd9323d740ab kruler-19.08.2.tar.xz"
+sha512sums="0ff1b66d098da6c5784858aa2de9a6c63aa6c6e7a88e563305271b74d8983b6e776cdb772a46c6418913b597a1597459718fa7a54653c0245f892ad5dfe8b248 kruler-19.12.1.tar.xz"
diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD
index 62709dbef..d99c173ee 100644
--- a/user/krunner/APKBUILD
+++ b/user/krunner/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=krunner
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Parallel query system"
url="https://api.kde.org/frameworks/krunner/html/index.html"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e85d75f2a79fbd778cda9bc3090efc78e93dcccae8383c189618a80a021188117aec12788dcfb47520d7bd56999b02862c4ad41213960722b4e4c33ed0493949 krunner-5.65.0.tar.xz"
+sha512sums="bcbc5e901797f7ca4fa3e9c3185941f38f87dc0ab6ae50c51e382e9440577e8b4eb133d503de0d41a0bcfa49df745997097c8ee008b56dfc7e6354b40df5d50c krunner-5.66.0.tar.xz"
diff --git a/user/krusader/APKBUILD b/user/krusader/APKBUILD
index d518e2996..6ca2b9d4b 100644
--- a/user/krusader/APKBUILD
+++ b/user/krusader/APKBUILD
@@ -28,7 +28,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -41,4 +41,4 @@ package() {
}
sha512sums="8af90a9067c7c92abc9dcc866e1eb1e1f1bd2a4c45968c260b6b01cc079d3125d6db6d49b530d90a2f91d3c99c577fa7f1ff47d12abc3400a75e2d52e7ae477b krusader-2.7.2.tar.xz
-6df1a858c896d91d2f09a0cf49a90177655cf21bd7fe18c5b82e0805f81d3c121978b932a2f139d2e0e4ca8d9741d181274b968628e905f87557b6ad43f05a59 posix-headers.patch"
+2114547837002e76fea1ed68bd47c8db216a7ba292817b2448497c45e8693441750a5e06ce24de188d0f04dc9c765c2cb5b83b04488a0a5247a481084f6091c0 posix-headers.patch"
diff --git a/user/krusader/posix-headers.patch b/user/krusader/posix-headers.patch
index c52d63656..898c514e7 100644
--- a/user/krusader/posix-headers.patch
+++ b/user/krusader/posix-headers.patch
@@ -1,6 +1,6 @@
--- krusader-2.6.0/krusader/FileSystem/krpermhandler.h.old 2017-04-11 12:32:08.000000000 -0500
+++ krusader-2.6.0/krusader/FileSystem/krpermhandler.h 2017-10-12 18:55:51.447922274 -0500
-@@ -39,6 +39,7 @@
+@@ -30,6 +30,7 @@
#include <KIO/Global>
@@ -10,7 +10,7 @@
#include <unistd.h>
--- krusader-2.6.0/krusader/DiskUsage/filelightParts/fileTree.h.old 2017-04-11 12:32:08.000000000 -0500
+++ krusader-2.6.0/krusader/DiskUsage/filelightParts/fileTree.h 2017-10-12 18:56:22.954502133 -0500
-@@ -23,6 +23,7 @@
+@@ -25,6 +25,7 @@
#include <KIO/Global>
diff --git a/user/kscreenlocker/APKBUILD b/user/kscreenlocker/APKBUILD
index e566e197e..626296d01 100644
--- a/user/kscreenlocker/APKBUILD
+++ b/user/kscreenlocker/APKBUILD
@@ -1,24 +1,26 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kscreenlocker
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Secure X11 screen locker"
url="https://www.kde.org/"
arch="all"
options="!check" # requires loginctl
license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+"
-depends="linux-pam"
+depends="consolekit2 linux-pam qdbus"
depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev
libxcb-dev libxcursor-dev libxext-dev libxi-dev linux-pam-dev
qt5-qtdeclarative-dev kcmutils-dev kcrash-dev kdeclarative-dev
kglobalaccel-dev ki18n-dev kidletime-dev knotifications-dev
- ktextwidgets-dev kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev"
+ ktextwidgets-dev kwayland-dev kwindowsystem-dev kxmlgui-dev solid-dev
+ consolekit2-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz
+source="https://download.kde.org/unstable/plasma/$pkgver/kscreenlocker-$pkgver.tar.xz
kde.pam
- kde-np.pam"
+ kde-np.pam
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -31,7 +33,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -45,6 +47,6 @@ package() {
install -m644 "$srcdir"/kde-np.pam "$pkgdir"/etc/pam.d/kde-np
}
-sha512sums="d389991d1af70c588c6918305649c6a5616a617fb7f010d7d5b3dfb5b97ec878069deef69676dbd8ac97a4f46b97c1a78b8b32980cafb49294e83021acd4c8f7 kscreenlocker-5.12.8.tar.xz
+sha512sums="8eb19f5b9cd23ec50ee460de8df248b404d12e6c176101da0d3c5f3080f242342edd713b546d03992cf942665937a7f5228ca021715f0904b77f6e804b77c50c kscreenlocker-5.17.90.tar.xz
56e87d02d75c4a8cc4ed183faed416fb4972e7f223b8759959c0f5da32e11e657907a1df279d62a44a6a174f5aca8b2ac66a5f3325c5deb92011bcf71eed74c3 kde.pam
565265485dd7466b77966d75a56766216b8bcc187c95a997e531e9481cf50ddbe576071eb0e334421202bcab19aa6de6b93e042447ca4797a24bf97e1d053ffd kde-np.pam"
diff --git a/user/kscreenlocker/optional-wayland.patch b/user/kscreenlocker/optional-wayland.patch
new file mode 100644
index 000000000..eee3cb10e
--- /dev/null
+++ b/user/kscreenlocker/optional-wayland.patch
@@ -0,0 +1,448 @@
+--- kscreenlocker-5.12.9/CMakeLists.txt.old 2019-09-10 10:30:52.000000000 +0000
++++ kscreenlocker-5.12.9/CMakeLists.txt 2019-12-29 16:39:31.945860585 +0000
+@@ -73,16 +73,16 @@
+
+ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS X11Extras)
+
+-find_package(KF5Wayland CONFIG REQUIRED)
++find_package(KF5Wayland)
+ set_package_properties(KF5Wayland PROPERTIES
+- TYPE REQUIRED
+- PURPOSE "Required for building screenlocker")
++ TYPE OPTIONAL
++ PURPOSE "Required for building Wayland screenlocker")
+ find_package(WaylandScanner)
+ find_package(Wayland 1.3 COMPONENTS Client Server)
+
+ set_package_properties(Wayland PROPERTIES
+- TYPE REQUIRED
+- PURPOSE "Required for building screenlocker")
++ TYPE OPTIONAL
++ PURPOSE "Required for building Wayland screenlocker")
+
+ find_package(loginctl)
+ set_package_properties(loginctl PROPERTIES
+@@ -138,9 +138,7 @@
+ interface.cpp
+ globalaccel.cpp
+ x11locker.cpp
+- waylandlocker.cpp
+ logind.cpp
+- waylandserver.cpp
+ powermanagement.cpp
+ powermanagement_inhibition.cpp
+ )
+@@ -149,10 +147,20 @@
+ kconfig_add_kcfg_files(ksld_SRCS kcfg/kscreensaversettings.kcfgc)
+ qt5_add_dbus_interface(ksld_SRCS ${powerdevilpolicyagent_xml} powerdevilpolicyagent)
+
++if(KF5Wayland_FOUND)
++list(APPEND ksld_SRCS
++ waylandlocker.cpp
++ waylandserver.cpp
++)
+ ecm_add_wayland_server_protocol(ksld_SRCS
+ PROTOCOL protocols/ksld.xml
+ BASENAME ksld
+ )
++set(OPT_WL_LIBRARIES
++ KF5::WaylandServer
++ Wayland::Server
++)
++endif(KF5Wayland_FOUND)
+
+ add_library(KScreenLocker SHARED ${ksld_SRCS})
+
+@@ -171,8 +179,7 @@
+ ${X11_LIBRARIES}
+ XCB::XCB
+ XCB::KEYSYMS
+- KF5::WaylandServer
+- Wayland::Server
++ ${OPT_WL_LIBRARIES}
+ )
+
+ if (X11_Xinput_FOUND)
+--- kscreenlocker-5.12.9/ksldapp.cpp.old 2019-09-10 10:30:16.000000000 +0000
++++ kscreenlocker-5.12.9/ksldapp.cpp 2019-12-29 17:00:37.930322855 +0000
+@@ -38,9 +38,11 @@
+ #include <KNotification>
+ #include <KGlobalAccel>
+
++#ifdef WAYLAND_FOUND
+ //kwayland
+ #include <KWayland/Server/display.h>
+ #include <KWayland/Server/clientconnection.h>
++#endif
+
+ // Qt
+ #include <QAction>
+@@ -84,8 +86,10 @@
+ , m_lockState(Unlocked)
+ , m_lockProcess(NULL)
+ , m_lockWindow(NULL)
++#ifdef WAYLAND_FOUND
+ , m_waylandServer(new WaylandServer(this))
+ , m_waylandDisplay(nullptr)
++#endif /* WAYLAND_FOUND */
+ , m_lockedTimer(QElapsedTimer())
+ , m_idleId(0)
+ , m_lockGrace(0)
+@@ -96,8 +100,12 @@
+ , m_greeterEnv(QProcessEnvironment::systemEnvironment())
+ , m_powerManagementInhibition(new PowerManagementInhibition(this))
+ {
++#ifdef WAYLAND_FOUND
+ m_isX11 = QX11Info::isPlatformX11();
+ m_isWayland = QCoreApplication::instance()->property("platformName").toString().startsWith( QLatin1String("wayland"), Qt::CaseInsensitive);
++#else
++ m_isX11 = true;
++#endif
+ }
+
+ KSldApp::~KSldApp()
+@@ -215,9 +223,11 @@
+ auto finishedSignal = static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished);
+ connect(m_lockProcess, finishedSignal, this,
+ [this](int exitCode, QProcess::ExitStatus exitStatus) {
++#ifdef WAYLAND_FOUND
+ if (m_isWayland && m_waylandDisplay && m_greeterClientConnection) {
+ m_greeterClientConnection->destroy();
+ }
++#endif /* WAYLAND_FOUND */
+ if ((!exitCode && exitStatus == QProcess::NormalExit) || s_graceTimeKill || s_logindExit) {
+ // unlock process finished successfully - we can remove the lock grab
+ s_graceTimeKill = false;
+@@ -240,7 +250,9 @@
+ [this](QProcess::ProcessError error) {
+ if (error == QProcess::FailedToStart) {
+ doUnlock();
++#ifdef WAYLAND_FOUND
+ m_waylandServer->stop();
++#endif /* WAYLAND_FOUND */
+ qCritical() << "Greeter Process not available";
+ }
+ }
+@@ -533,7 +545,9 @@
+ m_lockedTimer.invalidate();
+ m_greeterCrashedCounter = 0;
+ endGraceTime();
++#ifdef WAYLAND_FOUND
+ m_waylandServer->stop();
++#endif /* WAYLAND_FOUND */
+ KNotification::event(QStringLiteral("unlocked"),
+ i18n("Screen unlocked"),
+ QPixmap(),
+@@ -553,6 +567,7 @@
+ {
+ QProcessEnvironment env = m_greeterEnv;
+
++#ifdef WAYLAND_FOUND
+ if (m_isWayland && m_waylandDisplay) {
+ int sx[2];
+ if (socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0, sx) < 0) {
+@@ -576,6 +591,7 @@
+ env.insert("WAYLAND_SOCKET", QByteArray::number(socket));
+ }
+ }
++#endif /* WAYLAND_FOUND */
+ QStringList args;
+ if (establishLock == EstablishLock::Immediate) {
+ args << QStringLiteral("--immediateLock");
+@@ -596,6 +612,7 @@
+ env.insert(s_qtQuickBackend, QStringLiteral("software"));
+ }
+
++#ifdef WAYLAND_FOUND
+ // start the Wayland server
+ int fd = m_waylandServer->start();
+ if (fd == -1) {
+@@ -605,10 +622,13 @@
+
+ args << QStringLiteral("--ksldfd");
+ args << QString::number(fd);
++#endif /* WAYLAND_FOUND */
+
+ m_lockProcess->setProcessEnvironment(env);
+ m_lockProcess->start(QStringLiteral(KSCREENLOCKER_GREET_BIN), args);
++#ifdef WAYLAND_FOUND
+ close(fd);
++#endif
+ }
+
+ void KSldApp::showLockWindow()
+@@ -617,9 +637,11 @@
+ if (m_isX11) {
+ m_lockWindow = new X11Locker(this);
+ }
++#ifdef WAYLAND_FOUND
+ if (m_isWayland) {
+ m_lockWindow = new WaylandLocker(m_waylandDisplay, this);
+ }
++#endif /* WAYLAND_FOUND */
+ if (!m_lockWindow) {
+ return;
+ }
+@@ -637,7 +659,9 @@
+ lockScreenShown();
+ }
+ , Qt::QueuedConnection);
++#ifdef WAYLAND_FOUND
+ connect(m_waylandServer, &WaylandServer::x11WindowAdded, m_lockWindow, &AbstractLocker::addAllowedWindow);
++#endif /* WAYLAND_FOUND */
+ }
+ m_lockWindow->showLockWindow();
+ if (m_isX11) {
+@@ -702,12 +726,14 @@
+ }
+ }
+
++#ifdef WAYLAND_FOUND
+ void KSldApp::setWaylandDisplay(KWayland::Server::Display *display)
+ {
+ if (m_waylandDisplay != display) {
+ m_waylandDisplay = display;
+ }
+ }
++#endif /* WAYLAND_FOUND */
+
+ void KSldApp::lockScreenShown()
+ {
+@@ -723,9 +749,11 @@
+ void KSldApp::setGreeterEnvironment(const QProcessEnvironment &env)
+ {
+ m_greeterEnv = env;
++#ifdef WAYLAND_FOUND
+ if (m_isWayland) {
+ m_greeterEnv.insert(QStringLiteral("QT_QPA_PLATFORM"), QStringLiteral("wayland"));
+ }
++#endif /* WAYLAND_FOUND */
+ }
+
+ bool KSldApp::event(QEvent *event)
+--- kscreenlocker-5.12.9/autotests/CMakeLists.txt.old 2019-09-10 10:30:16.000000000 +0000
++++ kscreenlocker-5.12.9/autotests/CMakeLists.txt 2019-12-29 17:16:10.540254516 +0000
+@@ -55,6 +55,7 @@
+ add_test(ksmserver-x11LockerTest x11LockerTest)
+ ecm_mark_as_test(x11LockerTest)
+
++if(KF5Wayland_FOUND)
+ #######################################
+ # NoScreensTest
+ #######################################
+@@ -67,3 +68,4 @@
+ )
+ add_test(ksld-noScreensTest noScreensTest)
+ ecm_mark_as_test(noScreensTest)
++endif()
+--- kscreenlocker-5.12.9/greeter/greeterapp.cpp.old 2019-09-10 10:30:16.000000000 +0000
++++ kscreenlocker-5.12.9/greeter/greeterapp.cpp 2019-12-29 17:14:57.458241696 +0000
+@@ -26,6 +26,7 @@
+ #include "lnf_integration.h"
+
+ #include <config-kscreenlocker.h>
++#include <config-workspace.h>
+
+ // KDE
+ #include <KAuthorized>
+@@ -40,12 +41,14 @@
+ #include <KPackage/Package>
+ #include <KPackage/PackageStructure>
+ #include <KPackage/PackageLoader>
++#ifdef WAYLAND_FOUND
+ // KWayland
+ #include <KWayland/Client/connection_thread.h>
+ #include <KWayland/Client/event_queue.h>
+ #include <KWayland/Client/plasmashell.h>
+ #include <KWayland/Client/registry.h>
+ #include <KWayland/Client/surface.h>
++#endif
+ // Qt
+ #include <QClipboard>
+ #include <QAbstractNativeEventFilter>
+@@ -63,9 +66,11 @@
+ #include <QQmlExpression>
+
+ #include <QX11Info>
++#ifdef WAYLAND_FOUND
+ // Wayland
+ #include <wayland-client.h>
+ #include <wayland-ksld-client-protocol.h>
++#endif
+ // X11
+ #include <X11/Xatom.h>
+ #include <X11/Xlib.h>
+@@ -137,6 +142,7 @@
+ }
+ qDeleteAll(m_views);
+
++#ifdef WAYLAND_FOUND
+ if (m_ksldInterface) {
+ org_kde_ksld_destroy(m_ksldInterface);
+ }
+@@ -148,6 +154,7 @@
+ m_ksldConnectionThread->quit();
+ m_ksldConnectionThread->wait();
+ }
++#endif /* WAYLAND_FOUND */
+ }
+
+ Authenticator *UnlockApp::createAuthenticator()
+@@ -165,7 +172,10 @@
+
+ void UnlockApp::initialize()
+ {
++#ifdef WAYLAND_FOUND
+ initializeWayland();
++#endif /* WAYLAND_FOUND */
++
+ // set up the request ignore timeout, so that multiple requests to sleep/suspend/shutdown
+ // are not processed in quick (and confusing) succession)
+ m_resetRequestIgnoreTimer->setSingleShot(true);
+@@ -205,6 +215,7 @@
+ if (!platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) {
+ return;
+ }
++#ifdef WAYLAND_FOUND
+ using namespace KWayland::Client;
+ auto *c = ConnectionThread::fromApplication(this);
+ if (!c) {
+@@ -219,6 +230,7 @@
+ return;
+ }
+ m_plasmaShell = r->createPlasmaShell(i.name, i.version, this);
++#endif /* WAYLAND_FOUND */
+ }
+
+ void UnlockApp::loadWallpaperPlugin(KQuickAddons::QuickViewSharedEngine *view)
+@@ -281,6 +293,7 @@
+ }
+ }
+
++#ifdef WAYLAND_FOUND
+ if (m_ksldInterface) {
+ view->create();
+ org_kde_ksld_x11window(m_ksldInterface, view->winId());
+@@ -294,6 +307,7 @@
+ view->setProperty("plasmaShellSurface", QVariant::fromValue(shellSurface));
+ }
+ }
++#endif /* WAYLAND_FOUND */
+
+ // engine stuff
+ QQmlContext* context = view->engine()->rootContext();
+@@ -353,10 +367,14 @@
+
+ auto screen = QGuiApplication::screens()[i];
+ view->setGeometry(screen->geometry());
++#ifdef WAYLAND_FOUND
+ KWayland::Client::PlasmaShellSurface *plasmaSurface = view->property("plasmaShellSurface").value<KWayland::Client::PlasmaShellSurface *>();
+ if (plasmaSurface) {
+ plasmaSurface->setPosition(view->geometry().topLeft());
+ }
++#else
++ void *plasmaSurface = nullptr;
++#endif /* WAYLAND_FOUND */
+ if (auto object = view->property("wallpaperGraphicsObject").value<KDeclarative::QmlObjectSharedEngine*>()) {
+ //initialize with our size to avoid as much resize events as possible
+ object->completeInitialization({
+@@ -370,9 +388,11 @@
+ view,
+ [view, plasmaSurface](const QRect &geo) {
+ view->setGeometry(geo);
++#ifdef WAYLAND_FOUND
+ if (plasmaSurface) {
+ plasmaSurface->setPosition(view->geometry().topLeft());
+ }
++#endif /* WAYLAND_FOUND */
+ }
+ );
+
+@@ -477,6 +497,7 @@
+
+ void UnlockApp::suspendToRam()
+ {
++#ifdef WAYLAND_FOUND
+ if (m_ignoreRequests) {
+ return;
+ }
+@@ -485,11 +506,12 @@
+ m_resetRequestIgnoreTimer->start();
+
+ org_kde_ksld_suspendSystem(m_ksldInterface);
+-
++#endif /* WAYLAND_FOUND */
+ }
+
+ void UnlockApp::suspendToDisk()
+ {
++#ifdef WAYLAND_FOUND
+ if (m_ignoreRequests) {
+ return;
+ }
+@@ -498,6 +520,7 @@
+ m_resetRequestIgnoreTimer->start();
+
+ org_kde_ksld_hibernateSystem(m_ksldInterface);
++#endif /* WAYLAND_FOUND */
+ }
+
+ void UnlockApp::setTesting(bool enable)
+@@ -626,7 +649,7 @@
+ m_defaultToSwitchUser = defaultToSwitchUser;
+ }
+
+-
++#ifdef WAYLAND_FOUND
+ static void osdProgress(void *data, org_kde_ksld *org_kde_ksld, const char *icon, int32_t percent, const char *text)
+ {
+ Q_UNUSED(org_kde_ksld)
+@@ -657,9 +680,11 @@
+ canSuspend,
+ canHibernate
+ };
++#endif /* WAYLAND_FOUND */
+
+ void UnlockApp::setKsldSocket(int socket)
+ {
++#ifdef WAYLAND_FOUND
+ using namespace KWayland::Client;
+ m_ksldConnection = new ConnectionThread;
+ m_ksldConnection->setSocketFd(socket);
+@@ -697,6 +722,7 @@
+ m_ksldConnection->moveToThread(m_ksldConnectionThread);
+ m_ksldConnectionThread->start();
+ m_ksldConnection->initConnection();
++#endif /* WAYLAND_FOUND */
+ }
+
+ void UnlockApp::osdProgress(const QString &icon, int percent, const QString &additionalText)
+--- kscreenlocker-5.12.9/greeter/CMakeLists.txt.old 2019-09-10 10:30:16.000000000 +0000
++++ kscreenlocker-5.12.9/greeter/CMakeLists.txt 2019-12-29 17:29:44.832222068 +0000
+@@ -24,10 +24,16 @@
+ qt5_add_resources(kscreenlocker_greet_SRCS fallbacktheme.qrc)
+ kconfig_add_kcfg_files(kscreenlocker_greet_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../kcfg/kscreensaversettings.kcfgc)
+
++if(KF5Wayland_FOUND)
+ ecm_add_wayland_client_protocol(kscreenlocker_greet_SRCS
+ PROTOCOL ../protocols/ksld.xml
+ BASENAME ksld
+ )
++set(OPT_WL_CLI_LIBRARIES
++ KF5::WaylandClient
++ Wayland::Client
++)
++endif()
+
+ add_executable(kscreenlocker_greet ${kscreenlocker_greet_SRCS})
+
+@@ -43,8 +49,7 @@
+ Qt5::Qml
+ Qt5::X11Extras
+ ${X11_LIBRARIES}
+- KF5::WaylandClient
+- Wayland::Client
++ ${OPT_WL_CLI_LIBRARIES}
+ )
+ if(HAVE_SECCOMP)
+ target_link_libraries(kscreenlocker_greet Qt5::DBus Seccomp::Seccomp)
diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD
index 36e3d8cce..3635f907f 100644
--- a/user/kservice/APKBUILD
+++ b/user/kservice/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kservice
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for implementing plugins and services"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="70423e3bc1704c2fb1963ac13976c9b61c0371a9e267539390651cea5740790b852c852dfd6de4229892c77e26b2e26eaf8759f06b23e2fba66eab858fff6014 kservice-5.65.0.tar.xz"
+sha512sums="397ab3eb43aef0870e93864d6d45b1ae863dfc65275a041db0fb3d874d0535e7ed841a3ef437980d0cdc1c8351bac3f45d97e1cc432255a97ad79cb5ab7b6fcb kservice-5.66.0.tar.xz"
diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD
index b34334731..ff737d4e6 100644
--- a/user/kshisen/APKBUILD
+++ b/user/kshisen/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kshisen
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Mixture of Solitaire and Mah Jongg"
url="https://games.kde.org/game.php?game=kshisen"
@@ -11,10 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kdoctools-dev
kdbusaddons-dev kcrash-dev kxmlgui-dev libkdegames-dev libkmahjongg-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kshisen-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kshisen-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="9445b2cc87c483332fbce5f08235185c5f5db34a9ad7e1d30e7c770cad0ba77995b9c967725713e8ce1a8d32db856ac727ca96c171726d44b3d85fa10b1e60bb kshisen-19.08.2.tar.xz"
+sha512sums="f49db76abb81f7ac1a311a8282795ff398df98cd06ed03937bdbdca152cf6063a35a9cce1ad83044bc5986e0b95b37b6c610a5cd2a0df4330477e0b567bf5471 kshisen-19.12.1.tar.xz"
diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD
index b45542d0e..a60e44ff8 100644
--- a/user/ksirk/APKBUILD
+++ b/user/ksirk/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ksirk
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Strategy game from KDE"
url="https://www.kde.org/applications/games/ksirk/"
@@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev
knewstuff-dev kwallet-dev kwidgetsaddons-dev kxmlgui-dev
libkdegames-dev phonon-dev qca-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ksirk-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/ksirk-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="0ea7566e2de52424e568bba254e4380ce64b943fe212f7a877dc054ac871ff0daef8a9d592bd69fef140e2aacbc07c36244f83bde99b5da636452bf8ac3694c6 ksirk-19.08.2.tar.xz"
+sha512sums="a286d3a5e0f450883cd6c19c5d42e31fdc94228b936d7f74c8b7219243d4a8834f83d235e12229e0c7070ee6715ab75b7c1df09383c6e923b6474ff7ad125568 ksirk-19.12.1.tar.xz"
diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD
index 4c53a9c91..ba5cd6249 100644
--- a/user/ksnakeduel/APKBUILD
+++ b/user/ksnakeduel/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ksnakeduel
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Tron-like game"
url="https://www.kde.org/applications/games/ksnakeduel/"
@@ -13,9 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kdbusaddons-dev kguiaddons-dev kwidgetsaddons-dev kxmlgui-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ksnakeduel-$pkgver.tar.xz
- ridiculous-qt.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/ksnakeduel-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -28,7 +26,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -40,5 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ed410956fd369e5e2a170ba1e9fabc952f7d50ff5d1053cf570d39ce14d356e3da946b975ff3761f54ec50f47de049c48b9fc990795ab92a0f6f32b98a6b0d6e ksnakeduel-19.08.2.tar.xz
-8f21639ca5b17f6b0bd5d76c65fb59e29c9e8b6cceb95d2c86795b9f20d6d282926c75e0eaba2b1878a0bd9698c1d7326b549e4a2f8c7802254a1d516672fcbb ridiculous-qt.patch"
+sha512sums="32e807bc82c5c7d1a8c38ee7f93600e49ac9b7f10d3ad755b51c2c69c36cd6bcec182f63a7f54b1bf1f65cee102f6f45a1ef4812b44a2afd5d91934d1928f5f8 ksnakeduel-19.12.1.tar.xz"
diff --git a/user/ksnakeduel/ridiculous-qt.patch b/user/ksnakeduel/ridiculous-qt.patch
deleted file mode 100644
index 14cc95264..000000000
--- a/user/ksnakeduel/ridiculous-qt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ksnakeduel-19.08.0/CMakeLists.txt.old 2019-08-09 00:30:10.000000000 +0000
-+++ ksnakeduel-19.08.0/CMakeLists.txt 2019-08-15 13:12:41.473994535 +0000
-@@ -1,7 +1,7 @@
- cmake_minimum_required (VERSION 3.5 FATAL_ERROR)
- project(ksnakeduel)
-
--set (QT_MIN_VERSION "5.10.0")
-+set (QT_MIN_VERSION "5.9.0")
- set (KF5_MIN_VERSION "5.40.0")
-
- find_package(ECM ${KF5_MIN_VERSION} REQUIRED CONFIG)
diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD
index 37b63b1f8..1fb4dbce1 100644
--- a/user/kspaceduel/APKBUILD
+++ b/user/kspaceduel/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kspaceduel
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Space arcade game from KDE"
url="https://www.kde.org/applications/games/kspaceduel/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev
kdoctools-dev ki18n-dev kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kspaceduel-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kspaceduel-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="13e7391b50d371569882f599c408b476bfcd4fc6732f31d4e4554a38f82721cafcc94e6bed037dfaa5be33d24a635c1dea11f457db854c30a19001d1597c2633 kspaceduel-19.08.2.tar.xz"
+sha512sums="bf0fa2409d176af7648e950fbadde70ccfbe08d52d73415d024dda7d41e77f87ed02f806c8c23bffe770719140fcb1af79b6e839a3ec5b9a8b3883a2b8520348 kspaceduel-19.12.1.tar.xz"
diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD
index 76fb0c525..f3c758770 100644
--- a/user/ksquares/APKBUILD
+++ b/user/ksquares/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ksquares
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Fun and exciting game of Dots and Boxes"
url="https://games.kde.org/game.php?game=ksquares"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfigwidgets-dev
kconfig-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdoctools-dev
ki18n-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ksquares-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/ksquares-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="fcab0d15f48f0b72d005828ea014ede23c7ceb1949fada90580a9f83f7f6096a240612019080516c67496a99d1a831858c37a829eec864b90f42a5595bb9a711 ksquares-19.08.2.tar.xz"
+sha512sums="4c2e4b94b231210bc4ff9f035d14ab82d79f7816511e9a3c35ec8155b2a89aeb9454bc9d1738de786a1e4850a2b43a399590e94544f17ae6b3f30f2b69133ae2 ksquares-19.12.1.tar.xz"
diff --git a/user/ksshaskpass/APKBUILD b/user/ksshaskpass/APKBUILD
index 2bf88f6b0..30bf4b843 100644
--- a/user/ksshaskpass/APKBUILD
+++ b/user/ksshaskpass/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=ksshaskpass
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Plasma integration for SSH agents"
url="https://www.KDE.org/"
@@ -11,7 +11,7 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev
kdoctools-dev ki18n-dev kwallet-dev kwidgetsaddons-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/ksshaskpass-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/ksshaskpass-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -24,7 +24,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="31181cba266e8fe5bcb7c6ab988a213fefed7e3717af5780e90d69b519b2ef21647d69c60331e9c3745fdb8d9a6b61ae2f02a5573c1d908b8c3fc3cc812580b7 ksshaskpass-5.12.8.tar.xz"
+sha512sums="068847737ba1d5dc49158e1b5eff3e2c23d9573b0ee6868c986f7464d16703a807acf57dfde183395fcf29ef5b26f3b61d9f905a0c25b820f264780d40d21994 ksshaskpass-5.17.90.tar.xz"
diff --git a/user/kst/APKBUILD b/user/kst/APKBUILD
index d87b6e693..c47aa32e3 100644
--- a/user/kst/APKBUILD
+++ b/user/kst/APKBUILD
@@ -12,11 +12,12 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev gsl-dev"
subpackages="$pkgname-doc $pkgname-lang"
langdir="/usr/share/kst/locale"
source="https://downloads.sourceforge.net/project/kst/Kst%20$pkgver/Kst-$pkgver.tar.gz
- kst-gsl2.patch"
+ kst-gsl2.patch
+ qt5.patch
+ "
builddir="$srcdir/Kst-$pkgver"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,19 +30,18 @@ build() {
-DCMAKE_C_FLAGS="$CFLAGS" \
-Dkst_qt5="YesPlease" \
-Dkst_install_prefix="/usr" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
sha512sums="81be1e9ef189dbf087c5626b984297d4c8f84f22fce50c4933ea467a65f8595c0254af78d55f2b2e324934346f0758b7a0cf48d06d1108026b60b7ffba1221fb Kst-2.0.8.tar.gz
-1dbd94d7e4298d768ab1e9e020dd207b848e72b30db6b1f2ef2f3eb0d528ec5c0a120593e7e7c06f4cb1e59e950a965e217c30564a26510a180d82418628d4e5 kst-gsl2.patch"
+1dbd94d7e4298d768ab1e9e020dd207b848e72b30db6b1f2ef2f3eb0d528ec5c0a120593e7e7c06f4cb1e59e950a965e217c30564a26510a180d82418628d4e5 kst-gsl2.patch
+63705a561890792a1d3cced65075a46d0f507f5abf2599de6475491d7484bba3102152c8fe13a6d3c424e409e6b6070299208d09f74282137b6e95acc95df879 qt5.patch"
diff --git a/user/kst/qt5.patch b/user/kst/qt5.patch
new file mode 100644
index 000000000..64c5d3c40
--- /dev/null
+++ b/user/kst/qt5.patch
@@ -0,0 +1,47 @@
+From 9fc5140791ec00d6df2d65973f3ca61df17b1d47 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Sun, 3 Jun 2018 19:43:34 +0200
+Subject: Fix build with Qt 5.11
+
+Summary:
+- qt5_use_modules was removed in Qt 5.11. use target_link_libraries instead.
+- Add a missing #include
+
+Subscribers: kde-edu
+
+Tags: #kde_edu
+
+Differential Revision: https://phabricator.kde.org/D13339
+---
+ cmake/modules/KstMacros.cmake | 2 +-
+ src/libkstapp/view.h | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/KstMacros.cmake b/cmake/modules/KstMacros.cmake
+index 4ff9c15..bc3d8a6 100644
+--- a/cmake/modules/KstMacros.cmake
++++ b/cmake/modules/KstMacros.cmake
+@@ -240,7 +240,7 @@ endmacro()
+ macro(kst_link)
+ target_link_libraries(${kst_name} ${ARGV})
+ if(kst_qt5)
+- qt5_use_modules(${kst_name} Widgets Xml Network PrintSupport)
++ target_link_libraries(${kst_name} Qt5::Widgets Qt5::Xml Qt5::Network Qt5::PrintSupport)
+ else()
+ target_link_libraries(${kst_name}
+ ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSVG_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+diff --git a/src/libkstapp/view.h b/src/libkstapp/view.h
+index 95c8c6a..2af5393 100644
+--- a/src/libkstapp/view.h
++++ b/src/libkstapp/view.h
+@@ -14,6 +14,7 @@
+ #define VIEW_H
+
+ #include <QGraphicsView>
++#include <QMenu>
+
+ #include "kst_export.h"
+
+--
+cgit v1.1
+
diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD
index 9facccfaa..35fd0805d 100644
--- a/user/ksudoku/APKBUILD
+++ b/user/ksudoku/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ksudoku
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Desktop Sudoku (symbol placement / logic) game"
url="https://games.kde.org/game.php?game=ksudoku"
@@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kio-dev kjobwidgets-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev
glu-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ksudoku-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/ksudoku-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="e44f94eafe05915529358411f47d13855ce25cd65a6c722827aaf56b96ccb9ba07557047a7c71e1eebf5d00390187bed151877fd5a572bdf98c8864999fbe116 ksudoku-19.08.2.tar.xz"
+sha512sums="67785704427ad5ea80e3d7c586cbada6e1297b84bb09311593673213d7bd56abab8b6fa044a7dc07b30ac12e49d8eae73ea353f3d5d0a4c818934a635776eefa ksudoku-19.12.1.tar.xz"
diff --git a/user/ksysguard/0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch b/user/ksysguard/0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch
deleted file mode 100644
index 8828736f3..000000000
--- a/user/ksysguard/0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d6fa7c0ab6c3a6b1494ffd12b93ee5cc2e4d3d5c Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Mon, 18 Mar 2019 14:34:26 -0500
-Subject: [PATCH] Linux softraid: define _GNU_SOURCE for pipe2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In a strict POSIX compilation environment, pipe2 is not defined. Use
-the _GNU_SOURCE FTM to expose it.
-
-Fixes a failure to build ksysguard on Adélie Linux.
----
- ksysguardd/Linux/softraid.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ksysguardd/Linux/softraid.c b/ksysguardd/Linux/softraid.c
-index c2123fb7..96eb373e 100644
---- a/ksysguardd/Linux/softraid.c
-+++ b/ksysguardd/Linux/softraid.c
-@@ -27,6 +27,7 @@
- #include <sys/types.h> /* for open */
- #include <sys/stat.h> /* for open */
- #include <fcntl.h> /* for open */
-+#define _GNU_SOURCE /* pipe2 */
- #include <unistd.h> /* for read, close, exec, fork */
- #include <stdlib.h> /* for exit */
- #include <sys/wait.h> /* for wait :) */
---
-2.19.2
-
diff --git a/user/ksysguard/APKBUILD b/user/ksysguard/APKBUILD
index 54c227779..65fce4869 100644
--- a/user/ksysguard/APKBUILD
+++ b/user/ksysguard/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=ksysguard
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="KDE system monitor utility"
url="https://www.kde.org/"
@@ -13,9 +13,8 @@ makedepends="qt5-qtbase-dev kconfig-dev kcoreaddons-dev kdbusaddons-dev kio-dev
knotifications-dev kwindowsystem-dev libksysguard-dev
cmake extra-cmake-modules kdoctools-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/ksysguard-$pkgver.tar.xz
+source="https://download.kde.org/unstable/plasma/$pkgver/ksysguard-$pkgver.tar.xz
ksysguard-5.6.5-rindex-header.patch
- 0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch
"
build() {
@@ -29,7 +28,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -41,6 +40,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="9ea21ba61866f1b36f15f41011dfcab562ede45cc3403f030184680f6e3b0717fc5ac774089784a3d14015728c3b721887083154b32b786e804dfc1aace89585 ksysguard-5.12.8.tar.xz
-13a26451c459cff1d3b00af27c953d10c55e7e8f43ef7a6f0f54dd05dcb612546545c0170089e9499bb041f004cdacf19cb112d247a8ccf8fd4e77fea0d1c8bc ksysguard-5.6.5-rindex-header.patch
-0a424bb5e23f283d0cccfe86c0a6c2915f563a82e27a1dc16be8b4dc4b3d90ce116c4eb448dd1d5dc07602225468880206a5eb70c1b66d1e19e9a405fae7aa88 0001-Linux-softraid-define-_GNU_SOURCE-for-pipe2.patch"
+sha512sums="223a0ba86b9d7dbcb465245a500fa6c3106d40ea0010d8b5e3a34fd6a75c031f07bc8717f7309c45dceabb2b3cf1d5fc0aa0d73ff75eecdb03e54644e0c55cea ksysguard-5.17.90.tar.xz
+75e07b80c647bc6fdfb092ad3855813ef6bfe91b0ad03562dacfe4e680cfdee201364a2e452db162822045684635c1791ab2392c47d8e5c560c9e617a970cf39 ksysguard-5.6.5-rindex-header.patch"
diff --git a/user/ksysguard/ksysguard-5.6.5-rindex-header.patch b/user/ksysguard/ksysguard-5.6.5-rindex-header.patch
index 423da608c..7b900d751 100644
--- a/user/ksysguard/ksysguard-5.6.5-rindex-header.patch
+++ b/user/ksysguard/ksysguard-5.6.5-rindex-header.patch
@@ -1,6 +1,6 @@
--- ksysguard-5.6.5/ksysguardd/Linux/diskstat.c.old 2016-06-14 11:09:02.000000000 +0100
+++ ksysguard-5.6.5/ksysguardd/Linux/diskstat.c 2016-08-07 02:51:53.101362572 +0100
-@@ -24,6 +24,7 @@
+@@ -26,6 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD
index b5d4f4d91..427f5210d 100644
--- a/user/ksystemlog/APKBUILD
+++ b/user/ksystemlog/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ksystemlog
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Friendly, powerful system log viewer tool"
url="https://www.kde.org/applications/system/ksystemlog/"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kxmlgui-dev kconfig-dev
kcoreaddons-dev kwidgetsaddons-dev kitemviews-dev kio-dev karchive-dev
kdoctools-dev ki18n-dev kcompletion-dev ktextwidgets-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ksystemlog-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/ksystemlog-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="9e97b16fceb7052427a61b22e71cb479c4e470868b263e7fe5747e8bcf69a5e676ae3ea2fde8532edc289bd487e86169625b445c72c1fb3a4771fc195fc254d1 ksystemlog-19.08.2.tar.xz"
+sha512sums="5ccd4f31f901a3b62bf3d72c7924dba9aaf69b5f927d04574ef88afdbfb56138dfdd50a906828833c1784d706aae6c0978ea2cc42c1e7a08d3f916e13419cdc6 ksystemlog-19.12.1.tar.xz"
diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD
index b0589b6f1..f5247174f 100644
--- a/user/kteatime/APKBUILD
+++ b/user/kteatime/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kteatime
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Steep responsibly"
url="https://www.kde.org/applications/games/kteatime/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev
kdoctools-dev ki18n-dev kiconthemes-dev knotifyconfig-dev kxmlgui-dev
knotifications-dev ktextwidgets-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kteatime-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kteatime-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="d0bd3b972ebf0539cf3bc22dc7bb5a0660bb99d75664ff2974a4da92de8bdd4bdc24925e6186e270794e7b4e21c47be71fc53f03b4aeb48d70464056dcb02f55 kteatime-19.08.2.tar.xz"
+sha512sums="dde03a9f99013f6a5fbf58eeee4600d994f5a442a6332b4327270926eb2650d74e4da6c8bfad9a29f37126da6528cf3a308040ed27251b7663154231859725a5 kteatime-19.12.1.tar.xz"
diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD
index 143405fdc..83dad6dbd 100644
--- a/user/ktexteditor/APKBUILD
+++ b/user/ktexteditor/APKBUILD
@@ -1,13 +1,13 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ktexteditor
-pkgver=5.54.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Reusable, programmable text editor widget"
url="https://www.kde.org/"
arch="all"
options="!check" # Requires running X11 session.
-license="LGPL-2.1-only AND LGPL-2.1+ AND (LGPL-2.1-only OR LGPL-3.0-only)"
+license="LGPL-2.1+ AND (LGPL-2.1-only OR LGPL-3.0-only)"
depends=""
depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtxmlpatterns-dev
karchive-dev kconfig-dev kguiaddons-dev ki18n-dev kio-dev kparts-dev
@@ -22,7 +22,6 @@ source="https://download.kde.org/stable/frameworks/${pkgver%.*}/ktexteditor-$pkg
# - CVE-2018-10361
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -34,18 +33,16 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_QCH:BOOL=ON \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="8402fb036887ef853e455b4c80b3f4ff7fa6a65fc37e94d4fb2e94c09a59f2e49d7403dbf94aa3f2b2eb7ac6f43c5aede9aaa45ab5e9597a62b8a5d9b7ad0500 ktexteditor-5.54.0.tar.xz"
+sha512sums="a20c4ca0f8856ba78c24042d5692790e83816b96820cc94de673b66b5ce8b4880379cec330cd0f3235aab9ed3f12b44bef741e2e56da37419b38d22bfe69192a ktexteditor-5.66.0.tar.xz"
diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD
index ec427b893..cdf0157fb 100644
--- a/user/ktextwidgets/APKBUILD
+++ b/user/ktextwidgets/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ktextwidgets
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework providing widgets for text manipulation"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="56fb0da82d999ec3680eed58f7e69edd617f318fc1b9e1d6bd9dbc4d9c082bec64b5eed92cfacc062b8b77773e9575f257b3718f222cf6297e11814473f5ce03 ktextwidgets-5.65.0.tar.xz"
+sha512sums="b3cf365c7b2faf15366041488348d96a2bb9a3c8df508a913fab43b81f84db9cddcf795dfda5e0018091bad96e10a2b0c4073dbb80d0eb528fe52867765e4fb8 ktextwidgets-5.66.0.tar.xz"
diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD
index 0ab9de2a3..ca2592b4b 100644
--- a/user/ktimer/APKBUILD
+++ b/user/ktimer/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ktimer
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Tool to execute programs after some time"
url="https://www.kde.org/applications/utilities/ktimer/"
@@ -11,10 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev ki18n-dev
kwidgetsaddons-dev kio-dev kdbusaddons-dev knotifications-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ktimer-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/ktimer-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="60e2c16b9fa44bbd9e7cca3a487d9a78d572c1cd20e09782735fc30c586b82691736be2a30c21e07a893856b1c9a02f432bcce00a123219bd857e988bc477ea7 ktimer-19.08.2.tar.xz"
+sha512sums="48216e36ad22d0133e92e4bfcbf2cf1a182664a4fbe7138df93444b7b34407b922862a85b1b63e34ce1303594c2e866311944c9e7658d848907eb7fca85b0b76 ktimer-19.12.1.tar.xz"
diff --git a/user/ktorrent/APKBUILD b/user/ktorrent/APKBUILD
index 0a5a81798..d64205f64 100644
--- a/user/ktorrent/APKBUILD
+++ b/user/ktorrent/APKBUILD
@@ -29,7 +29,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD
index 5917a97cc..c23afae71 100644
--- a/user/ktouch/APKBUILD
+++ b/user/ktouch/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ktouch
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Touch typing tutor"
url="https://www.kde.org/applications/education/ktouch/"
@@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtxmlpatterns-dev
ktextwidgets-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev
libx11-dev libxcb-dev libxkbfile-dev qt5-qtquickcontrols2-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ktouch-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/ktouch-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -27,7 +27,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="46438ec9cb3c45dec0156c13fb780b87b3ce7c3f9272435f0d6b634db7955a1f9fb33384333d42c353f2ac1d91bd3adc725b2eb39b9de1345d7a95780c573fa6 ktouch-19.08.2.tar.xz"
+sha512sums="500bb77747d08ef99f9363d12b679ae1a93a54880c1a51e9a33e289ea59b0c20dd62027c9bf410910a3c6bd2bb72acbcaf2ae7dcc3bcefb23382b6dc1feb4d72 ktouch-19.12.1.tar.xz"
diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD
index 6f7cd7e68..4dd2636b0 100644
--- a/user/ktuberling/APKBUILD
+++ b/user/ktuberling/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=ktuberling
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Simple constructor game"
url="https://games.kde.org/game.php?game=ktuberling"
@@ -13,12 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kdbusaddons-dev kdelibs4support-dev kwidgetsaddons-dev kxmlgui-dev
libkdegames-dev qt5-qtmultimedia-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/ktuberling-$pkgver.tar.xz
- frameworks.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/ktuberling-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,19 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="6a5ae8be1804ca90853a0d56cd86f42bc1f6260066d0c6244b6838eb5a86a2d564adae3f0d8def677001dfe3007b2f74831731b57be4b42911a9eb6d0ed28b31 ktuberling-19.08.2.tar.xz
-a8c723302d141ff74a10cc38245524d59a51d476159c2ac46a1694747ddcb078abc42cea80cf5a5d3910c96c0c90fb7dbf82786496f03b4438a23a736a784e76 frameworks.patch"
+sha512sums="311da153375bb309ed0a42f1188ee743aee84e363f19000d2b72446a71a8ec3bff19ee713d4e9de431e5bfe9207f945a98650fff99cc8416abcc2b03f33f50bb ktuberling-19.12.1.tar.xz"
diff --git a/user/ktuberling/frameworks.patch b/user/ktuberling/frameworks.patch
deleted file mode 100644
index 7f03b5874..000000000
--- a/user/ktuberling/frameworks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ktuberling-19.04.0/CMakeLists.txt.old 2019-04-12 00:10:28.000000000 +0000
-+++ ktuberling-19.04.0/CMakeLists.txt 2019-04-18 21:18:28.795796335 +0000
-@@ -2,7 +2,7 @@
-
- cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)
- set (QT_MIN_VERSION "5.3.0")
--set (KF5_MIN_VERSION "5.55.0")
-+set (KF5_MIN_VERSION "5.54.0")
-
- find_package(ECM 1.7.0 REQUIRED CONFIG)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD
index 8432052ac..9738ef559 100644
--- a/user/kturtle/APKBUILD
+++ b/user/kturtle/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kturtle
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Educational programming environment"
url="https://www.kde.org/applications/education/kturtle/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kcrash-dev
kio-dev knewstuff-dev kdoctools-dev ktextwidgets-dev ki18n-dev
kcoreaddons-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kturtle-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kturtle-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="91348b26842469ce8287828649f701ca3723048a943837fcb18febef94fbd95a48e9500da0cffd4ff0c8b9e35db5c7d50e10900e0e10e47e2c95bb7d633977cc kturtle-19.08.2.tar.xz"
+sha512sums="a67f981d26db1a28d4cb722426f6f4c70ce452ed904d1f40b5a79d5bbfb6f091d80593f48fa9bc4d847ff8b63c08d8440c220ad686c172d0d4df50e39c5403d4 kturtle-19.12.1.tar.xz"
diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD
index a9a5026ac..78ef34dc5 100644
--- a/user/kubrick/APKBUILD
+++ b/user/kubrick/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kubrick
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="3D cube puzzle solving game"
url="https://www.kde.org/applications/games/kubrick/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev
kio-dev kwidgetsaddons-dev kxmlgui-dev libkdegames-dev glu-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kubrick-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kubrick-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="52163d9cfb04033309f5a16c68d92d13be61ecb97f12c2377a3274d4d8ca439b68cae13ee92a45dc2b0b9117e8d450a414e5eb0cecf3ae825c7fe2886af38a5d kubrick-19.08.2.tar.xz"
+sha512sums="a65432e6d8f52a2ee8b4023a1282ce7141ddd5470c394bd399315fe30fdb3122e19a7bf7806b959e5114fa39defd36397294686e70b9713e400e5fde9497be3d kubrick-19.12.1.tar.xz"
diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD
index b87cd6942..1fb79cf1d 100644
--- a/user/kunitconversion/APKBUILD
+++ b/user/kunitconversion/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kunitconversion
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Convert between metric and imperial"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="da9453809213de976c374e356b8f4824ba8559ef491fcfaa0da84996866794e3b8293c9a39a8c76a65b511eb16637e8ed590e0a3f0f46610255392fb1af585dc kunitconversion-5.65.0.tar.xz"
+sha512sums="9138b93710e950a36a007efa2a88fc2d065ad370ecb59e25ed515335cb59be309fcb2374a7207a72d124b9e21f8a6c33dd71a8cd5c76767fe89c01d9c8ec4750 kunitconversion-5.66.0.tar.xz"
diff --git a/user/kuserfeedback/APKBUILD b/user/kuserfeedback/APKBUILD
new file mode 100644
index 000000000..ce5f10b6b
--- /dev/null
+++ b/user/kuserfeedback/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kuserfeedback
+pkgver=0.9.90
+pkgrel=0
+pkgdesc="User feedback agent for KDE"
+url="https://www.kde.org/"
+arch="all"
+options="!check" # Requires X11.
+license="MIT"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
+ qt5-qtsvg-dev qt5-qttools-dev bison flex"
+subpackages="$pkgname-dev $pkgname-lang"
+source="https://download.kde.org/unstable/kuserfeedback/kuserfeedback-$pkgver.tar.xz"
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ ${CMAKE_CROSSOPTS} \
+ .
+ make
+}
+
+check() {
+ # Requires OpenGL accelerated desktop.
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E openglinfosourcetest
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="a4f5ee35d54479d0ed8c8e142c6d600a95f6a5e0179398953ef9e9b439b5f286ca90306577797478d53b07da258070710a442b227d6f70e4f2f372dd13b60aae kuserfeedback-0.9.90.tar.xz"
diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD
index f7f55d436..99241df89 100644
--- a/user/kwallet/APKBUILD
+++ b/user/kwallet/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kwallet
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Secure storage system for passwords built atop Qt"
url="https://www.kde.org/"
@@ -41,5 +41,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a73f5934cb63d306207540ff05ad4583353a98aeb59e3b8a0e94a7d0934511e4fe943b6761555c3105f8950b20e4143d484c8a5c068822327077cad6fec7fd90 kwallet-5.65.0.tar.xz
+sha512sums="7a1513ca64e0532d8a2ad73118a365b50dddf9751c13d7bb889db1683a08ae05d655fab15dc1496398eb650dde27c36796c76a19eb6e25c9397d13ca86a55f3b kwallet-5.66.0.tar.xz
edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179 kwallet-5.22.0-blowfish-endianness.patch"
diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD
index 4025954ef..17c341a64 100644
--- a/user/kwalletmanager/APKBUILD
+++ b/user/kwalletmanager/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kwalletmanager
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Manage KDE wallets"
url="https://www.kde.org/applications/system/kwalletmanager5"
@@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kauth-dev
knotifications-dev kservice-dev ktextwidgets-dev kwallet-dev kcrash-dev
kwindowsystem-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kwalletmanager-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kwalletmanager-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="2cfcd8d72f686fcc808c15ee84b62ab6ac8b6955c4c194d017e9c76991e96638eceb7f4a6e538eb8b3d5cb9d8df7c0717cbc2e3ce48b244de8a4bbcafd4dbec0 kwalletmanager-19.08.2.tar.xz"
+sha512sums="f56de8ff45f34ad39f591e5b2cc79fd8d08e8e4fb5ede10be278acbd16bdaef10afd12a41988700985e2d253970b889db3083219c05cc1e3d50888768fc8e23f kwalletmanager-19.12.1.tar.xz"
diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD
index b17c45774..51d4b79ca 100644
--- a/user/kwave/APKBUILD
+++ b/user/kwave/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kwave
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Sound editor built for KDE"
url="http://kwave.sourceforge.net/"
@@ -15,13 +15,12 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtmultimedia-dev
audiofile-dev libsamplerate-dev alsa-lib-dev pulseaudio-dev flac-dev
id3lib-dev libmad-dev opus-dev libvorbis-dev fftw-dev librsvg-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kwave-$pkgver.tar.xz
+source="https://download.kde.org/stable/release-service/$pkgver/src/kwave-$pkgver.tar.xz
es-doc-fix.patch
remove-msgcat.patch
"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -33,20 +32,18 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DWITH_OSS=OFF \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="f282730973c6568997b732b1dce82c4e0426f460b3f14627a21045bc65a76b190f6da83828280d89f8f727a887dcbd7b3c0f005c77956f32b901724e0de888d0 kwave-19.08.2.tar.xz
+sha512sums="114619d52ffbd8edbfce80ddad7357c8ea8b66a07f75e80416eb2c8d12615313d22f0bd26bc55c0eaec2b07256fcc8af87faf6e80e3542b500c039de24fdf705 kwave-19.12.1.tar.xz
63afd083727fd28436c2a8071429ba95fe4342c11669a4e27afc30b8a088b981f284fcff13861d5ef01a6f97152b25eec1fbeb303c9bdd76707e44ff5978dab8 es-doc-fix.patch
43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch"
diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD
index 63d5ae8fc..0cc8c523a 100644
--- a/user/kwayland/APKBUILD
+++ b/user/kwayland/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kwayland
-pkgver=5.54.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Qt wrapper libraries for Wayland"
url="https://www.kde.org/"
@@ -11,12 +11,11 @@ license="LGPL-2.1-only OR LGPL-3.0-only"
depends=""
depends_dev="qt5-qtbase-dev wayland-dev"
makedepends="$depends_dev cmake extra-cmake-modules doxygen graphviz
- qt5-qttools-dev"
+ qt5-qttools-dev wayland-protocols"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kwayland-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_QCH:BOOL=ON \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="8b6eaa2f57b09857447f702e2e0f253413edd6938459d407437aac7dddf1313002f6c4c4f32df861c723479fdf4642084a360cd6406729cb42c627f488ac6aa7 kwayland-5.54.0.tar.xz"
+sha512sums="dfc04e3b31594dbb9c8f232717353037f9d55fd558308d702b20a7a6ece337e9da0a1f422bec53d3893e9360c298d47314247338dda10c41a5c32f0f6314432b kwayland-5.66.0.tar.xz"
diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD
index cc2587b42..30a9473ee 100644
--- a/user/kwidgetsaddons/APKBUILD
+++ b/user/kwidgetsaddons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kwidgetsaddons
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework containing ready-made widgets for common tasks"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="4a735697794712373de5f8bf149ae234445f88f9df105c9ab3c93f398cec382a1f6e997654ca8ac808cf8f0df351343ffb41ac5b24bcb7ccf672efa49fc3219a kwidgetsaddons-5.65.0.tar.xz"
+sha512sums="b1205337c031d73eb97a4fac1eb9398237c51e2e6df2429ad5a001c7857614eb908ee23ccc28d162a86b11f0fe6883f45dd15e706f151fdb42a3eea7568bb373 kwidgetsaddons-5.66.0.tar.xz"
diff --git a/user/kwin/APKBUILD b/user/kwin/APKBUILD
index 02c40e3c0..5a048d986 100644
--- a/user/kwin/APKBUILD
+++ b/user/kwin/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=kwin
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Modern, stylish window manager (requires OpenGL)"
url="https://www.kde.org/"
@@ -14,17 +14,17 @@ depends_dev="qt5-qtbase-dev libepoxy-dev libxcb-dev kconfig-dev kcoreaddons-dev
makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev python3
qt5-qtdeclarative-dev qt5-qtscript-dev qt5-qtsensors-dev eudev-dev
qt5-qtmultimedia-dev qt5-qtx11extras-dev fontconfig-dev freetype-dev
- libdrm-dev libinput-dev libx11-dev libxkbcommon-dev mesa-dev
+ libdrm-dev libinput-dev libx11-dev libxi-dev libxkbcommon-dev mesa-dev
wayland-dev xcb-util-cursor-dev xcb-util-image-dev xcb-util-wm-dev
- breeze-dev kactivities-dev kcompletion-dev kconfigwidgets-dev
- kcmutils-dev kcrash-dev kdeclarative-dev kdecoration-dev
+ breeze breeze-dev kactivities-dev kcompletion-dev kconfigwidgets-dev
+ kcmutils-dev kcrash-dev kdeclarative-dev kdecoration-dev kirigami2-dev
kglobalaccel-dev ki18n-dev kiconthemes-dev kidletime-dev kinit-dev
kio-dev knewstuff-dev knotifications-dev kpackage-dev kscreenlocker-dev
kservice-dev ktextwidgets-dev kwayland-dev kwidgetsaddons-dev
- kxmlgui-dev plasma-framework-dev"
+ kxmlgui-dev plasma-framework-dev qt5-qtvirtualkeyboard-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/kwin-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/kwin-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -37,7 +37,8 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ -DBUILD_TESTING=OFF \
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -49,4 +50,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="56b4cb7ffb8df382fbea7c21cff529241e9cf124d97f08ec94dff8d91bcdb8df43c5d1471b63bf608594d23cb430e79ee96ebc25b75233105a3f8750c7f46fd0 kwin-5.12.8.tar.xz"
+sha512sums="f7a1fa4cc1dfd333d7de26ad5aa76c01358111980cd5d818b1eae1609c82de45c2ea682936db79083b1000a1384f01559a86c3822ecb039a61798f81d7b03a63 kwin-5.17.90.tar.xz"
diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD
index 622ebdaf8..4cab1422e 100644
--- a/user/kwindowsystem/APKBUILD
+++ b/user/kwindowsystem/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kwindowsystem
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for introspecting the running X11 window manager"
url="https://www.kde.org/"
@@ -40,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="29a6edcbd28f84b997d372144d2a25fa608adc28f8d1cfdbcc129bf5a852da3882d0abe05ae2b57d3c07f571a76323b16e120fa6e6b453b3620f8a7278a60c13 kwindowsystem-5.65.0.tar.xz"
+sha512sums="e36703eba7f58d1df58c90b1420b6065e27ef3014c9e73b8abf3420b5783f16a79b8e48c9df117864735d4240042e997d1d5dd47990f398af9de9cd323fab69c kwindowsystem-5.66.0.tar.xz"
diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD
index e4f1435d6..305172e23 100644
--- a/user/kwordquiz/APKBUILD
+++ b/user/kwordquiz/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kwordquiz
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Flash card trainer for KDE"
url="https://www.kde.org/applications/education/kwordquiz/"
@@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev kcrash-dev
knotifications-dev kxmlgui-dev kdelibs4support-dev
libkeduvocdocument-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/kwordquiz-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/kwordquiz-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="c8eec15289a8c7cbb11896cc3fd6178e113dad105439e0e1040ec0e919a84efc46ca4565a9a50526d7b222ef10022a130d99c4269b7073f4bd5f49dde3c8fda1 kwordquiz-19.08.2.tar.xz"
+sha512sums="142bc7633bd584bbd3c99f192725c58b9db652a30021b4ffcbc13fb678c1041321ac4f36b63bd9e67499a7e5e1779922327cd46a2f9775047ee82399dcce36ca kwordquiz-19.12.1.tar.xz"
diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD
index 6b9a3ae41..dbbdf57f2 100644
--- a/user/kxmlgui/APKBUILD
+++ b/user/kxmlgui/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kxmlgui
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for creating user interfaces using XML"
url="https://www.kde.org/"
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="582170f9b2dc5a5e67ced58732cdbcf9a381a4fe3856365c43ac5785e3f9f05d20ed6c423615210dd6c6ef334d9f94bfc896b67c0010b6bdd2372e31e5cab9de kxmlgui-5.65.0.tar.xz"
+sha512sums="325e055943ff5cf733cb792136652e07c4576511aee2cd4a91a1a108df8c7946d6c21e8cb5133e3587309dd528bc4c6c3a4a01cfe914574eaae90e37ebf951e9 kxmlgui-5.66.0.tar.xz"
diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD
index e05d4c5aa..f1fa4889c 100644
--- a/user/kxmlrpcclient/APKBUILD
+++ b/user/kxmlrpcclient/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=kxmlrpcclient
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Qt library for writing XML-RPC clients"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a5bb9b58574b6f4b1257f668a16d2db9515f250210e799bb43bd8e0a47141709914663bae8c9ade28d0e4e1754b0417969d81e097cf1c75dba7176942de0a1d9 kxmlrpcclient-5.65.0.tar.xz"
+sha512sums="23ad2ca60bde4ad8beed9e13ecc6fa9cf5d596ff28e7e2f129a8b969d093aba4427c9671eb6efc7ea349be33d12f4cd73974cc6ea2fbba3631ba914dd84a1611 kxmlrpcclient-5.66.0.tar.xz"
diff --git a/user/labplot/APKBUILD b/user/labplot/APKBUILD
index 36b1f6940..468e8f1ab 100644
--- a/user/labplot/APKBUILD
+++ b/user/labplot/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=labplot
-pkgver=2.6
+pkgver=2.7.0
pkgrel=0
pkgdesc="Interactive tool for graphing and analysis of scientific data"
url="https://www.kde.org/applications/education/labplot2"
@@ -14,9 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kdoctools-dev ki18n-dev kiconthemes-dev kdelibs4support-dev kxmlgui-dev
knewstuff-dev ktextwidgets-dev kwidgetsaddons-dev gsl-dev fftw-dev
qt5-qtserialport-dev syntax-highlighting-dev bison libexecinfo-dev
- cantor-dev docbook-xsl"
+ cantor-dev docbook-xsl lz4-dev poppler-dev poppler-qt5-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/labplot/$pkgver.0/labplot-$pkgver.0.tar.xz"
+source="https://download.kde.org/stable/labplot/$pkgver/labplot-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -29,7 +29,7 @@ build() {
-DCMAKE_BUILD_TYPE=Debug \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -42,4 +42,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6ebc96b3cfb25ebd62a6631d8cca0d9574f84548c04271eb8a10ff3ef9ebbdd0bf842b9b6129a995953412c5e6f902440dc91dbaa01d97fc220d7f6b19dc46af labplot-2.6.0.tar.xz"
+sha512sums="73e10ed98694b7633e80ffa7745733392cf9ce36f45e4ef6432d661b015dd3e821ddc791223a32fa55115c68f0d82b90464080915f8bb55cd1907610151a2d0a labplot-2.7.0.tar.xz"
diff --git a/user/lesscpy/APKBUILD b/user/lesscpy/APKBUILD
index dba0fced1..00f5933d5 100644
--- a/user/lesscpy/APKBUILD
+++ b/user/lesscpy/APKBUILD
@@ -13,17 +13,14 @@ subpackages=""
source="lesscpy-$pkgver.tar.gz::https://github.com/lesscpy/lesscpy/archive/$pkgver.tar.gz"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py check
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/libaacs/APKBUILD b/user/libaacs/APKBUILD
index 6278e5c9f..11bb90c18 100644
--- a/user/libaacs/APKBUILD
+++ b/user/libaacs/APKBUILD
@@ -7,13 +7,12 @@ pkgdesc="Library to decrypt Advanced Access Content System content"
url="https://www.videolan.org/developers/libaacs.html"
arch="all"
license="LGPL-2.1+"
+depends=""
makedepends="bison flex libgcrypt-dev libgpg-error-dev"
subpackages="$pkgname-dev"
source="https://download.videolan.org/pub/videolan/libaacs/$pkgver/libaacs-$pkgver.tar.bz2"
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libao/APKBUILD b/user/libao/APKBUILD
index 425116964..581b5c148 100644
--- a/user/libao/APKBUILD
+++ b/user/libao/APKBUILD
@@ -8,12 +8,11 @@ arch="all"
options="!check" # No test suite.
license="GPL-2.0+"
depends=""
-makedepends="alsa-lib-dev autoconf automake pulseaudio-dev"
+makedepends="alsa-lib-dev autoconf automake libtool pulseaudio-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-pulse"
source="$pkgname-$pkgver.tar.gz::https://github.com/xiph/libao/archive/$pkgver.tar.gz"
build() {
- cd "$builddir"
./autogen.sh
./configure \
--build=$CBUILD \
@@ -25,7 +24,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libart-lgpl/APKBUILD b/user/libart-lgpl/APKBUILD
index 8eb73fdb3..ac519161e 100644
--- a/user/libart-lgpl/APKBUILD
+++ b/user/libart-lgpl/APKBUILD
@@ -11,17 +11,14 @@ depends=""
makedepends=""
subpackages="$pkgname-dev"
source="https://download.gnome.org/sources/libart_lgpl/2.3/libart_lgpl-$pkgver.tar.bz2"
-
builddir="$srcdir"/libart_lgpl-$pkgver
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -30,7 +27,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libass/APKBUILD b/user/libass/APKBUILD
index 3b9b22908..f39c95ee3 100644
--- a/user/libass/APKBUILD
+++ b/user/libass/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libass
pkgver=0.14.0
pkgrel=0
@@ -7,13 +7,12 @@ pkgdesc="Portable library for rendering (Advanced) Substation Alpha subtitles"
url="https://github.com/libass/libass"
arch="all"
license="ISC"
+depends=""
makedepends="freetype-dev fribidi-dev fontconfig-dev harfbuzz-dev"
subpackages="$pkgname-dev"
source="https://github.com/libass/libass/releases/download/$pkgver/libass-$pkgver.tar.xz"
-sha512sums="0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6 libass-0.14.0.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
+sha512sums="0f5fe5d7e662ee1d649981f829e5ef7a53457754f74faaed5679252a5a6769c8f267b6119cda922ebc6a8e5b5b331569f13813ac74881b4e94da7b2e8143a9e6 libass-0.14.0.tar.xz"
diff --git a/user/libavc1394/APKBUILD b/user/libavc1394/APKBUILD
index 5fd7c7ef6..a76d47301 100644
--- a/user/libavc1394/APKBUILD
+++ b/user/libavc1394/APKBUILD
@@ -8,22 +8,20 @@ url="https://sourceforge.net/projects/libavc1394/"
arch="all"
license="LGPL-2.1+"
depends=""
-makedepends="libraw1394-dev libtool automake autoconf"
-[ "$CLIBC" != "eglibc" ] && makedepends="$makedepends argp-standalone"
+makedepends="libraw1394-dev libtool automake autoconf argp-standalone"
subpackages="$pkgname-dev $pkgname-doc"
source="https://downloads.sourceforge.net/libavc1394/libavc1394-$pkgver.tar.gz
automake.patch
- argp.patch"
+ argp.patch
+ "
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
libtoolize && aclocal && autoconf && automake --add-missing
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -36,12 +34,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libayatana-indicator/APKBUILD b/user/libayatana-indicator/APKBUILD
index 4372a2b44..b2903c795 100644
--- a/user/libayatana-indicator/APKBUILD
+++ b/user/libayatana-indicator/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libayatana-indicator
-pkgver=0.6.2
+pkgver=0.6.3
pkgrel=0
pkgdesc="Gnome library implementing the StatusNotifierItem specification"
url="https://ayatanaindicators.github.io/"
@@ -9,18 +9,16 @@ arch="all"
options="!check" # incompetent test author
license="GPL-3.0-only"
depends=""
-makedepends="ayatana-ido-dev gtk+3.0-dev"
+makedepends="autoconf automake ayatana-ido-dev gtk+3.0-dev libtool"
subpackages="$pkgname-dev"
source="libayatana-indicator-$pkgver.tar.gz::https://github.com/AyatanaIndicators/libayatana-indicator/archive/$pkgver.tar.gz"
prepare() {
- cd "$builddir"
default_prepare
autoreconf -vif
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,13 +30,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" make -j1 install
}
-sha512sums="47a89a4f59d547e4aeeeba245ec7df360e18dc9f8a8c256cbeaf2a95e335f2734873457b2b0fdef8c2fdeaf780dda38cfe020c335a3447a2175914d580aeb8de libayatana-indicator-0.6.2.tar.gz"
+sha512sums="5cd78d228d7c2afef229fa06dc9b0778b06fc2752dee0192c65d5140afbc28533b9862bc62ddb27f61f9f8fb26dfb736403202b2b4f90622fe892c61d621b888 libayatana-indicator-0.6.3.tar.gz"
diff --git a/user/libbluray/APKBUILD b/user/libbluray/APKBUILD
index 99d2d0002..4357d589c 100644
--- a/user/libbluray/APKBUILD
+++ b/user/libbluray/APKBUILD
@@ -8,6 +8,7 @@ url="https://www.videolan.org/developers/libbluray.html"
arch="all"
options="!check" # Test requires an actual BD-ROM to play
license="LGPL-2.1+"
+depends=""
makedepends="fontconfig-dev libxml2-dev"
subpackages="$pkgname-dev"
source="https://download.videolan.org/pub/videolan/libbluray/$pkgver/libbluray-$pkgver.tar.bz2"
diff --git a/user/libburn/APKBUILD b/user/libburn/APKBUILD
index 254c2ea90..e6ff9bc25 100644
--- a/user/libburn/APKBUILD
+++ b/user/libburn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libburn
pkgver=1.5.2
pkgrel=0
@@ -7,12 +7,12 @@ pkgdesc="Library for CD/DVD burning"
url="https://dev.lovelyhq.com/libburnia/web/wikis/home"
arch="all"
license="(GPL-2.0+ OR BSD-3-Clause) AND GPL-2.0+ AND BSD-3-Clause"
+depends=""
makedepends=""
subpackages="$pkgname-dev $pkgname-doc"
source="http://files.libburnia-project.org/releases/libburn-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libcanberra/APKBUILD b/user/libcanberra/APKBUILD
index 756f8e3f7..43480cb26 100644
--- a/user/libcanberra/APKBUILD
+++ b/user/libcanberra/APKBUILD
@@ -16,13 +16,11 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk2 $pkgname-gtk3
source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.xz"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,7 +33,6 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
}
diff --git a/user/libcdr/APKBUILD b/user/libcdr/APKBUILD
index d39d55e93..afa20cb70 100644
--- a/user/libcdr/APKBUILD
+++ b/user/libcdr/APKBUILD
@@ -9,8 +9,8 @@ arch="all"
license="MPL-2.0"
depends=""
depends_dev="boost-dev"
-makedepends="$depends_dev doxygen icu-dev lcms2-dev zlib-dev librevenge-dev"
checkdepends="cppunit-dev"
+makedepends="$depends_dev doxygen icu-dev lcms2-dev zlib-dev librevenge-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
@@ -20,7 +20,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
diff --git a/user/libcmis/APKBUILD b/user/libcmis/APKBUILD
index bfc58c4d5..4917aab08 100644
--- a/user/libcmis/APKBUILD
+++ b/user/libcmis/APKBUILD
@@ -2,17 +2,19 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=libcmis
pkgver=0.5.2
-pkgrel=0
+pkgrel=1
pkgdesc="CMIS protocol client library for C/C++"
url="https://github.com/tdf/libcmis"
arch="all"
license="MPL-1.1 OR GPL-2.0+ OR LGPL-2.0+"
depends=""
depends_dev="boost-dev"
-makedepends="$depends_dev curl-dev libxml2-dev"
checkdepends="cppunit-dev"
+makedepends="$depends_dev curl-dev libxml2-dev"
subpackages="$pkgname-dev cmis-client:client"
-source="https://github.com/tdf/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://github.com/tdf/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
+ icu.patch
+ "
build() {
# Note: manpages require docbook2x to build
@@ -42,4 +44,5 @@ client() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr
}
-sha512sums="3dac0eed31d1dd3ac4670e501e0677196811f7875e6d1c253c8d874d6903691cbe4f1c27c8468af07bfd7f79b0d6ec4f933b28cb3bb37dcbea18bc2dd8f6e374 libcmis-0.5.2.tar.gz"
+sha512sums="3dac0eed31d1dd3ac4670e501e0677196811f7875e6d1c253c8d874d6903691cbe4f1c27c8468af07bfd7f79b0d6ec4f933b28cb3bb37dcbea18bc2dd8f6e374 libcmis-0.5.2.tar.gz
+0904a529eafa8e1cfdb673e4e7f37150b0b88886cdc32096a89153cb5856d16dc5fee52f39ae5bfea86065b20690a6e14e4b9ad11b36b682c062702b797e82cd icu.patch"
diff --git a/user/libcmis/icu.patch b/user/libcmis/icu.patch
new file mode 100644
index 000000000..6ba63ee7f
--- /dev/null
+++ b/user/libcmis/icu.patch
@@ -0,0 +1,17 @@
+--- a/inc/libcmis-c/repository.h 2018-12-27 14:07:55.000000000 +0100
++++ b/inc/libcmis-c/repository.h 2019-04-21 01:29:46.504373226 +0200
+@@ -28,12 +28,12 @@
+ #ifndef _REPOSITORY_H_
+ #define _REPOSITORY_H_
+
++#include <libxml/tree.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
+-#include <libxml/tree.h>
+-
+ #include "libcmis-c/libcmis-c-api.h"
+ #include "libcmis-c/types.h"
+
diff --git a/user/libconfig/APKBUILD b/user/libconfig/APKBUILD
index 8f5939f4e..bb85630e1 100644
--- a/user/libconfig/APKBUILD
+++ b/user/libconfig/APKBUILD
@@ -12,13 +12,11 @@ subpackages="$pkgname-doc $pkgname-dev $pkgname++:_cxx"
source="$pkgname-$pkgver.tar.gz::https://github.com/hyperrealm/$pkgname/archive/v$pkgver.tar.gz"
prepare() {
- cd "$builddir"
default_prepare
autoreconf -vif
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir/" install
}
diff --git a/user/libcue/APKBUILD b/user/libcue/APKBUILD
index e989d4e41..13fb38c44 100644
--- a/user/libcue/APKBUILD
+++ b/user/libcue/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/lipnitsk/libcue/archive/v$pkgver.tar.gz"
build() {
- cd "$builddir"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DBUILD_SHARED_LIBS=ON \
@@ -22,12 +21,10 @@ build() {
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libdc1394/APKBUILD b/user/libdc1394/APKBUILD
index d36d55a47..138f14cf7 100644
--- a/user/libdc1394/APKBUILD
+++ b/user/libdc1394/APKBUILD
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://downloads.sourceforge.net/project/libdc1394/libdc1394-2/$pkgver/libdc1394-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,7 +27,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libdca/APKBUILD b/user/libdca/APKBUILD
index 6ee2be1d5..aa4925405 100644
--- a/user/libdca/APKBUILD
+++ b/user/libdca/APKBUILD
@@ -8,11 +8,11 @@ url="https://www.videolan.org/developers/libdca.html"
arch="all"
license="GPL-2.0+"
depends=""
+makedepends=""
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.videolan.org/pub/videolan/libdca/$pkgver/libdca-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libdv/APKBUILD b/user/libdv/APKBUILD
index e3dfc12f8..a1293771c 100644
--- a/user/libdv/APKBUILD
+++ b/user/libdv/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://downloads.sourceforge.net/libdv/libdv-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libdvdcss/APKBUILD b/user/libdvdcss/APKBUILD
index 25e46df5e..27c8d14b1 100644
--- a/user/libdvdcss/APKBUILD
+++ b/user/libdvdcss/APKBUILD
@@ -5,13 +5,13 @@ pkgrel=0
pkgdesc="Library for accessing encrypted DVDs like a block device"
url="https://www.videolan.org/developers/libdvdcss.html"
arch="all"
-makedepends="file linux-headers"
license="GPL-2.0+"
+depends=""
+makedepends="file linux-headers"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.videolan.org/pub/libdvdcss/$pkgver/libdvdcss-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -21,12 +21,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libdvdnav/APKBUILD b/user/libdvdnav/APKBUILD
index d9fb2d5e4..832270be3 100644
--- a/user/libdvdnav/APKBUILD
+++ b/user/libdvdnav/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libdvdread/APKBUILD b/user/libdvdread/APKBUILD
index 879a36a29..295c93920 100644
--- a/user/libdvdread/APKBUILD
+++ b/user/libdvdread/APKBUILD
@@ -7,12 +7,12 @@ pkgdesc="Library for reading DVD video discs"
url="http://dvdnav.mplayerhq.hu/"
arch="all"
license="GPL-2.0+ AND LGPL-2.1+ AND GPL-2.0-only"
+depends=""
makedepends="libdvdcss-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.videolan.org/pub/videolan/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libe-book/APKBUILD b/user/libe-book/APKBUILD
index ee7097969..e1d509302 100644
--- a/user/libe-book/APKBUILD
+++ b/user/libe-book/APKBUILD
@@ -7,11 +7,13 @@ pkgdesc="Import filter and tools for various ebook formats"
url="https://sourceforge.net/projects/libebook/"
arch="all"
license="MPL-2.0"
-depends_dev="boost-dev librevenge-dev liblangtag-dev"
-makedepends="$depends_dev icu-dev libxml2-dev zlib-dev doxygen gperf"
+depends=""
+depends_dev="boost-dev"
checkdepends="cppunit-dev"
+makedepends="$depends_dev icu-dev liblangtag-dev librevenge-dev libxml2-dev
+ zlib-dev doxygen gperf"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="http://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2"
+source="https://downloads.sourceforge.net/project/libebook/libe-book-$pkgver/libe-book-$pkgver.tar.bz2"
prepare() {
default_prepare
@@ -19,7 +21,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +34,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libebml/APKBUILD b/user/libebml/APKBUILD
index 03b2e73d7..e9145cd5a 100644
--- a/user/libebml/APKBUILD
+++ b/user/libebml/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer:
pkgname=libebml
-pkgver=1.3.9
+pkgver=1.3.10
pkgrel=0
pkgdesc="Library to parse Extensible Binary Meta-Language files"
url="https://www.matroska.org/"
@@ -9,24 +9,23 @@ arch="all"
options="!check" # No test suite.
license="LGPL-2.1+"
depends=""
+makedepends="cmake"
subpackages="$pkgname-dev"
source="https://dl.matroska.org/downloads/$pkgname/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS"
+ -DCMAKE_C_FLAGS="$CFLAGS" .
make
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
}
-sha512sums="a388fa8ff7acf9a0fb33faf9c00fc07f53794d86a4f894e04e2a690a24e781a7f380a0896e607e801a6f1f0b215407ee09a801e96d4b3e15f39ca71ec3a6d64e libebml-1.3.9.tar.xz"
+sha512sums="c7ba20664161e811a10847f888a833abaa2b7a4d43ddbef6ae927f391f5d1eff45bc703f13a52ccfc793521e3b22cbac2fd93550cd95119a4060153683b29c49 libebml-1.3.10.tar.xz"
diff --git a/user/libepubgen/APKBUILD b/user/libepubgen/APKBUILD
index c8ac0d749..94ddc961a 100644
--- a/user/libepubgen/APKBUILD
+++ b/user/libepubgen/APKBUILD
@@ -8,13 +8,12 @@ url="https://sourceforge.net/projects/libepubgen/"
arch="all"
license="MPL-2.0"
depends=""
-makedepends="librevenge-dev libxml2-dev doxygen"
checkdepends="cppunit-dev"
+makedepends="librevenge-dev libxml2-dev doxygen"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libertine-fonts/APKBUILD b/user/libertine-fonts/APKBUILD
index bc202bf17..35845f1ae 100644
--- a/user/libertine-fonts/APKBUILD
+++ b/user/libertine-fonts/APKBUILD
@@ -12,11 +12,9 @@ depends="fontconfig"
makedepends=""
subpackages=""
source="https://downloads.sourceforge.net/linuxlibertine/LinLibertineOTF_${pkgver}_2012_07_02.tgz"
-builddir="$srcdir/"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ "$srcdir"/*.otf
}
sha512sums="a441a127fb56413a69de3a435f3c5870b53ef2d3b6c341f7bf14e112f90d698ed2e7f9b002e0fcf951b93fa7f29be229bd796f8679f0b610d06705f02e01a6c7 LinLibertineOTF_5.3.0_2012_07_02.tgz"
diff --git a/user/libetonyek/APKBUILD b/user/libetonyek/APKBUILD
index 1156482f8..18bed288e 100644
--- a/user/libetonyek/APKBUILD
+++ b/user/libetonyek/APKBUILD
@@ -7,10 +7,11 @@ pkgdesc="Import filter and tools for Apple iWork documents"
url="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
arch="all"
license="MPL-2.0"
+depends=""
depends_dev="glm boost-dev"
+checkdepends="cppunit-dev"
makedepends="$depends_dev librevenge-dev liblangtag-dev zlib-dev
libxml2-dev gperf doxygen mdds~1.4"
-checkdepends="cppunit-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/user/libexif/APKBUILD b/user/libexif/APKBUILD
index 71c9f7d06..de51ae7b0 100644
--- a/user/libexif/APKBUILD
+++ b/user/libexif/APKBUILD
@@ -11,7 +11,8 @@ depends=""
makedepends=""
source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
CVE-2017-7544.patch
- CVE-2018-20030.patch"
+ CVE-2018-20030.patch
+ "
# secfixes:
# 0.6.21-r3:
@@ -19,8 +20,8 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
# - CVE-2018-20030
prepare() {
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
diff --git a/user/libexttextcat/APKBUILD b/user/libexttextcat/APKBUILD
index 48fb2df18..e5fa3061e 100644
--- a/user/libexttextcat/APKBUILD
+++ b/user/libexttextcat/APKBUILD
@@ -8,13 +8,12 @@ url="https://wiki.documentfoundation.org/Libexttextcat"
arch="all"
license="BSD-3-Clause"
depends=""
-makedepends=""
checkdepends="bash"
+makedepends=""
subpackages="$pkgname-dev"
source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libfakekey/APKBUILD b/user/libfakekey/APKBUILD
index d8221c552..af08c494c 100644
--- a/user/libfakekey/APKBUILD
+++ b/user/libfakekey/APKBUILD
@@ -1,25 +1,23 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libfakekey
pkgver=0.3
pkgrel=0
-pkgdesc="Library for faking X key-presses from character inputs"
+pkgdesc="Library for faking X11 key presses from character inputs"
url="https://www.yoctoproject.org/software-item/matchbox/"
arch="all"
license="LGPL-2.0+"
depends=""
-makedepends="libx11-dev libxtst-dev"
+makedepends="autoconf automake libtool libx11-dev libxtst-dev"
subpackages="$pkgname-dev"
source="http://git.yoctoproject.org/cgit.cgi/libfakekey/snapshot/libfakekey-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
default_prepare
autoreconf -vif
}
build() {
- cd "$builddir"
LIBS="-lX11" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libfm-extra/APKBUILD b/user/libfm-extra/APKBUILD
index 775b4d322..5a8cb58fb 100644
--- a/user/libfm-extra/APKBUILD
+++ b/user/libfm-extra/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Library for generating menu caches"
url="https://wiki.lxde.org/en/PCManFM"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="glib-dev intltool"
subpackages="$pkgname-dev"
source="https://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz"
@@ -14,7 +15,6 @@ source="https://downloads.sourceforge.net/pcmanfm/libfm-$pkgver.tar.xz"
builddir="$srcdir/libfm-$pkgver"
build() {
- cd "$builddir"
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -24,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD
index 5412fccfc..62110c28a 100644
--- a/user/libfm-qt/APKBUILD
+++ b/user/libfm-qt/APKBUILD
@@ -1,11 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libfm-qt
pkgver=0.14.1
pkgrel=0
pkgdesc="Qt library for file management and bindings for libfm"
url="https://lxqt.org"
arch="all"
+options="!check" # No test suite.
license="LGPL-2.1+"
depends=""
depends_dev="libfm-dev menu-cache-dev libexif-dev"
@@ -15,11 +16,9 @@ subpackages="$pkgname-dev"
source="https://github.com/lxqt/libfm-qt/releases/download/$pkgver/libfm-qt-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -28,18 +27,16 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS -O0" \
-DCMAKE_C_FLAGS="$CFLAGS -O0" \
-DPULL_TRANSLATIONS=False \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir/build"
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir/build"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="a265f6831a077ccb78a994828e6c69a22f2f6432b1f6ed6f404af41f013112870f7aee98067f2c466bec6cdfea040c10c7ce7e0f0ed977e5d266ec38e543d2a7 libfm-qt-0.14.1.tar.xz"
diff --git a/user/libfm/APKBUILD b/user/libfm/APKBUILD
index ad75ec5d9..a32925320 100644
--- a/user/libfm/APKBUILD
+++ b/user/libfm/APKBUILD
@@ -7,6 +7,8 @@ pkgdesc="Library for file management"
url="https://wiki.lxde.org/en/PCManFM"
arch="all"
license="GPL-2.0+"
+depends=""
+depends_dev="libfm-extra-dev"
makedepends="dbus-glib-dev glib-dev gtk+2.0-dev intltool libexif-dev
libfm-extra-dev menu-cache-dev udisks2-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
@@ -15,7 +17,6 @@ source="https://downloads.sourceforge.net/pcmanfm/$pkgname-$pkgver.tar.xz
"
build() {
- cd "$builddir"
mv data/libfm.conf data/libfm.conf.sample
./configure \
--prefix=/usr \
@@ -26,13 +27,14 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
+ # this symlink breaks installation with -extra-dev,
+ # and extra is always required anyway
+ rm "$pkgdir"/usr/include/libfm
}
sha512sums="f385cf7bf2f4800c11dd6474cd20009cbe1208f1d08570b61954ea8bd84c56cc49880cbf84d4b2aa4b91eb6929d017ebc427649391059b786d7e6fc4535e4f14 libfm-1.3.1.tar.xz
diff --git a/user/libfreehand/APKBUILD b/user/libfreehand/APKBUILD
index b8371ac74..fc9354ab4 100644
--- a/user/libfreehand/APKBUILD
+++ b/user/libfreehand/APKBUILD
@@ -2,17 +2,19 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=libfreehand
pkgver=0.1.2
-pkgrel=2
+pkgrel=3
pkgdesc="Import filter and tools for Adobe FreeHand documents"
url="https://wiki.documentfoundation.org/DLP/Libraries/libfreehand"
arch="all"
license="MPL-2.0 AND Public-Domain"
depends=""
depends_dev="libxml2-dev lcms2-dev icu-dev"
-makedepends="$depends_dev gperf perl doxygen librevenge-dev zlib-dev"
checkdepends="cppunit-dev"
+makedepends="$depends_dev gperf perl doxygen librevenge-dev zlib-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
+source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz
+ icu.patch
+ "
prepare() {
default_prepare
@@ -20,7 +22,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,12 +35,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -48,4 +47,5 @@ tools() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr
}
-sha512sums="4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963 libfreehand-0.1.2.tar.xz"
+sha512sums="4112a76ac99999801d97d1b282596d631d8496a5bf65778ab26aa06da86637b1e2b630648a67ea01bf3316ecec9f2715546baff27af090b900267c87a011b963 libfreehand-0.1.2.tar.xz
+5c72ee92e1b617dd0ece1a17e84c4b063454811aae484a08d2e15a29c6561068d0127222656647bd0ac05afde8c5c2154d382b4289b86e1956bf173ed4694a76 icu.patch"
diff --git a/user/libfreehand/icu.patch b/user/libfreehand/icu.patch
new file mode 100644
index 000000000..22d118cca
--- /dev/null
+++ b/user/libfreehand/icu.patch
@@ -0,0 +1,11 @@
+--- libfreehand-0.1.2/src/lib/libfreehand_utils.cpp.old 2017-09-16 10:28:50.000000000 +0000
++++ libfreehand-0.1.2/src/lib/libfreehand_utils.cpp 2020-01-12 04:40:38.492246789 +0000
+@@ -162,7 +162,7 @@
+ while (j < length)
+ {
+ UChar32 c;
+- U16_NEXT(s, j, length, c)
++ U16_NEXT(s, j, length, c);
+ unsigned char outbuf[U8_MAX_LENGTH+1];
+ int i = 0;
+ U8_APPEND_UNSAFE(&outbuf[0], i, c);
diff --git a/user/libgit2/APKBUILD b/user/libgit2/APKBUILD
index 98b1d68ef..bfa1a39b3 100644
--- a/user/libgit2/APKBUILD
+++ b/user/libgit2/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Pierre-Gilas MILLON <pgmillon@gmail.com>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libgit2
-pkgver=0.27.7
+pkgver=0.28.4
pkgrel=0
pkgdesc="Pure C re-entrant library for custom Git applications"
url="https://libgit2.org/"
@@ -11,11 +11,9 @@ arch="all"
license="GPL-2.0-only"
depends=""
depends_dev="curl-dev libssh2-dev"
-makedepends="$depends_dev python3 cmake zlib-dev openssl-dev"
+makedepends="$depends_dev cmake http-parser-dev openssl-dev python3 zlib-dev"
subpackages="$pkgname-dev"
-source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
- test-32bit.patch
- "
+source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz"
# secfixes:
# 0.27.3-r0:
@@ -31,25 +29,19 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$
# - CVE-2016-8569
build() {
- cd "$builddir"
cmake \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS"
+ -DCMAKE_C_FLAGS="$CFLAGS" .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="de2e266939bd40bc580603539e1156906b97299523336ddc6a66c3bec26729495bef2daa2d240b83b7e011e93852381e95a4407132b0440a5aa1e1b7642c0011 libgit2-0.27.7.tar.gz
-83b82b442d34b633d1889863472e51f3b6b68fbd4089d3448d86adeb7ce79eee495fea3c19edb88f563226bd2badb0166b7e41f9d4ffe8304bbf3b2abdf5a22f test-32bit.patch"
+sha512sums="b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15 libgit2-0.28.4.tar.gz"
diff --git a/user/libgit2/libressl.patch b/user/libgit2/libressl.patch
deleted file mode 100644
index 967cdc498..000000000
--- a/user/libgit2/libressl.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru src.orig/libgit2-0.25.1/src/openssl_stream.h src/libgit2-0.25.1/src/openssl_stream.h
---- libgit2-0.25.1/src/copenssl_stream.h.orig
-+++ libgit2-0.25.1/src/openssl_stream.h
-@@ -27,7 +27,7 @@
-
-
-
--# if OPENSSL_VERSION_NUMBER < 0x10100000L
-+# if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
-
- GIT_INLINE(BIO_METHOD*) BIO_meth_new(int type, const char *name)
- {
diff --git a/user/libgit2/pkgconfig-do-not-quote-Libs.patch b/user/libgit2/pkgconfig-do-not-quote-Libs.patch
deleted file mode 100644
index 86133612e..000000000
--- a/user/libgit2/pkgconfig-do-not-quote-Libs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 452ba68cde25423d13ebb36f0a54559f07aa53a2 Mon Sep 17 00:00:00 2001
-From: Igor Gnatenko <ignatenko@redhat.com>
-Date: Tue, 7 Feb 2017 16:37:47 +0100
-Subject: [PATCH] pkgconfig: do not quote Libs
-
-It doesn't make sense at all.
----
- libgit2.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgit2.pc.in b/libgit2.pc.in
-index 329a560a7..880266a30 100644
---- a/libgit2.pc.in
-+++ b/libgit2.pc.in
-@@ -6,7 +6,7 @@ Name: libgit2
- Description: The git library, take 2
- Version: @LIBGIT2_VERSION_STRING@
-
--Libs: -L"${libdir}" -lgit2
-+Libs: -L${libdir} -lgit2
- Libs.private: @LIBGIT2_PC_LIBS@
- Requires.private: @LIBGIT2_PC_REQUIRES@
-
---
-2.11.0
-
diff --git a/user/libgit2/test-32bit.patch b/user/libgit2/test-32bit.patch
deleted file mode 100644
index d1240d904..000000000
--- a/user/libgit2/test-32bit.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 415a8ae9c9b6ac18f0524b6af8e58408b426457d Mon Sep 17 00:00:00 2001
-From: Edward Thomson <ethomson@edwardthomson.com>
-Date: Thu, 13 Sep 2018 13:27:07 +0100
-Subject: [PATCH] tests: don't run buf::oom on 32-bit systems
-
-On a 32-bit Linux systems, the value large enough to make malloc
-guarantee a failure is also large enough that valgrind considers it
-"fishy". Skip this test on those systems entirely.
----
- tests/buf/oom.c | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/tests/buf/oom.c b/tests/buf/oom.c
-index 2741a8ddf2..ec3bad9979 100644
---- a/tests/buf/oom.c
-+++ b/tests/buf/oom.c
-@@ -11,12 +11,8 @@
- */
- #if defined(GIT_ARCH_64) && defined(__linux__)
- # define TOOBIG 0x0fffffffffffffff
--#elif defined(__linux__)
--# define TOOBIG 0x0fffffff
- #elif defined(GIT_ARCH_64)
- # define TOOBIG 0xffffffffffffff00
--#else
--# define TOOBIG 0xffffff00
- #endif
-
- /**
-@@ -25,13 +21,18 @@
- * will fail. And because the git_buf_grow() wrapper always
- * sets mark_oom, the code in git_buf_try_grow() will free
- * the internal buffer and set it to git_buf__oom.
-- *
-+ *
- * We initialized the internal buffer to (the static variable)
- * git_buf__initbuf. The purpose of this test is to make sure
- * that we don't try to free the static buffer.
-+ *
-+ * Skip this test entirely on 32-bit platforms; a buffer large enough
-+ * to guarantee malloc failures is so large that valgrind considers
-+ * it likely to be an error.
- */
- void test_buf_oom__grow(void)
- {
-+#ifdef GIT_ARCH_64
- git_buf buf = GIT_BUF_INIT;
-
- git_buf_clear(&buf);
-@@ -40,6 +41,9 @@ void test_buf_oom__grow(void)
- cl_assert(git_buf_oom(&buf));
-
- git_buf_free(&buf);
-+#else
-+ cl_skip();
-+#endif
- }
-
- void test_buf_oom__grow_by(void)
diff --git a/user/libglade/APKBUILD b/user/libglade/APKBUILD
index 97d20f603..9b09c9104 100644
--- a/user/libglade/APKBUILD
+++ b/user/libglade/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libglade
pkgver=2.6.4
pkgrel=0
@@ -13,13 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/libglade/${pkgver%.*}/libglade-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libgnome-keyring/APKBUILD b/user/libgnome-keyring/APKBUILD
index 030194fc5..7ecb68377 100644
--- a/user/libgnome-keyring/APKBUILD
+++ b/user/libgnome-keyring/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libgnome-keyring
pkgver=3.12.0
pkgrel=0
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/libgnome-keyring/${pkgver%.*}/libgnome-keyring-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD
index c1250aabb..aee8693b1 100644
--- a/user/libgphoto2/APKBUILD
+++ b/user/libgphoto2/APKBUILD
@@ -10,13 +10,11 @@ license="LGPL-2.1+"
depends=""
depends_dev="libexif-dev libusb-dev"
makedepends="$depends_dev libjpeg-turbo-dev libtool"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
install="$pkgname.pre-install $pkgname.pre-upgrade"
-replaces="libgphoto2-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://downloads.sourceforge.net/gphoto/libgphoto2-$pkgver.tar.bz2"
build() {
- cd "$builddir"
udevscriptdir=/lib/udev ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -f "$pkgdir"/usr/lib/libgphoto2/*/*.a \
"$pkgdir"/usr/lib/*.a
diff --git a/user/libgtop/APKBUILD b/user/libgtop/APKBUILD
index ea17925e3..37b1ef0e2 100644
--- a/user/libgtop/APKBUILD
+++ b/user/libgtop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libgtop
pkgver=2.40.0
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://download.gnome.org/sources/libgtop/${pkgver%.*}/libgtop-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libgxps/APKBUILD b/user/libgxps/APKBUILD
index 5deb16d48..dac605308 100644
--- a/user/libgxps/APKBUILD
+++ b/user/libgxps/APKBUILD
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev"
source="https://ftp.gnome.org/pub/gnome/sources/libgxps/0.3/libgxps-$pkgver.tar.xz"
build() {
- cd "$builddir"
meson \
--prefix=/usr \
--sysconfdir=/etc \
@@ -27,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
ninja -C output test
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" ninja -C output install
}
diff --git a/user/libid3tag/APKBUILD b/user/libid3tag/APKBUILD
index 0984fc93f..e20e012d5 100644
--- a/user/libid3tag/APKBUILD
+++ b/user/libid3tag/APKBUILD
@@ -8,11 +8,12 @@ url="http://www.underbit.com/products/mad/"
arch="all"
license="GPL-2.0+"
depends=""
-makedepends="zlib-dev"
+makedepends="gperf zlib-dev"
subpackages="$pkgname-dev"
source="ftp://ftp.mars.org/pub/mpeg/libid3tag-$pkgver.tar.gz
CVE-2004-2779.patch
CVE-2017-11550.patch
+ gperf.patch
"
# secfixes:
@@ -63,4 +64,5 @@ EOF
sha512sums="ade7ce2a43c3646b4c9fdc642095174b9d4938b078b205cd40906d525acd17e87ad76064054a961f391edcba6495441450af2f68be69f116549ca666b069e6d3 libid3tag-0.15.1b.tar.gz
4c27e104d45ae34affc1bef8ec613e65c7e4791185d2ef1cb27974ec7025c06c35d30d6278ce7e3107dff959bd55a708246c3c1a9d5ad7b093424cfb93b79f63 CVE-2004-2779.patch
-6627d6e73958309b199a02cd6fa1008a81554151238d8a099dc27e535b8d14f7a9c1ba19894fdf2c927e59c0ca855d50b2f1289f116b45bc41e02d31659d1535 CVE-2017-11550.patch"
+6627d6e73958309b199a02cd6fa1008a81554151238d8a099dc27e535b8d14f7a9c1ba19894fdf2c927e59c0ca855d50b2f1289f116b45bc41e02d31659d1535 CVE-2017-11550.patch
+3f320d1d8719afd84aa0cf2a9e5615f3f535f84d1987f12df0a9d3f2b7c02e2c87fbc3aa41d538cdc4f8a30e629de6f3fc3a4e79f23448fd39d4c0c438c803fb gperf.patch"
diff --git a/user/libid3tag/gperf.patch b/user/libid3tag/gperf.patch
new file mode 100644
index 000000000..a365811c5
--- /dev/null
+++ b/user/libid3tag/gperf.patch
@@ -0,0 +1,12 @@
+diff -pur libid3tag-0.15.1b-orig/compat.h libid3tag-0.15.1b/compat.h
+--- libid3tag-0.15.1b-orig/compat.h 2004-01-23 10:41:32.000000000 +0100
++++ libid3tag-0.15.1b/compat.h 2017-03-15 01:49:23.808834401 +0100
+@@ -34,7 +34,7 @@ struct id3_compat {
+ };
+
+ struct id3_compat const *id3_compat_lookup(register char const *,
+- register unsigned int);
++ register size_t);
+
+ int id3_compat_fixup(struct id3_tag *);
+
diff --git a/user/libidn2/APKBUILD b/user/libidn2/APKBUILD
index ee0936554..c5355c814 100644
--- a/user/libidn2/APKBUILD
+++ b/user/libidn2/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://ftp.gnu.org/gnu/libidn/libidn2-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libiec61883/APKBUILD b/user/libiec61883/APKBUILD
index b84e7b3e4..a88096a54 100644
--- a/user/libiec61883/APKBUILD
+++ b/user/libiec61883/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://www.kernel.org/pub/linux/libs/ieee1394/libiec61883-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libieee1284/APKBUILD b/user/libieee1284/APKBUILD
index 44996cee3..7bf7633a7 100644
--- a/user/libieee1284/APKBUILD
+++ b/user/libieee1284/APKBUILD
@@ -8,10 +8,12 @@ url="http://cyberelk.net/tim/software/libieee1284/"
arch="all"
options="!check" # No test suite.
license="GPL-2.0+"
+depends=""
makedepends="file"
subpackages="$pkgname-dev $pkgname-doc"
source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2
- include.patch"
+ include.patch
+ "
prepare() {
default_prepare
@@ -19,8 +21,6 @@ prepare() {
}
build() {
- cd "$builddir"
-
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
@@ -30,7 +30,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libindicator/APKBUILD b/user/libindicator/APKBUILD
index 8bae4ffde..3c57d570c 100644
--- a/user/libindicator/APKBUILD
+++ b/user/libindicator/APKBUILD
@@ -1,25 +1,24 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libindicator
-pkgver=12.10.1
+pkgver=16.10
pkgrel=0
pkgdesc="Library for builidng indicators for applets"
url="https://launchpad.net/libindicator"
arch="all"
options="!check" # broken tests
license="GPL-3.0-only"
-makedepends="gtk+3.0-dev"
+depends=""
+makedepends="gtk+3.0-dev ido-dev autoconf automake libtool"
subpackages="$pkgname-dev"
-source="https://launchpad.net/libindicator/12.10/$pkgver/+download/libindicator-$pkgver.tar.gz"
+source="http://unrealize.co.uk/source/libindicator-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
default_prepare
- update_config_sub
+ autoreconf -vif
}
build() {
- cd "$builddir"
CFLAGS="-Wno-error" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,13 +30,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" -j1 install
}
-sha512sums="d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af libindicator-12.10.1.tar.gz"
+sha512sums="451aca0a2bd127bb49cc5b01f4cf1a33d85c3618257e822a16f29774f7eba919fbeca9515e5cb6c5e15bf315d20335ad5742d197cf561d2442891c1552de62a3 libindicator-16.10.tar.gz"
diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD
index 950841163..584fbf44a 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.14.3
+pkgver=1.15.0
pkgrel=0
pkgdesc="Library for handling input devices"
url="https://www.freedesktop.org/wiki/Software/libinput/"
@@ -13,7 +13,9 @@ makedepends="doxygen eudev-dev graphviz libevdev-dev libwacom-dev meson
checkdepends="check-dev valgrind"
subpackages="$pkgname-dev $pkgname-doc"
replaces="$pkgname-libs"
-source="https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+source="https://freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz
+ time64.patch
+ "
build() {
meson --prefix=/usr \
@@ -31,4 +33,5 @@ package() {
DESTDIR="$pkgdir" ninja -C builddir/ install
}
-sha512sums="f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d libinput-1.14.3.tar.xz"
+sha512sums="5dab48e1b4c9c0deb5b01ebc3ccb4cc28d614be25d87daaf42f51fbd2d955266f3fdba73029bc0094caa55060dad8967751b72d8f45f19a40b542f0c9118c1b6 libinput-1.15.0.tar.xz
+e4c898359c8264651b0d0a795c05ccfebcd24e44c7b2dbad8a2bce2c0da6138288e0be93bd68e4b61cc0fb56e9a46ad5c4b670f3f88e493b8a7993020f1d2c61 time64.patch"
diff --git a/user/libinput/time64.patch b/user/libinput/time64.patch
new file mode 100644
index 000000000..47833b6ee
--- /dev/null
+++ b/user/libinput/time64.patch
@@ -0,0 +1,49 @@
+From 2e15e1f56d673626d518760c1b7997543bb01fea Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Sun, 19 Jan 2020 16:01:57 -0600
+Subject: [PATCH] evdev-fallback: Use input_event_init for fallback
+
+Old-style field initialisation ignores the 64-bit time_t change in
+Linux UAPI, which causes the structure to be incompletely initialised
+on 32-bit systems with the 64-bit time_t kernel headers.
+
+This patch uses the input_event_init helper from the original 64-bit
+time_t enablement patch.
+
+Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
+Fixes: 5dc1a7ebd ("Adjust for 64bit time_t for 32bit architectures")
+See-Also: libinput/libinput!346
+---
+ src/evdev-fallback.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/evdev-fallback.c b/src/evdev-fallback.c
+index 651f0111..99c87c87 100644
+--- a/src/evdev-fallback.c
++++ b/src/evdev-fallback.c
+@@ -29,6 +29,7 @@
+ #include <mtdev-plumbing.h>
+
+ #include "evdev-fallback.h"
++#include "util-input-event.h"
+
+ static void
+ fallback_keyboard_notify_key(struct fallback_dispatch *dispatch,
+@@ -701,10 +702,10 @@ fallback_lid_keyboard_event(uint64_t time,
+ if (dispatch->lid.reliability == RELIABILITY_WRITE_OPEN) {
+ int fd = libevdev_get_fd(dispatch->device->evdev);
+ int rc;
+- struct input_event ev[2] = {
+- {{ 0, 0 }, EV_SW, SW_LID, 0 },
+- {{ 0, 0 }, EV_SYN, SYN_REPORT, 0 },
+- };
++ struct input_event ev[2];
++
++ ev[0] = input_event_init(0, EV_SW, SW_LID, 0);
++ ev[1] = input_event_init(0, EV_SYN, SYN_REPORT, 0);
+
+ rc = write(fd, ev, sizeof(ev));
+
+--
+2.24.1
+
diff --git a/user/libisofs/APKBUILD b/user/libisofs/APKBUILD
index 7a43b027f..b870b3be7 100644
--- a/user/libisofs/APKBUILD
+++ b/user/libisofs/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libisofs
pkgver=1.5.2
pkgrel=0
@@ -7,12 +7,12 @@ pkgdesc="Library for creating and managing iso9660-based filesystems"
url="https://dev.lovelyhq.com/libburnia/web/wikis/home"
arch="all"
license="GPL-2.0+ AND Unicode-TOU"
+depends=""
makedepends="zlib-dev"
subpackages="$pkgname-dev"
source="http://files.libburnia-project.org/releases/libisofs-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD
index 7995ea116..83f4f5f67 100644
--- a/user/libkdcraw/APKBUILD
+++ b/user/libkdcraw/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkdcraw
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="RAW image file format support for KDE"
url="https://www.KDE.org/"
@@ -11,10 +11,9 @@ depends=""
depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules libraw-dev"
subpackages="$pkgname-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/libkdcraw-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/libkdcraw-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="b7f88ebfaa70e4bf1478b8463beea5e0d636704e91d412d973e5b9fadd7e767d8595137b2995f426180c5234f323587c1d1ab67121e71c78026d3b1f6ea59f89 libkdcraw-19.08.2.tar.xz"
+sha512sums="896c5581d4da2dfcc5dceba60f4d155b7942eb6df8f37904c4f8aab54b2c2e2ea63d22b0828b0964810fafe6afac5739e8ddc6c86a292a231c46c0abdb2395a9 libkdcraw-19.12.1.tar.xz"
diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD
index a4c0db71a..718d08cfe 100644
--- a/user/libkdegames/APKBUILD
+++ b/user/libkdegames/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkdegames
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Library for common routines shared between KDE games"
url="https://www.kde.org/applications/games/"
@@ -18,10 +18,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qtsvg-dev
kitemviews-dev kjobwidgets-dev knewstuff-dev kservice-dev kxmlgui-dev
ktextwidgets-dev kwidgetsaddons-dev"
subpackages="$pkgname-dev $pkgname-lang $pkgname-carddecks::noarch"
-source="https://download.kde.org/stable/applications/$pkgver/src/libkdegames-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/libkdegames-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -32,17 +31,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
# causes crashes in KPat:
@@ -63,4 +60,4 @@ carddecks() {
mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/
}
-sha512sums="68ffcd6696b903c0d701996ead9f05ea2d35d72871840cb11ed05d9034bd2cc89017e5ef8fb8508452446075ed157dc6cbcda32762ed5d79ff35bf9e070c7b67 libkdegames-19.08.2.tar.xz"
+sha512sums="e26ef9b1612ee5ba409d36f93c73debff39a8d13f99eeb417d7a5263f55ce9da172772320001f78d0dd0f65278480ad28d8b9b98a04879be64a08570b207342c libkdegames-19.12.1.tar.xz"
diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD
index e4cc6f7fd..9a88edde7 100644
--- a/user/libkeduvocdocument/APKBUILD
+++ b/user/libkeduvocdocument/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkeduvocdocument
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Library for manipulating KVTML files"
url="https://www.kde.org/"
@@ -12,10 +12,9 @@ depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules ki18n-dev karchive-dev
kio-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/libkeduvocdocument-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/libkeduvocdocument-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="b367486f5e756ffff6e6e7c96cb4acba95d5e2ea1ecd6f2e0679d2d794582a24ba9944b4d906dda618b945e7e8a9a4064592b7f429c581aba4bb8d3c26f5c0e6 libkeduvocdocument-19.08.2.tar.xz"
+sha512sums="9bb12f2099c096a9bfa8650698a0f3562008d072c4deb2c1299307c0332ed621b578ddc9786b5fda47db176fd84e64fb2e3469daa54e3354c046ccfedce274c4 libkeduvocdocument-19.12.1.tar.xz"
diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD
index 7072e5213..bc3d219fe 100644
--- a/user/libkexiv2/APKBUILD
+++ b/user/libkexiv2/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkexiv2
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KDE integration with Exiv2 EXIF data library"
url="https://www.KDE.org/"
@@ -11,7 +11,7 @@ depends=""
depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules exiv2-dev"
subpackages="$pkgname-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/libkexiv2-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/libkexiv2-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -24,7 +24,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6e5a9be84daaa556d6450ebecd412b9daa2be37a9f40583c88c8331009349b3092c03e1e974d8bdb435ddfa8c0d1e37dd5d067ab4334763cbdd0f99f0ff1dc55 libkexiv2-19.08.2.tar.xz"
+sha512sums="96eb63aaaabb99c5cc2517f04c6f8c27855d8bddb5e4c88adf1539c04ab85f0b4aea6f53b73ecde551a6ee15656322c6292d3befbfa57e0f4005003adc727773 libkexiv2-19.12.1.tar.xz"
diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD
index d87ffe266..8db625f49 100644
--- a/user/libkipi/APKBUILD
+++ b/user/libkipi/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkipi
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KDE Image Plugin Interface library"
url="https://www.digikam.org/"
@@ -12,10 +12,9 @@ depends=""
depends_dev="qt5-qtbase-dev kxmlgui-dev kservice-dev"
makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev"
subpackages="$pkgname-dev"
-source="https://download.kde.org/stable/applications/$pkgver/src/libkipi-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/libkipi-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,13 +26,12 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_TESTING=OFF \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="a0ec6fa7bb16a33bca198cd292b3d5c5ebcf7983979e1bcee7cc4863a50a6b82cc8b0072bbdb2209cb855c87fc039e165dd3deb0a342214f9377998d5d913640 libkipi-19.08.2.tar.xz"
+sha512sums="8cf859361bb84a3fd6dd2cbbcbfdb6f7600826d20cd2cb3ea36abf86574b5bc40ccef833e2628ea75b54a93252d5bd12b14a8f469dc1788f9a0a86cd8e925698 libkipi-19.12.1.tar.xz"
diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD
index 51b9470f8..a278afa1d 100644
--- a/user/libkleo/APKBUILD
+++ b/user/libkleo/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkleo
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KDE encryption library"
url="https://www.kde.org/"
@@ -13,12 +13,9 @@ depends_dev="qt5-qtbase-dev boost-dev gpgme-dev libgpg-error-dev ki18n-dev kwidg
makedepends="$depends_dev cmake extra-cmake-modules kcompletion-dev kconfig-dev
kcodecs-dev kcoreaddons-dev kpimtextedit-dev kwindowsystem-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/libkleo-$pkgver.tar.xz
- egregious-versions.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/libkleo-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,19 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="2b68d7d6b154bb16638bb5b533f1239cbbcd610eca14b8e346f14d75c3277f5566e4773797612966abd6dc94fd4f20918c581fded790431e572ba51e59ea1e5e libkleo-19.08.2.tar.xz
-5a10a4de59fc4e89295488c88f6f21f88f58f47679c666e0909bbd7bb6b3b867091292d807c2786da4864043d22c84e4f7cd7757fc47c9e046bedb8289c3c7b6 egregious-versions.patch"
+sha512sums="16d176b5f1d72666e89fd185edcda7be700fcb76760c800558990a046c1bc6560735ead35d15312e294f4b467af1e74797f28817ff15c8fb8252164552989ccd libkleo-19.12.1.tar.xz"
diff --git a/user/libkleo/egregious-versions.patch b/user/libkleo/egregious-versions.patch
deleted file mode 100644
index 27822b608..000000000
--- a/user/libkleo/egregious-versions.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-libKleo uses no new APIs.
-
---- libkleo-19.04.0/CMakeLists.txt.old 2019-04-12 00:16:32.000000000 +0000
-+++ libkleo-19.04.0/CMakeLists.txt 2019-04-19 06:31:09.576149789 +0000
-@@ -3,7 +3,7 @@
-
- project(libkleo VERSION ${PIM_VERSION})
-
--set(KF5_MIN_VERSION "5.60.0")
-+set(KF5_MIN_VERSION "5.54.0")
-
- find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-@@ -26,7 +26,7 @@
-
-
- set(LIBKLEO_LIB_VERSION ${PIM_VERSION})
--set(QT_REQUIRED_VERSION "5.11.0")
-+set(QT_REQUIRED_VERSION "5.9.0")
- set(KDEPIMTEXTEDIT_VERSION "5.12.1")
-
- find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets)
---- libkleo-19.08.0/CMakeLists.txt.old 2019-08-15 15:03:03.464693272 +0000
-+++ libkleo-19.08.0/CMakeLists.txt 2019-08-15 15:05:18.800204812 +0000
-@@ -92,6 +92,6 @@
-
-
- add_subdirectory(src)
--install(FILES libkleo.renamecategories libkleo.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
-+#install(FILES libkleo.renamecategories libkleo.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
- feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
- ki18n_install(po)
diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD
index 9524cb848..ffbc9e67e 100644
--- a/user/libkmahjongg/APKBUILD
+++ b/user/libkmahjongg/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libkmahjongg
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Library with Mah Jongg logic"
url="https://www.kde.org/"
@@ -12,10 +12,9 @@ depends_dev="qt5-qtbase-dev kconfig-dev kconfigwidgets-dev"
makedepends="$depends_dev cmake extra-cmake-modules qt5-qtsvg-dev ki18n-dev
kcompletion-dev kcoreaddons-dev kwidgetsaddons-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/libkmahjongg-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/libkmahjongg-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="63f2479283756e3d51caf604547565da0fd2edab3737e77faf9148290ddeeb1f0517250988d20a936cee55716acd1e01a536e4b73332685f25f3df5cc235e4e1 libkmahjongg-19.08.2.tar.xz"
+sha512sums="643c60a48bb0e0e07607f0103b3a8d1b4b590e1f92e66fca920802e7a3a5f191b9d9906e602f1e846d659574cffa133fd3ab97ac5049d7f62e067baeb9abf153 libkmahjongg-19.12.1.tar.xz"
diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD
index eae40d780..be15df4ce 100644
--- a/user/libksane/APKBUILD
+++ b/user/libksane/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libksane
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="KDE scanning library"
url="https://www.kde.org"
@@ -12,12 +12,9 @@ depends_dev="sane-dev"
makedepends="$depends_dev cmake extra-cmake-modules qt5-qtbase-dev ki18n-dev
ktextwidgets-dev kwallet-dev kwidgetsaddons-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/libksane-$pkgver.tar.xz
- frameworks.patch
- "
+source="https://download.kde.org/stable/release-service/$pkgver/src/libksane-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,19 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="94418deb33f53e227b9269deb43974fb6add9658e5d894d277e5bd467b8c5b526a78419b0775a175ba28d058bf627d5b129f702c6829aa76c357817234956a99 libksane-19.08.2.tar.xz
-60e0e8b073499e932d626a65c5cc23f58d2701921da547733d2736b58c6d412c8d6e782884916390ff16e02183a53ad283712f0bcf2cdcf5a0eb0d7029bb1ba8 frameworks.patch"
+sha512sums="18c728048886d4f98a76dbc908979418a5012e3a4fb9dea32fcca5b122ef15e13147bf4a010d9bfce3a1d8d7922f100b54416a640383c92862ef06a878ef732b libksane-19.12.1.tar.xz"
diff --git a/user/libksane/frameworks.patch b/user/libksane/frameworks.patch
deleted file mode 100644
index f44ad09db..000000000
--- a/user/libksane/frameworks.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libksane-19.04.0/CMakeLists.txt.old 2019-04-12 00:06:29.000000000 +0000
-+++ libksane-19.04.0/CMakeLists.txt 2019-04-18 22:42:00.675733179 +0000
-@@ -26,7 +26,7 @@
- include(KDECMakeSettings)
- include(GenerateExportHeader)
-
--set(KF5_VERSION "5.55.0")
-+set(KF5_VERSION "5.54.0")
-
- ecm_setup_version(
- ${KF5_VERSION}
diff --git a/user/libkscreen/APKBUILD b/user/libkscreen/APKBUILD
index 20754ea80..e6435daeb 100644
--- a/user/libkscreen/APKBUILD
+++ b/user/libkscreen/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=libkscreen
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="KDE Plasma screen management software"
url="https://www.kde.org/"
@@ -11,9 +11,9 @@ license="LGPL-2.1+ AND GPL-2.0+ AND (GPL-2.0-only OR GPL-3.0-only)"
depends=""
depends_dev="qt5-qtbase-dev"
makedepends="$depends_dev cmake extra-cmake-modules qt5-qtx11extras-dev
- kwayland-dev"
-subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-wayland"
-source="https://download.kde.org/stable/plasma/$pkgver/libkscreen-$pkgver.tar.xz"
+ qt5-qttools-dev kwayland-dev doxygen"
+subpackages="kscreen-doctor:doctor $pkgname-dev $pkgname-doc $pkgname-wayland"
+source="https://download.kde.org/unstable/plasma/$pkgver/libkscreen-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -26,7 +26,8 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ -DBUILD_QCH:BOOL=ON \
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -52,4 +53,4 @@ wayland() {
"$subpkgdir"/usr/lib/qt5/plugins/kf5/kscreen/
}
-sha512sums="773b6782cbe7da02b7bcbe889e98d613321d7e80aa3af7643dd0e21776e2a688f31f83c5429a17a956fb9715c788e90aae80f650a11bf80b667eae948169893a libkscreen-5.12.8.tar.xz"
+sha512sums="6af4c59c9a8212eb6dc50ce3aa6476227aac1a5ceb078b665b432a2cdc586af9fe45d8fe214f15a46af673e54bbc145ecb5da5db1de756bb4a12f8dd6cfec46f libkscreen-5.17.90.tar.xz"
diff --git a/user/libksysguard/APKBUILD b/user/libksysguard/APKBUILD
index e8a05e1d1..24ff1f831 100644
--- a/user/libksysguard/APKBUILD
+++ b/user/libksysguard/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=libksysguard
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="KDE system monitor library"
url="https://www.kde.org/"
@@ -13,9 +13,10 @@ depends_dev="qt5-qtbase-dev kconfig-dev"
makedepends="$depends_dev cmake extra-cmake-modules python3 libx11-dev zlib-dev
qt5-qtscript-dev ki18n-dev kauth-dev kcompletion-dev kconfigwidgets-dev
kcoreaddons-dev kiconthemes-dev plasma-framework-dev kservice-dev
- kwindowsystem-dev kwidgetsaddons-dev"
+ kwindowsystem-dev kwidgetsaddons-dev qt5-qtwebchannel-dev kio-dev
+ kglobalaccel-dev"
subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/libksysguard-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/libksysguard-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -28,7 +29,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -40,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="9913b5491ad8305efa20e933db3a108da93b83323cde33cdef24f3b40beadb166de99cbd5cbde033d82de913c5a66b493860f9d14351a7b20c401bd1a5648039 libksysguard-5.12.8.tar.xz"
+sha512sums="d25bd17324a97aa32c7115ab9b761d9510118364945f5bf5d3766c92925e9bf3f2e9bc608cbd786fd69aebc3c065faffe8e2bbe53417f9640fc4ea20d81db94b libksysguard-5.17.90.tar.xz"
diff --git a/user/libktorrent/APKBUILD b/user/libktorrent/APKBUILD
index c226584a7..1ab72541a 100644
--- a/user/libktorrent/APKBUILD
+++ b/user/libktorrent/APKBUILD
@@ -11,7 +11,7 @@ license="LGPL-2.1+"
depends=""
depends_dev="qt5-qtbase-dev karchive-dev kcrash-dev kio-dev solid-dev gmp-dev
boost-dev qca-dev libgcrypt-dev"
-makedepends="cmake extra-cmake-modules $depends_dev ki18n-dev"
+makedepends="cmake extra-cmake-modules $depends_dev doxygen ki18n-dev"
subpackages="$pkgname-dev $pkgname-lang"
source="https://download.kde.org/stable/ktorrent/5.1.2/libktorrent-$pkgver.tar.xz"
@@ -26,7 +26,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/libkworkspace/APKBUILD b/user/libkworkspace/APKBUILD
new file mode 100644
index 000000000..fa3532c07
--- /dev/null
+++ b/user/libkworkspace/APKBUILD
@@ -0,0 +1,51 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
+pkgname=libkworkspace
+pkgver=5.17.90
+pkgrel=0
+pkgdesc="KDE Plasma 5 workspace library"
+url="https://www.kde.org/plasma-desktop"
+arch="all"
+options="!check" # Test requires X11 accelration.
+license="(GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1+ AND GPL-2.0+ AND MIT AND LGPL-2.1-only AND LGPL-2.0+ AND (LGPL-2.1-only OR LGPL-3.0-only) AND LGPL-2.0-only"
+depends=""
+depends_dev="qt5-qtbase-dev"
+makedepends="cmake extra-cmake-modules libice-dev libsm-dev libxau-dev
+ kcoreaddons-dev ki18n-dev kscreenlocker-dev kwin-dev kwindowsystem-dev
+ plasma-framework-dev"
+subpackages="$pkgname-dev"
+source="https://download.kde.org/unstable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
+ header-generation.patch
+ session.patch
+ standalone.patch
+ "
+builddir="$srcdir"/plasma-workspace-$pkgver/libkworkspace
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ -DBUILD_TESTING=OFF \
+ ${CMAKE_CROSSOPTS} .
+ make
+}
+
+check() {
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="8fc014e90dca30b54122ef0e83c08faabbb41a3ba5a511e4713db3898acd18faf53652ff766ffbaa70d1da3053618b70882255afeca060cd92e06d0bdf4e1934 plasma-workspace-5.17.90.tar.xz
+3f72f33219999bc39c52c143c047df37eb34b4149bf479ec9aee64ce14c78946635cf20cf120858f10a676a2b7c00cef0b95aa696e8e71b7412d936fbdd7e755 header-generation.patch
+1c7a23a4bb13030b992b8bde125548f104dbc6db489b60a6c40d91e2b793b208f35f88cca9ad90a9cc116d92b902d5c536b0e643805799b07286fbc82a0dafe8 session.patch
+6b3a19a53c36b518d2f5719b1ce0f86cb8ece763e4e02eb455882af73344d26b46f7cdf9edc93c6394767d51f0e5a326ab33c44f04a0b9cfc6cf5b281c087d46 standalone.patch"
diff --git a/user/libkworkspace/header-generation.patch b/user/libkworkspace/header-generation.patch
new file mode 100644
index 000000000..c78fad092
--- /dev/null
+++ b/user/libkworkspace/header-generation.patch
@@ -0,0 +1,17 @@
+[ 26%] Generating consolekit_manager_interface.cpp, consolekit_manager_interface.h
+[ 29%] Generating login1_manager_interface.moc
+moc: /usr/src/packages/user/libkworkspace/src/plasma-workspace-5.17.90/libkworkspace/login1_manager_interface.h: No such file
+
+--- libkworkspace/CMakeLists.txt.old 2020-01-26 23:49:13.514087630 +0000
++++ libkworkspace/CMakeLists.txt 2020-01-26 23:49:50.290062909 +0000
+@@ -79,8 +79,8 @@
+ endif()
+
+ set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
+- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
+- "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Session.xml"
++ "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Seat.xml"
++ "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Session.xml"
+ PROPERTIES INCLUDE "loginddbustypes.h" )
+
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml" login1_manager_interface)
diff --git a/user/libkworkspace/session.patch b/user/libkworkspace/session.patch
new file mode 100644
index 000000000..ec29807c1
--- /dev/null
+++ b/user/libkworkspace/session.patch
@@ -0,0 +1,23 @@
+--- libkworkspace/sessionmanagementbackend.cpp.old 2020-01-16 12:37:11.000000000 +0000
++++ libkworkspace/sessionmanagementbackend.cpp 2020-01-26 23:48:25.419351063 +0000
+@@ -77,6 +77,11 @@
+
+ /*********************************************************************************/
+
++bool LogindSessionBackend::exists()
++{
++ return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"));
++}
++
+ LogindSessionBackend::LogindSessionBackend()
+ {
+ m_login1 = new OrgFreedesktopLogin1ManagerInterface(QStringLiteral("org.freedesktop.login1"), QStringLiteral("/org/freedesktop/login1"), QDBusConnection::systemBus(), this);
+@@ -199,7 +204,7 @@
+
+ bool ConsoleKitSessionBackend::exists()
+ {
+- return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"));
++ return QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConosleKit"));
+ }
+
+ ConsoleKitSessionBackend::ConsoleKitSessionBackend()
diff --git a/user/libkworkspace/standalone.patch b/user/libkworkspace/standalone.patch
new file mode 100644
index 000000000..de6ec93bb
--- /dev/null
+++ b/user/libkworkspace/standalone.patch
@@ -0,0 +1,111 @@
+From 7e2bf26af99f5b242b2e4bb2ee5e62914d5d5861 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 10 Jul 2019 11:38:44 +0200
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ CMakeLists.txt | 70 +++++++++++++++++++++++++++++++++---
+ 1 file changed, 66 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c4c47870..53bc780b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,56 @@
++project(libkworkspace)
++
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++ set(PROJECT_VERSION "5.17.90")
++ set(PROJECT_VERSION_MAJOR 5)
++
++ cmake_minimum_required(VERSION 3.0)
++
++ set(QT_MIN_VERSION "5.12.0")
++ set(KF5_MIN_VERSION "5.58.0")
++ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus)
++ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
++ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
++
++ include(KDEInstallDirs)
++ include(KDECMakeSettings)
++ include(KDECompilerSettings NO_POLICY_SCOPE)
++ include(ECMMarkNonGuiExecutable)
++ include(CMakePackageConfigHelpers)
++ include(WriteBasicConfigVersionFile)
++ include(CheckIncludeFiles)
++ include(FeatureSummary)
++ include(ECMQtDeclareLoggingCategory)
++ include(KDEPackageAppTemplates)
++ include(ECMMarkAsTest)
++ include(GenerateExportHeader)
++
++ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons I18n Plasma WindowSystem)
++
++ find_package(KWinDBusInterface CONFIG REQUIRED)
++ find_package(KScreenLocker 5.13.80 REQUIRED)
++ find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
++
++ find_package(X11)
++ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
++ URL "http://www.x.org"
++ TYPE OPTIONAL
++ PURPOSE "Required for X11 support")
++
++ if(X11_FOUND)
++ find_package(Qt5X11Extras ${QT_MIN_VERSION} CONFIG REQUIRED)
++ set(HAVE_X11 1)
++ endif()
++
++ if(BUILD_TESTING)
++ find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++ endif()
++
++ check_include_files(unistd.h HAVE_UNISTD_H)
++
++ configure_file(../config-workspace.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-workspace.h)
++ configure_file(../config-X11.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-X11.h)
++endif()
+
+ set(kworkspace_LIB_SRCS kdisplaymanager.cpp
+ kworkspace.cpp
+@@ -14,8 +67,16 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/kf5_org.freedesktop.ScreenSaver.xml screenlocker_interface )
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${KSCREENLOCKER_DBUS_INTERFACES_DIR}/org.kde.screensaver.xml kscreenlocker_interface )
++if(${CMAKE_SOURCE_DIR} STREQUAL ${libkworkspace_SOURCE_DIR})
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
++qt5_add_dbus_interface(kworkspace_LIB_SRCS ../startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ../ksmserver/org.kde.KSMServerInterface.xml)
++else()
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.LogoutPrompt.xml logoutprompt_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS ${plasma-workspace_SOURCE_DIR}/startkde/plasma-session/org.kde.Shutdown.xml shutdown_interface)
++set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
++set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
++endif()
+
+ set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/org.freedesktop.login1.Manager.xml"
+ "${CMAKE_SOURCE_DIR}/data/interfaces/org.freedesktop.login1.Seat.xml"
+@@ -31,11 +92,7 @@ list(APPEND kworkspace_LIB_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/login1_manager_inte
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.UPower.xml" upower_interface)
+ qt5_add_dbus_interface(kworkspace_LIB_SRCS "org.freedesktop.ConsoleKit.Manager.xml" consolekit_manager_interface)
+
+-set(ksmserver_xml ${plasma-workspace_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml)
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${ksmserver_xml} ksmserver_interface )
+-
+-set_source_files_properties(${KWIN_INTERFACE} PROPERTIES INCLUDE "interface_util.h")
+-
+ qt5_add_dbus_interface( kworkspace_LIB_SRCS ${KWIN_INTERFACE} kwin_interface )
+
+
+@@ -101,3 +158,8 @@ if(BUILD_TESTING)
+ add_subdirectory(autotests)
+ add_subdirectory(tests)
+ endif()
++
++if ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
++ install( FILES sessionmanagementbackend.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kworkspace5 COMPONENT Devel )
++ feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
++endif()
+--
+2.22.0
+
diff --git a/user/liblangtag/APKBUILD b/user/liblangtag/APKBUILD
index 5c97a2aec..674f39560 100644
--- a/user/liblangtag/APKBUILD
+++ b/user/liblangtag/APKBUILD
@@ -8,8 +8,8 @@ url="https://bitbucket.org/tagoh/liblangtag"
arch="all"
license="LGPL-3.0+ OR MPL-2.0"
depends=""
-makedepends="glib-dev gobject-introspection-dev libtool libxml2-dev"
checkdepends="check-dev"
+makedepends="glib-dev gobject-introspection-dev libtool libxml2-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://bitbucket.org/tagoh/$pkgname/downloads/$pkgname-$pkgver.tar.bz2"
diff --git a/user/liblbxutil/APKBUILD b/user/liblbxutil/APKBUILD
index def4dc83c..2c7f03f5d 100644
--- a/user/liblbxutil/APKBUILD
+++ b/user/liblbxutil/APKBUILD
@@ -13,14 +13,12 @@ subpackages="$pkgname-dev"
source="https://www.x.org/releases/individual/lib/liblbxutil-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
chmod a+w config.sub
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD
index 24765e4fc..020e173ee 100644
--- a/user/liblxqt/APKBUILD
+++ b/user/liblxqt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=liblxqt
pkgver=0.14.1
pkgrel=0
@@ -16,25 +16,22 @@ subpackages="$pkgname-dev"
source="https://github.com/lxqt/liblxqt/releases/download/$pkgver/liblxqt-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
- -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="28ce5e924d136f9907f84e40d4823c412df071009a9d5da4e061ce969d7575b21210d5178103f9bfc73baa87ccafc87dcb6e29a737467ca1a459c1fd3c1071ba liblxqt-0.14.1.tar.xz"
diff --git a/user/libmad/APKBUILD b/user/libmad/APKBUILD
index 58da6a323..38f6a0deb 100644
--- a/user/libmad/APKBUILD
+++ b/user/libmad/APKBUILD
@@ -20,7 +20,6 @@ source="https://downloads.sourceforge.net/sourceforge/mad/$pkgname-$pkgver.tar.g
"
prepare() {
- cd "$builddir"
update_config_sub
default_prepare
libtoolize --force && aclocal -I m4 && autoconf \
@@ -28,7 +27,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -39,7 +37,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -D -m644 "$srcdir"/mad.pc "$pkgdir"/usr/lib/pkgconfig/mad.pc
}
diff --git a/user/libmatekbd/APKBUILD b/user/libmatekbd/APKBUILD
index f7ea8d723..f676f23be 100644
--- a/user/libmatekbd/APKBUILD
+++ b/user/libmatekbd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libmatekbd
pkgver=1.22.0
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/libmatekbd-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libmatemixer/APKBUILD b/user/libmatemixer/APKBUILD
index a3b1fc797..8f3b65f25 100644
--- a/user/libmatemixer/APKBUILD
+++ b/user/libmatemixer/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libmatemixer
pkgver=1.22.0
pkgrel=0
@@ -9,11 +9,11 @@ arch="all"
license="LGPL-2.0+"
depends=""
makedepends="alsa-lib-dev intltool pulseaudio-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-alsa $pkgname-pulse"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lang
+ $pkgname-alsa $pkgname-pulse"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/libmatemixer-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libmateweather/APKBUILD b/user/libmateweather/APKBUILD
index da65670d9..e00b69f7b 100644
--- a/user/libmateweather/APKBUILD
+++ b/user/libmateweather/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libmateweather
pkgver=1.22.1
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/libmateweather-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libmatroska/APKBUILD b/user/libmatroska/APKBUILD
index 6a8ea1f9d..076e9a9e2 100644
--- a/user/libmatroska/APKBUILD
+++ b/user/libmatroska/APKBUILD
@@ -8,24 +8,23 @@ url="https://www.matroska.org/"
arch="all"
options="!check" # No test suite.
license="LGPL-2.1+"
-makedepends="libebml-dev>=1.3.3"
+depends=""
+makedepends="cmake libebml-dev>=1.3.3"
subpackages="$pkgname-dev"
source="https://dl.matroska.org/downloads/$pkgname/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS"
+ -DCMAKE_C_FLAGS="$CFLAGS" .
make
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
}
diff --git a/user/libmbim/APKBUILD b/user/libmbim/APKBUILD
index 871c43aad..ab32fba1b 100644
--- a/user/libmbim/APKBUILD
+++ b/user/libmbim/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libmbim
-pkgver=1.20.2
+pkgver=1.20.4
pkgrel=0
pkgdesc="Library for interfacing with WWAN modems"
url="https://www.freedesktop.org/wiki/Software/libmbim/"
@@ -32,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="83fe2dfb4a813c5aa845ec5c8b674f6a0be0b6ea233c51c47b6345dc50200b0b98300157736f1435fcc5d85dc6588dbf837ab2a5e324511ec35c4da0e1c8c9d0 libmbim-1.20.2.tar.xz"
+sha512sums="246f601ddda48b10e8a7b337d6e996dc65f6300e87f13d5260a5c903f95e9035e8a8d1c88540101c22fb3c44eca242451ab75bbfdb6503cfbce279c6d4cf99c8 libmbim-1.20.4.tar.xz"
diff --git a/user/libmms/APKBUILD b/user/libmms/APKBUILD
index 85cec3b25..f48006114 100644
--- a/user/libmms/APKBUILD
+++ b/user/libmms/APKBUILD
@@ -16,13 +16,11 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,7 +33,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libmowgli/APKBUILD b/user/libmowgli/APKBUILD
index 461075184..777ee35b6 100644
--- a/user/libmowgli/APKBUILD
+++ b/user/libmowgli/APKBUILD
@@ -12,7 +12,8 @@ depends=""
makedepends="openssl-dev"
subpackages="$pkgname-dev"
source="https://github.com/atheme/libmowgli-2/archive/v$pkgver/libmowgli-$pkgver.tar.gz
- cacheline.patch"
+ cacheline.patch
+ "
builddir="$srcdir"/$pkgname-2-$pkgver
build() {
diff --git a/user/libmpd/APKBUILD b/user/libmpd/APKBUILD
index c3ae2be64..c1fa255fd 100644
--- a/user/libmpd/APKBUILD
+++ b/user/libmpd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libmpd
pkgver=11.8.17
pkgrel=0
@@ -7,18 +7,17 @@ pkgdesc="GObject-based client library for the music player daemon"
url="https://gmpclient.org/"
arch="all"
license="GPL-2.0+ AND BSD-3-Clause"
+depends=""
makedepends="glib-dev"
subpackages="$pkgname-dev"
source="http://download.sarine.nl/Programs/gmpc/11.8/libmpd-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -30,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libmpeg2/APKBUILD b/user/libmpeg2/APKBUILD
index f24035f54..b2a4a6056 100644
--- a/user/libmpeg2/APKBUILD
+++ b/user/libmpeg2/APKBUILD
@@ -6,8 +6,10 @@ pkgdesc="Library for decoding MPEG-1 and MPEG-2 video streams"
url="http://libmpeg2.sourceforge.net/"
arch="all"
license="GPL-2.0+ AND LGPL-2.0+"
+depends=""
+makedepends="libx11-dev libice-dev libsm-dev libxext-dev libxv-dev
+ autoconf automake libtool"
subpackages="$pkgname-dev $pkgname-doc mpeg2dec"
-makedepends="libx11-dev libice-dev libsm-dev libxext-dev libxv-dev"
source="http://distfiles.gentoo.org/distfiles/libmpeg2-$pkgver.tar.gz
arm-private-symbols.patch
arm-textrel.patch
@@ -15,8 +17,8 @@ source="http://distfiles.gentoo.org/distfiles/libmpeg2-$pkgver.tar.gz
"
prepare() {
- update_config_sub
default_prepare
+ update_config_sub
autoreconf -vif
}
diff --git a/user/libmspub/APKBUILD b/user/libmspub/APKBUILD
index 746c1a84e..0d528f945 100644
--- a/user/libmspub/APKBUILD
+++ b/user/libmspub/APKBUILD
@@ -8,13 +8,13 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
arch="all"
options="!check" # No test suite.
license="MPL-2.0 AND (MPL-1.1 OR GPL-2.0+ OR LGPL-2.0+)"
-depends_dev="boost-dev librevenge-dev"
-makedepends="$depends_dev icu-dev doxygen"
+depends=""
+depends_dev="boost-dev"
+makedepends="$depends_dev doxygen icu-dev librevenge-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,7 +27,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libmtp/APKBUILD b/user/libmtp/APKBUILD
index 3f8e07b45..e6187c747 100644
--- a/user/libmtp/APKBUILD
+++ b/user/libmtp/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev"
source="https://downloads.sourceforge.net/libmtp/libmtp-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libmwaw/APKBUILD b/user/libmwaw/APKBUILD
index 98bef424d..b3699997f 100644
--- a/user/libmwaw/APKBUILD
+++ b/user/libmwaw/APKBUILD
@@ -12,7 +12,7 @@ depends=""
depends_dev="boost-dev attr-dev zlib-dev"
makedepends="$depends_dev librevenge-dev doxygen"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+source="https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
build() {
./configure \
diff --git a/user/libnfs/APKBUILD b/user/libnfs/APKBUILD
index 4fde5e380..d060df361 100644
--- a/user/libnfs/APKBUILD
+++ b/user/libnfs/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Client library for accessing NFS shares"
url="https://github.com/sahlberg/libnfs"
arch="all"
license="LGPL-2.1+ AND BSD-2-Clause-FreeBSD AND GPL-3.0+"
+depends=""
makedepends="autoconf automake libtool"
subpackages="$pkgname-dev $pkgname-doc"
source="https://github.com/sahlberg/libnfs/archive/libnfs-$pkgver.tar.gz
@@ -15,7 +16,6 @@ source="https://github.com/sahlberg/libnfs/archive/libnfs-$pkgver.tar.gz
builddir="$srcdir"/libnfs-libnfs-$pkgver
build() {
- cd "$builddir"
./bootstrap
./configure \
--build=$CBUILD \
@@ -29,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD
index 3d29f273d..b634ff0c2 100644
--- a/user/libnftnl/APKBUILD
+++ b/user/libnftnl/APKBUILD
@@ -2,15 +2,18 @@
# Contributor: Luis Ressel <aranea@aixah.de>
# Maintainer:
pkgname=libnftnl
-pkgver=1.1.4
+pkgver=1.1.5
pkgrel=0
pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
url="https://netfilter.org/projects/libnftnl"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="libmnl-dev"
subpackages="$pkgname-dev"
-source="https://netfilter.org/projects/libnftnl/files/$pkgname-$pkgver.tar.bz2"
+source="https://netfilter.org/projects/libnftnl/files/$pkgname-$pkgver.tar.bz2
+ nft-flowtable-test.patch
+ "
build() {
./configure \
@@ -31,4 +34,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6fe248b1340decc1ec8ae40dd0ed60b8d4b819c2f36f2399d39e13e92fc5e6f6ec693b736d6c188bff954afb2bf2dbce67d54a9e664b45f43288b2c5c6cc08f6 libnftnl-1.1.4.tar.bz2"
+sha512sums="a0495e1a99ea9efcf3994db48e50943023ff3d8101055887574ff4eb6b0df8600cf7db68a9c91ca02bbbcc1f01099b008649f88321bb956897bcc90eb4167ee7 libnftnl-1.1.5.tar.bz2
+0978037a5dec71a96f5713dbc5a4dc8dc30b7b37d79ec7dd6ec8b201740303785c3625c21a2388f8fd5d9d446f8706ac14d0bf5909a48ed3ef3e7417173dd2c8 nft-flowtable-test.patch"
diff --git a/user/libnftnl/nft-flowtable-test.patch b/user/libnftnl/nft-flowtable-test.patch
new file mode 100644
index 000000000..719c1f2cf
--- /dev/null
+++ b/user/libnftnl/nft-flowtable-test.patch
@@ -0,0 +1,37 @@
+From b2388765e0c4405442faa13845419f6a35d0134c Mon Sep 17 00:00:00 2001
+From: Phil Sutter <phil@nwl.cc>
+Date: Mon, 2 Dec 2019 18:29:56 +0100
+Subject: tests: flowtable: Don't check NFTNL_FLOWTABLE_SIZE
+
+Marshalling code around that attribute has been dropped by commit
+d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE") so it's value is
+lost during the test.
+
+Assuming that NFTNL_FLOWTABLE_SIZE will receive kernel support at a
+later point, leave the test code in place but just comment it out.
+
+Fixes: d1c4b98c733a5 ("flowtable: remove NFTA_FLOWTABLE_SIZE")
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
+---
+ tests/nft-flowtable-test.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/nft-flowtable-test.c b/tests/nft-flowtable-test.c
+index 3edb00d..8ab8d4c 100644
+--- a/tests/nft-flowtable-test.c
++++ b/tests/nft-flowtable-test.c
+@@ -33,9 +33,11 @@ static void cmp_nftnl_flowtable(struct nftnl_flowtable *a, struct nftnl_flowtabl
+ if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_USE) !=
+ nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_USE))
+ print_err("Flowtable use mismatches");
++#if 0
+ if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_SIZE) !=
+ nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_SIZE))
+ print_err("Flowtable size mismatches");
++#endif
+ if (nftnl_flowtable_get_u32(a, NFTNL_FLOWTABLE_FLAGS) !=
+ nftnl_flowtable_get_u32(b, NFTNL_FLOWTABLE_FLAGS))
+ print_err("Flowtable flags mismatches");
+--
+2.24.1
diff --git a/user/libnl3/APKBUILD b/user/libnl3/APKBUILD
index f5a2e5668..c9a12da3a 100644
--- a/user/libnl3/APKBUILD
+++ b/user/libnl3/APKBUILD
@@ -1,21 +1,20 @@
# Maintainer:
pkgname=libnl3
-pkgver=3.2.28
+pkgver=3.5.0
_pkgver=$(printf '%s' "$pkgver" | tr . _)
-pkgrel=2
+pkgrel=0
pkgdesc="Library for applications dealing with netlink sockets"
url="http://www.infradead.org/~tgr/libnl/"
arch="all"
license="LGPL-2.1-only AND GPL-2.0-only"
depends=""
-makedepends="linux-headers flex bison"
checkdepends="check-dev"
+makedepends="linux-headers flex bison"
subpackages="$pkgname-dev $pkgname-doc $pkgname-cli"
source="https://github.com/thom311/libnl/releases/download/libnl$_pkgver/libnl-$pkgver.tar.gz"
builddir="$srcdir/libnl-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,12 +28,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -47,4 +44,4 @@ cli() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="b5f145ecafb2625ed1c42594afd6063f112a601077de5c35884b3c3bc8c562b29b52a006ccebd795c127fe69692a82def425c8605afed7e6d441582943e803d9 libnl-3.2.28.tar.gz"
+sha512sums="9c94c09bac34297493b3ea482713d7c0865d2839b5042e5c7d1ed008e2402ab63df35a18e272f40b2cce27d0c31dc733fe7e4b2d376e7ca847a2b0d5e90de50c libnl-3.5.0.tar.gz"
diff --git a/user/libnumbertext/APKBUILD b/user/libnumbertext/APKBUILD
index 38bbb096c..9d1302bc6 100644
--- a/user/libnumbertext/APKBUILD
+++ b/user/libnumbertext/APKBUILD
@@ -27,9 +27,7 @@ build() {
package() {
make DESTDIR="$pkgdir" install
-
- cd data
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C data install
}
sha512sums="4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3 libnumbertext-1.0.5.tar.xz"
diff --git a/user/libodfgen/APKBUILD b/user/libodfgen/APKBUILD
index 64eb49c62..7eeed1f6f 100644
--- a/user/libodfgen/APKBUILD
+++ b/user/libodfgen/APKBUILD
@@ -8,13 +8,12 @@ url="https://sourceforge.net/p/libwpd/wiki/libodfgen/"
arch="all"
license="MPL-2.0 OR LGPL-2.1+"
depends=""
-depends_dev="boost-dev librevenge-dev"
-makedepends="$depends_dev doxygen"
+depends_dev="boost-dev"
+makedepends="$depends_dev doxygen librevenge-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://sourceforge.net/projects/libwpd/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir/test"
- make launch_all
+ make -C test launch_all
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libopenraw/APKBUILD b/user/libopenraw/APKBUILD
index b29becc3f..a03e7c089 100644
--- a/user/libopenraw/APKBUILD
+++ b/user/libopenraw/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libopenraw
pkgver=0.1.3
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Library for decoding RAW camera image formats"
url="https://libopenraw.freedesktop.org/"
arch="all"
license="LGPL-2.1+ AND LGPL-3.0+ AND GPL-2.0+"
+depends=""
makedepends="boost-dev libjpeg-turbo-dev libxml2-dev glib-dev gdk-pixbuf-dev"
subpackages="$pkgname-dev"
source="https://libopenraw.freedesktop.org/download/libopenraw-$pkgver.tar.bz2"
diff --git a/user/liborcus/APKBUILD b/user/liborcus/APKBUILD
index 3f0434eae..f64c0ec1f 100644
--- a/user/liborcus/APKBUILD
+++ b/user/liborcus/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Library for processing spreadsheet documents"
url="https://gitlab.com/orcus/orcus"
arch="all"
license="MPL-2.0 AND MIT"
+depends=""
depends_dev="boost-dev mdds~1.4 libixion-dev~0.14"
makedepends="$depends_dev zlib-dev"
subpackages="$pkgname-dev"
diff --git a/user/libotr/APKBUILD b/user/libotr/APKBUILD
index 98c18ffff..513c9f47a 100644
--- a/user/libotr/APKBUILD
+++ b/user/libotr/APKBUILD
@@ -21,7 +21,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libpagemaker/APKBUILD b/user/libpagemaker/APKBUILD
index d6194da5d..eab913f3c 100644
--- a/user/libpagemaker/APKBUILD
+++ b/user/libpagemaker/APKBUILD
@@ -9,13 +9,11 @@ arch="all"
options="!check" # No test suite.
license="MPL-2.0"
depends=""
-depends_dev="librevenge-dev"
-makedepends="$depends_dev boost-dev doxygen"
+makedepends="boost-dev doxygen librevenge-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,7 +27,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libpcap/APKBUILD b/user/libpcap/APKBUILD
index 714e098f2..17df8ba0f 100644
--- a/user/libpcap/APKBUILD
+++ b/user/libpcap/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=0
pkgdesc="System-independent interface for user-level packet capture"
url="http://www.tcpdump.org/"
arch="all"
-options="!check"
+options="!check" # No test suite.
license="BSD-3-Clause"
depends=""
makedepends="autoconf bison bluez-dev flex linux-headers"
diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD
index 09d588dcd..9c517e05f 100644
--- a/user/libpeas/APKBUILD
+++ b/user/libpeas/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libpeas
pkgver=1.24.1
pkgrel=0
diff --git a/user/libpfm/APKBUILD b/user/libpfm/APKBUILD
index c30624312..9cfe4b7aa 100644
--- a/user/libpfm/APKBUILD
+++ b/user/libpfm/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://downloads.sourceforge.net/perfmon2/libpfm4/libpfm-$pkgver.tar.gz"
build() {
- cd "$builddir"
CFLAGS="$CFLAGS -Wno-error=cpp" make
}
package() {
- cd "$builddir"
make PREFIX="/usr" DESTDIR="$pkgdir" install
}
diff --git a/user/libproxy/APKBUILD b/user/libproxy/APKBUILD
index ffeac9d28..1cdb0c9b5 100644
--- a/user/libproxy/APKBUILD
+++ b/user/libproxy/APKBUILD
@@ -17,7 +17,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/libproxy/libproxy/archive/$p
"
build() {
- cd "$builddir"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DLIBEXEC_INSTALL_DIR=lib \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libpsl/APKBUILD b/user/libpsl/APKBUILD
index 38ba69198..66d49e293 100644
--- a/user/libpsl/APKBUILD
+++ b/user/libpsl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libpsl
pkgver=0.21.0
pkgrel=0
@@ -7,13 +7,14 @@ pkgdesc="C library for examining the Public Suffix List"
url="https://rockdaboot.github.io/libpsl"
arch="all"
license="MIT AND BSD-3-Clause"
+depends=""
makedepends="python3 libidn2-dev libunistring-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://github.com/rockdaboot/libpsl/releases/download/libpsl-$pkgver/libpsl-$pkgver.tar.gz
- use-python3.patch"
+ use-python3.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libqalculate/APKBUILD b/user/libqalculate/APKBUILD
index 560a922d4..6ec80b85b 100644
--- a/user/libqalculate/APKBUILD
+++ b/user/libqalculate/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libqalculate
-pkgver=3.5.0
+pkgver=3.6.0
pkgrel=0
pkgdesc="Library implementing a powerful, versatile desktop calculator"
url="https://qalculate.github.io/"
@@ -12,11 +12,9 @@ depends=""
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
- "
+source="https://github.com/Qalculate/libqalculate/releases/download/v$pkgver/libqalculate-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -43,4 +39,4 @@ qalc() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="d0946e19ebeaba07aa3fcc83400a3a366ab293c99a0b3280dbc2480c3b0ab615a52485e5632a1063a392ea79c8fabc1340c994d16cc72bc3ff733ac8c824ba66 libqalculate-3.5.0.tar.gz"
+sha512sums="afef26633d28f4c9b018a17056bf9645118b2e8698d4d5ba76a4a7df783503579381db448a5d557059fc7629d175385353d7eabeef3636ec0cad669fd68e5d0f libqalculate-3.6.0.tar.gz"
diff --git a/user/libqmi/APKBUILD b/user/libqmi/APKBUILD
index 4b0f96ece..1fd9944e8 100644
--- a/user/libqmi/APKBUILD
+++ b/user/libqmi/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libqmi
-pkgver=1.24.0
+pkgver=1.24.2
pkgrel=0
pkgdesc="Library for interfacing with Qualcomm modems"
url="https://www.freedesktop.org/wiki/Software/libqmi/"
@@ -10,9 +10,7 @@ license="LGPL-2.0+"
depends=""
makedepends="glib-dev libgudev-dev python3"
subpackages="$pkgname-dev $pkgname-doc"
-source="https://www.freedesktop.org/software/libqmi/libqmi-$pkgver.tar.xz
- endian.patch
- "
+source="https://www.freedesktop.org/software/libqmi/libqmi-$pkgver.tar.xz"
build() {
./configure \
@@ -34,5 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="e899765e67c1db0f758030e78b296015c476f938bb2afa01594b3e71a0b8d5fc2237c8272497aec891d5555523ecf0fecd69c4d0e14165c07072780621b3b502 libqmi-1.24.0.tar.xz
-af01895913a66de52a79cb6de63a56025c8ee84ca7d62b91d3798d626b2eb133bc3c933fdac49d7b73874f3f641c158fb466b7567e6224d7d8a0b58e932a14d5 endian.patch"
+sha512sums="ad47cad5804f9af2fc66c79bcda9fcbf87c0b68bff54a0f0d46f190413d4de99167ce2f2c42986f354e17dacaecd5e42743701a2ee3fa98b2ba65bc2185a663e libqmi-1.24.2.tar.xz"
diff --git a/user/libqmi/endian.patch b/user/libqmi/endian.patch
deleted file mode 100644
index cf84b481b..000000000
--- a/user/libqmi/endian.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6030b9bb2e0ed9f3824a34cef548feaefceb9e37 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Fri, 4 Oct 2019 17:45:10 -0500
-Subject: [PATCH 1/2] libqmi-glib: Fix message creation on BE systems
-
-Creation of the fake QMUX header wrote the length as a native value, which
-caused the wrong value to be written on big endian systems.
-
-Before, a test run on a ppc64 system gave:
-
-ERROR:test-message.c:296:test_message_new_request_from_data: assertion failed: (self)
- /libqmi-glib/message/new/request: OK
- /libqmi-glib/message/new/request-from-data: FAIL
-
-Adding a g_assert_no_error gave the more helpful message:
-
-ERROR:test-message.c:296:test_message_new_request_from_data: assertion failed (error == NULL): QMUX length and buffer length don't match (3072 != 12) (qmi_core_error_quark, 4)
-
-After this commit is applied, all tests pass on a big endian ppc64 system.
----
- src/libqmi-glib/qmi-message.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libqmi-glib/qmi-message.c b/src/libqmi-glib/qmi-message.c
-index b82069e..41c5b43 100644
---- a/src/libqmi-glib/qmi-message.c
-+++ b/src/libqmi-glib/qmi-message.c
-@@ -478,7 +478,7 @@ qmi_message_new_from_data (QmiService service,
- /* Set up fake QMUX header */
- buffer = (struct full_message *)(self->data);
- buffer->marker = QMI_MESSAGE_QMUX_MARKER;
-- buffer->qmux.length = buffer_len - 1;
-+ buffer->qmux.length = GUINT16_TO_LE(buffer_len - 1);
- buffer->qmux.flags = 0;
- buffer->qmux.service = service;
- buffer->qmux.client = client_id;
---
-2.22.1
-
-From e299023094516a5be3ffb05f66ea90c47e966811 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Fri, 4 Oct 2019 17:49:07 -0500
-Subject: [PATCH 2/2] libqmi-glib: Add small error test to test-message
-
-The previous commit was easier to diagnose with the error condition from
-qmi_message_new_from_data provided. This change adds g_assert_no_error to
-the test_message_new_request_from_data case so that any future issues can
-be diagnosed quickly.
----
- src/libqmi-glib/test/test-message.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/libqmi-glib/test/test-message.c b/src/libqmi-glib/test/test-message.c
-index b6ea711..e41917a 100644
---- a/src/libqmi-glib/test/test-message.c
-+++ b/src/libqmi-glib/test/test-message.c
-@@ -292,7 +292,8 @@ test_message_new_request_from_data (void)
- qmi = g_byte_array_new ();
- g_byte_array_append (qmi, expected_buffer, sizeof (expected_buffer));
-
-- self = qmi_message_new_from_data (QMI_SERVICE_DMS, 0x01, qmi, NULL);
-+ self = qmi_message_new_from_data (QMI_SERVICE_DMS, 0x01, qmi, &error);
-+ g_assert_no_error (error);
- g_assert (self);
-
- /* check that the QMUX header contains the right values*/
---
-2.22.1
-
diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD
index 829bef03c..60f967c06 100644
--- a/user/libqtxdg/APKBUILD
+++ b/user/libqtxdg/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libqtxdg
pkgver=3.4.0
pkgrel=0
@@ -14,11 +14,9 @@ subpackages="$pkgname-dev"
source="https://github.com/lxqt/libqtxdg/releases/download/$pkgver/libqtxdg-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -28,18 +26,16 @@ build() {
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_TESTS=True \
-DBUILD_DEV_UTILS=True \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- make test
+ make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="9bd52ae3aa32f8c7de48e562ada1ff2413892c7ac58d5f7a06c0c512a4a6c03e9c5c44930f7781930c9c701894ea38a450a61a3c26afc047c76313ada0a890e6 libqtxdg-3.4.0.tar.xz"
diff --git a/user/libquotient/APKBUILD b/user/libquotient/APKBUILD
index b954f5c95..003f53e3f 100644
--- a/user/libquotient/APKBUILD
+++ b/user/libquotient/APKBUILD
@@ -25,7 +25,7 @@ build() {
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/libqxp/APKBUILD b/user/libqxp/APKBUILD
index 89f03aa6f..7876ab2c9 100644
--- a/user/libqxp/APKBUILD
+++ b/user/libqxp/APKBUILD
@@ -8,8 +8,8 @@ url="https://wiki.documentfoundation.org/DLP/Libraries/libqxp"
arch="all"
license="MPL-2.0"
depends=""
-makedepends="librevenge-dev icu-dev doxygen"
checkdepends="cppunit-dev"
+makedepends="librevenge-dev icu-dev doxygen"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="https://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
@@ -23,9 +23,7 @@ build() {
--infodir=/usr/share/info \
--localstatedir=/var \
make
-
- cd docs
- make
+ make -C docs
}
check() {
diff --git a/user/libraw1394/APKBUILD b/user/libraw1394/APKBUILD
index 0c8bb3501..fadd2d415 100644
--- a/user/libraw1394/APKBUILD
+++ b/user/libraw1394/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer:
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libraw1394
pkgver=2.1.2
pkgrel=2
@@ -12,7 +12,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="https://kernel.org/pub/linux/libs/ieee1394/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/librdkafka/APKBUILD b/user/librdkafka/APKBUILD
index 272f5dc82..d03f54449 100644
--- a/user/librdkafka/APKBUILD
+++ b/user/librdkafka/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Alyx Wolcott <alyx@leuhta.com>
# Maintainer: Alyx Wolcott <alyx@leuhta.com>
pkgname=librdkafka
-pkgver=1.2.0
+pkgver=1.3.0
pkgrel=0
pkgdesc="The Apache Kafka C/C++ library"
url="https://github.com/edenhill/librdkafka"
@@ -31,4 +31,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7caddeec09bd1556688f0011f5cae49f8b0cde55b8dbc1296b3d2a39879badc42b7f59369bb1938ce7c4c4ff8b0fe4f1973b923c3db603466c10a4c015306522 librdkafka-1.2.0.tar.gz"
+sha512sums="94b6202a83d54dfa181466a7ea4e0b492cd695e2bc08e7e46e60efb9c1dacc912fc891cb2bb50d189dc6d0fd6c7553266196dded460957ba0f569d3e08090669 librdkafka-1.3.0.tar.gz"
diff --git a/user/librevenge/APKBUILD b/user/librevenge/APKBUILD
index 2170fceaa..bf4ec674d 100644
--- a/user/librevenge/APKBUILD
+++ b/user/librevenge/APKBUILD
@@ -9,14 +9,12 @@ arch="all"
license="(MPL-2.0 OR LGPL-2.1+) AND BSD-3-Clause"
depends=""
depends_dev="boost-dev zlib-dev"
-makedepends="$depends_dev doxygen"
checkdepends="cppunit-dev"
+makedepends="$depends_dev doxygen"
subpackages="$pkgname-dev $pkgname-doc"
source="https://sourceforge.net/projects/libwpd/files/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libsamplerate/APKBUILD b/user/libsamplerate/APKBUILD
index aed5129ba..308259c25 100644
--- a/user/libsamplerate/APKBUILD
+++ b/user/libsamplerate/APKBUILD
@@ -12,13 +12,11 @@ makedepends="fftw-dev libsndfile-dev linux-headers"
source="http://www.mega-nerd.com/SRC/$pkgname-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libsexy/APKBUILD b/user/libsexy/APKBUILD
index d572034be..cdb914740 100644
--- a/user/libsexy/APKBUILD
+++ b/user/libsexy/APKBUILD
@@ -7,19 +7,17 @@ url="https://blog.chipx86.com/tag/libsexy/"
arch="all"
options="!check" # Tests require manual intervention and X11 display.
license="LGPL-2.1+"
-subpackages="$pkgname-dev $pkgname-doc"
+depends=""
makedepends="gtk+2.0-dev iso-codes-dev libxml2-dev"
+subpackages="$pkgname-dev $pkgname-doc"
source="http://releases.chipx86.com/$pkgname/$pkgname/$pkgname-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
-build ()
-{
- cd "$builddir"
+build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,7 +27,6 @@ build ()
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
rm -f "$pkgdir"/usr/lib/libsexy.a
}
diff --git a/user/libsigc++/APKBUILD b/user/libsigc++/APKBUILD
index 3e0bf669c..943216d01 100644
--- a/user/libsigc++/APKBUILD
+++ b/user/libsigc++/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libsigc++
pkgver=2.10.2
pkgrel=0
@@ -8,12 +8,11 @@ url="https://libsigcplusplus.github.io/libsigcplusplus/"
arch="all"
license="LGPL-2.1+"
depends=""
-makedepends=""
+makedepends="m4"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/libsigc++/${pkgver%.*}/libsigc++-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD
index f334b02ec..5ecf51deb 100644
--- a/user/libsoup/APKBUILD
+++ b/user/libsoup/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libsoup
pkgver=2.68.2
pkgrel=0
@@ -8,6 +8,7 @@ url="https://wiki.gnome.org/Projects/libsoup"
arch="all"
options="!check" # HSTS tests fail because .localdomain names fail to resolve.
license="LGPL-2.0+ AND LGPL-2.1+"
+depends=""
makedepends="glib-dev libxml2-dev sqlite-dev libpsl-dev intltool vala-dev
gobject-introspection-dev glib-networking meson ninja krb5-dev"
subpackages="$pkgname-dev $pkgname-lang"
diff --git a/user/libspectre/APKBUILD b/user/libspectre/APKBUILD
index 2e43f6abc..0caa4b284 100644
--- a/user/libspectre/APKBUILD
+++ b/user/libspectre/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev"
source="https://libspectre.freedesktop.org/releases/libspectre-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libstaroffice/APKBUILD b/user/libstaroffice/APKBUILD
index bad200ada..6f4829b12 100644
--- a/user/libstaroffice/APKBUILD
+++ b/user/libstaroffice/APKBUILD
@@ -9,13 +9,11 @@ arch="all"
options="!check" # No test suite.
license="MPL-2.0 OR LGPL-2.0+"
depends=""
-depends_dev="librevenge-dev"
-makedepends="$depends_dev zlib-dev boost-dev doxygen"
+makedepends="boost-dev doxygen librevenge-dev zlib-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="https://github.com/fosnola/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libstatgrab/APKBUILD b/user/libstatgrab/APKBUILD
index a1a24c35b..45a2bc72d 100644
--- a/user/libstatgrab/APKBUILD
+++ b/user/libstatgrab/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libstatgrab
pkgver=0.92
pkgrel=0
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://ftp.i-scream.org/pub/i-scream/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
LIBS="-lutmps -lskarnet -ltinfo" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD
index 3bf73d5d6..92acda745 100644
--- a/user/libsysstat/APKBUILD
+++ b/user/libsysstat/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libsysstat
pkgver=0.4.2
pkgrel=0
@@ -14,11 +14,9 @@ subpackages="$pkgname-dev"
source="https://github.com/lxqt/libsysstat/releases/download/$pkgver/libsysstat-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,13 +24,12 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="9059b9d20edbb7ecd89e722b48c6603b8042030ffad06d3eac167bb518691c2733d314649dc4c42a839d4812c7b65dcd043a13a6bd5b56678da112a8065717df libsysstat-0.4.2.tar.xz"
diff --git a/user/libtap/APKBUILD b/user/libtap/APKBUILD
index b8a992768..e2e8aa026 100644
--- a/user/libtap/APKBUILD
+++ b/user/libtap/APKBUILD
@@ -22,7 +22,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/libtirpc/APKBUILD b/user/libtirpc/APKBUILD
index 5231ff63d..e7322c37b 100644
--- a/user/libtirpc/APKBUILD
+++ b/user/libtirpc/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libtirpc
-pkgver=1.1.4
-pkgrel=1
+pkgver=1.2.5
+pkgrel=0
pkgdesc="Transport Independent RPC library (SunRPC replacement)"
url="https://sourceforge.net/projects/libtirpc/"
arch="all"
@@ -12,11 +12,11 @@ depends_dev="bsd-compat-headers krb5-dev"
makedepends="$depends_dev autoconf automake libtool linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg"
source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
- musl.patch"
+ bsd-types.patch
+ endian-header.patch
+ "
build() {
- cd "$builddir"
- export CFLAGS="$CFLAGS -D__u_char_defined -D__daddr_t_defined"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,9 +26,9 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="392f391f9fc1bd68d81dc44e4058831a64b32790b5c8c37338b0ab416fad2ae4d16389e632596734dba09780347918cc65c6f134e0c1afd09e81ec250785ed23 libtirpc-1.1.4.tar.bz2
-8e52246ae478ae9e4689426627e17d9c58d701f4fd21a40ffe3cf17c4ceaa4ab2e8e91d2fa3ba0d0c7adc52ae4b986fcda113ec86e370ede83903bb641de520c musl.patch"
+sha512sums="d31cd4e22301abe1baddd7e8f45aaaf056a40799e961646691d071084fed50563b5eecdd9b78062fe378be8db7a6d4b87597e21cb81ac925e447148684a2b002 libtirpc-1.2.5.tar.bz2
+237fd46e13bfce733023e425d561a43ef0a5dfd7f6fcdf1dd44d81a75cb08a7e2a4f80db313d145b45adf0f7f096cb7817786c5f73c0982b6ba34b3021b80d7c bsd-types.patch
+0a7a21a3d08bb0ff0110b993b8f8ddca41513ddaa0a468028a53eac9732a2a2e5070abe7da0a3ecff265b3800490c82f08810bd34e9d0af2e75345c86ef7d638 endian-header.patch"
diff --git a/user/libtirpc/bsd-types.patch b/user/libtirpc/bsd-types.patch
new file mode 100644
index 000000000..3fbe378b8
--- /dev/null
+++ b/user/libtirpc/bsd-types.patch
@@ -0,0 +1,12 @@
+u_int32_t (etc) is a BSD type. Define _BSD_SOURCE so musl declares it.
+
+--- libtirpc-1.2.5/tirpc/rpc/types.h.old 2019-12-19 18:55:48.000000000 +0000
++++ libtirpc-1.2.5/tirpc/rpc/types.h 2019-12-29 19:17:59.146261005 +0000
+@@ -38,6 +38,7 @@
+ #ifndef _TIRPC_TYPES_H
+ #define _TIRPC_TYPES_H
+
++#define _BSD_SOURCE
+ #include <sys/types.h>
+
+ typedef int32_t bool_t;
diff --git a/user/libtirpc/endian-header.patch b/user/libtirpc/endian-header.patch
new file mode 100644
index 000000000..9f9523305
--- /dev/null
+++ b/user/libtirpc/endian-header.patch
@@ -0,0 +1,13 @@
+Fix location of endian.h. Yay for POSIX next.
+
+--- libtirpc-1.2.5/src/xdr_float.c.old 2019-12-19 18:55:48.000000000 +0000
++++ libtirpc-1.2.5/src/xdr_float.c 2019-12-29 18:54:28.408092748 +0000
+@@ -83,7 +83,7 @@
+ };
+ #else
+
+-#include <bits/endian.h>
++#include <endian.h>
+ #define IEEEFP
+
+ #endif /* vax */
diff --git a/user/libtirpc/musl.patch b/user/libtirpc/musl.patch
deleted file mode 100644
index 5a4fb04f5..000000000
--- a/user/libtirpc/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./tirpc/rpc/types.h.orig 2018-03-17 10:23:10.022055255 +0100
-+++ ./tirpc/rpc/types.h 2018-03-17 10:23:30.877751656 +0100
-@@ -66,7 +66,7 @@
- #define mem_free(ptr, bsize) free(ptr)
-
-
--#if defined __APPLE_CC__ || defined __FreeBSD__
-+#if defined __APPLE_CC__ || defined __FreeBSD__ || !defined(__GLIBC__)
- # define __u_char_defined
- # define __daddr_t_defined
- #endif
diff --git a/user/libtommath/APKBUILD b/user/libtommath/APKBUILD
index 2e5bce094..e54de9fc0 100644
--- a/user/libtommath/APKBUILD
+++ b/user/libtommath/APKBUILD
@@ -1,14 +1,15 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=libtommath
-pkgver=1.1.0
+pkgver=1.2.0
pkgrel=0
pkgdesc="Theoretic multiple-precision integer library"
url="https://www.libtom.net/LibTomMath/"
arch="all"
+options="!check" # no longer builds properly, tested manually on gwyn
license="Unlicense"
depends=""
-makedepends=""
+makedepends="libtool"
subpackages="$pkgname-dev"
source="https://github.com/libtom/libtommath/releases/download/v$pkgver/ltm-$pkgver.tar.xz"
@@ -17,11 +18,12 @@ build() {
}
check() {
- make PREFIX=/usr -f makefile.shared test_standalone
+ make PREFIX=/usr -f makefile.shared -j1 test
+ ./test
}
package() {
make PREFIX=/usr DESTDIR="$pkgdir" -f makefile.shared install
}
-sha512sums="6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91 ltm-1.1.0.tar.xz"
+sha512sums="6f9ccd0691831f07f86ddc81cb6145504b3d5da66dd3e92312c64cce0ea986fa4e08ba65ca8991aaebe56702c2d7c15f309696785b813dffb4c112a4ad04b203 ltm-1.2.0.tar.xz"
diff --git a/user/libvisio/APKBUILD b/user/libvisio/APKBUILD
index a22189789..e9cf48128 100644
--- a/user/libvisio/APKBUILD
+++ b/user/libvisio/APKBUILD
@@ -7,9 +7,9 @@ pkgdesc="Import filter and tools for MS Visio diagrams"
url="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
arch="all"
license="MPL-2.0"
-depends_dev="librevenge-dev"
-makedepends="$depends_dev boost-dev icu-dev libxml2-dev doxygen gperf perl"
+depends=""
checkdepends="cppunit-dev"
+makedepends="boost-dev icu-dev librevenge-dev libxml2-dev doxygen gperf perl"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
diff --git a/user/libvncserver/APKBUILD b/user/libvncserver/APKBUILD
index 764fec75a..2b42311c2 100644
--- a/user/libvncserver/APKBUILD
+++ b/user/libvncserver/APKBUILD
@@ -12,7 +12,7 @@ depends=""
depends_dev="libgcrypt-dev libjpeg-turbo-dev gnutls-dev libpng-dev
libice-dev libx11-dev libxdamage-dev libxext-dev libxfixes-dev
libxi-dev libxinerama-dev libxrandr-dev libxtst-dev"
-makedepends="$depends_dev autoconf automake libtool"
+makedepends="$depends_dev cmake"
subpackages="$pkgname-dev"
source="https://github.com/LibVNC/libvncserver/archive/LibVNCServer-$pkgver.tar.gz
CVE-2018-15127.patch"
@@ -35,7 +35,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/libwebp/APKBUILD b/user/libwebp/APKBUILD
index 93ef7b9dd..a003a6b92 100644
--- a/user/libwebp/APKBUILD
+++ b/user/libwebp/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer:
pkgname=libwebp
pkgver=1.0.3
@@ -7,6 +7,7 @@ pkgdesc="Libraries for working with WebP images"
url="https://developers.google.com/speed/webp/"
arch="all"
license="BSD-3-Clause"
+depends=""
makedepends="libpng-dev libjpeg-turbo-dev tiff-dev giflib-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$pkgver.tar.gz"
diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD
index 2c7bc1b78..5eb5e4e81 100644
--- a/user/libwnck/APKBUILD
+++ b/user/libwnck/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libwnck
pkgver=3.32.0
_pkgmaj=${pkgver%.*}
@@ -13,27 +13,19 @@ makedepends="glib-dev gtk+3.0-dev gobject-introspection-dev libxres-dev
subpackages="$pkgname-dev $pkgname-lang"
source="https://download.gnome.org/sources/libwnck/$_pkgmaj/libwnck-$pkgver.tar.xz"
-prepare() {
- default_prepare
- mkdir -p "$builddir"/build
-}
-
build() {
- cd "$builddir"/build
meson \
-Dprefix=/usr \
- ..
- ninja
+ build .
+ ninja -C build
}
check() {
- cd "$builddir"/build
- ninja test
+ ninja -C build test
}
package() {
- cd "$builddir"/build
- DESTDIR="$pkgdir" ninja install
+ DESTDIR="$pkgdir" ninja -C build install
}
sha512sums="a939b96feda20b0eba2b87556b97a9ba4b9aaea4c82c0e274a23796a3a9b49cb93be582d79e32a52a87b5ca6e35182a9d617cb802802b3c2ba2bff2b028aa3de libwnck-3.32.0.tar.xz"
diff --git a/user/libwps/APKBUILD b/user/libwps/APKBUILD
index f58ca254b..c8744c72e 100644
--- a/user/libwps/APKBUILD
+++ b/user/libwps/APKBUILD
@@ -9,13 +9,11 @@ arch="all"
options="!check" # No test suite.
license="(MPL-2.0 OR LGPL-2.1+) AND BSD-3-Clause"
depends=""
-depends_dev="librevenge-dev"
-makedepends="$depends_dev doxygen"
+makedepends="doxygen librevenge-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
-source="http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
+source="https://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,7 +26,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libxaw/APKBUILD b/user/libxaw/APKBUILD
index a817b0bb1..3dd598556 100644
--- a/user/libxaw/APKBUILD
+++ b/user/libxaw/APKBUILD
@@ -14,7 +14,6 @@ source="https://www.X.Org/releases/individual/lib/libXaw-$pkgver.tar.bz2"
builddir="$srcdir"/libXaw-$pkgver
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -30,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libxdg-basedir/APKBUILD b/user/libxdg-basedir/APKBUILD
index 50a1e7dfc..70fe0d512 100644
--- a/user/libxdg-basedir/APKBUILD
+++ b/user/libxdg-basedir/APKBUILD
@@ -1,27 +1,24 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
-# TODO: Repackage from better source, rehost or something.
pkgname=libxdg-basedir
pkgver=1.2.0
pkgrel=0
pkgdesc="library for XDG base dir specification"
-url="https://nevill.ch/libxdg-basedir/"
+url=" " # No URL.
arch="all"
license="MIT"
depends=""
-makedepends=""
+makedepends="autoconf automake libtool"
subpackages="$pkgname-dev"
-source="https://nevill.ch/libxdg-basedir/downloads/$pkgname-$pkgver.tar.gz"
+source="http://ponce.cc/slackware/sources/repo/libxdg-basedir-1.2.0.tar.xz"
prepare() {
- cd "$builddir"
default_prepare
- update_config_sub
+ ./autogen.sh
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,13 +28,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="346553ddd9d0a0c854af9320f2ced695a0838adc18736b66120bea48ea60cb9ea3a7390672a42f83909db92f692e94de833d9e8bcfe51568a72ad1f4661fde06 libxdg-basedir-1.2.0.tar.gz"
+sha512sums="f1766cd94dd66fcba9211427910ef02c7f203c7bf655e74b903566a68521d1c156c9687cd89eca73428098c0a78a1458cada2057dd9268b6f6b48229c80b5d2e libxdg-basedir-1.2.0.tar.xz"
diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD
index 561c84bcf..62acc0a53 100644
--- a/user/libxfce4ui/APKBUILD
+++ b/user/libxfce4ui/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libxfce4ui
pkgver=4.14.1
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="UI library for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="LGPL-2.0+ AND GPL-2.0+"
+depends=""
makedepends="intltool gtk+3.0-dev gobject-introspection-dev vala-dev
libxfce4util-dev xfconf-dev startup-notification-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
@@ -20,7 +21,8 @@ build() {
--sysconfdir=/etc \
--mandir=/usr/share/man \
--localstatedir=/var \
- --enable-vala=yes
+ --enable-vala=yes \
+ --with-vendor-info="Adélie Linux"
make
}
diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD
index 8e8bcb8aa..823692e8e 100644
--- a/user/libxfce4util/APKBUILD
+++ b/user/libxfce4util/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libxfce4util
pkgver=4.14.0
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Utility library for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="LGPL-2.0+ GPL-2.0+"
+depends=""
makedepends="intltool glib-dev gobject-introspection-dev vala"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://archive.xfce.org/src/xfce/libxfce4util/4.14/libxfce4util-$pkgver.tar.bz2"
diff --git a/user/libxklavier/APKBUILD b/user/libxklavier/APKBUILD
index e1addd860..6a788bbce 100644
--- a/user/libxklavier/APKBUILD
+++ b/user/libxklavier/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libxklavier
pkgver=5.4
pkgrel=1
@@ -7,6 +7,7 @@ pkgdesc="High-level API for XKB"
url="https://www.freedesktop.org/wiki/Software/LibXklavier/"
arch="all"
license="LGPL-2.0+"
+depends=""
makedepends="gobject-introspection-dev libx11-dev libxml2-dev glib-dev
libxcb-dev libxkbcommon-dev libxkbfile-dev libxi-dev iso-codes-dev
vala-dev"
@@ -14,13 +15,11 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://people.freedesktop.org/~svu/libxklavier-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +31,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libxp/APKBUILD b/user/libxp/APKBUILD
index 45cfad2bb..25953833a 100644
--- a/user/libxp/APKBUILD
+++ b/user/libxp/APKBUILD
@@ -14,7 +14,6 @@ source="https://www.x.org/releases/individual/lib/libXp-$pkgver.tar.bz2"
builddir="$srcdir/libXp-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/libxres/APKBUILD b/user/libxres/APKBUILD
index 9244440c4..9c8914958 100644
--- a/user/libxres/APKBUILD
+++ b/user/libxres/APKBUILD
@@ -6,9 +6,9 @@ pkgdesc="X11 X-Resource extension library"
url="https://www.X.Org/"
arch="all"
license="MIT AND X11"
-subpackages="$pkgname-dev $pkgname-doc"
depends=""
makedepends="libx11-dev libxext-dev util-macros xorgproto-dev"
+subpackages="$pkgname-dev $pkgname-doc"
source="https://www.X.Org/releases/individual/lib/libXres-$pkgver.tar.bz2"
builddir="$srcdir"/libXres-$pkgver
diff --git a/user/libzip/APKBUILD b/user/libzip/APKBUILD
index 9c1836e60..379075ae7 100644
--- a/user/libzip/APKBUILD
+++ b/user/libzip/APKBUILD
@@ -9,6 +9,7 @@ pkgdesc="C library for manipulating ZIP archives"
url="https://libzip.org/"
arch="all"
license="BSD-3-Clause"
+depends=""
depends_dev="zlib-dev"
makedepends="$depends_dev cmake openssl-dev perl"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
@@ -25,7 +26,7 @@ build() {
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS"
+ -DCMAKE_C_FLAGS="$CFLAGS" .
make
}
diff --git a/user/libzmf/APKBUILD b/user/libzmf/APKBUILD
index 6829fb3f8..c81460caa 100644
--- a/user/libzmf/APKBUILD
+++ b/user/libzmf/APKBUILD
@@ -9,8 +9,8 @@ arch="all"
license="MPL-2.0"
depends=""
depends_dev="boost-dev icu-dev libpng-dev zlib-dev"
-makedepends="$depends_dev librevenge-dev doxygen"
checkdepends="cppunit-dev"
+makedepends="$depends_dev librevenge-dev doxygen"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="http://dev-www.libreoffice.org/src/$pkgname/$pkgname-$pkgver.tar.xz"
@@ -20,7 +20,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD
index 5f768bbdd..30f8f9aef 100644
--- a/user/lighttpd/APKBUILD
+++ b/user/lighttpd/APKBUILD
@@ -5,15 +5,16 @@ pkgver=1.4.54
pkgrel=2
pkgdesc="A secure, fast, compliant and very flexible web-server"
url="http://www.lighttpd.net/"
-arch="all"
-license="BSD-3-Clause"
-install="$pkgname.pre-install $pkgname.pre-upgrade"
pkgusers="lighttpd"
pkggroups="lighttpd"
+arch="all"
+license="BSD-3-Clause"
+depends=""
makedepends="attr-dev bzip2-dev flex gamin-dev libev-dev libxml2-dev
openldap-dev openssl-dev pcre-dev sqlite-dev zlib-dev"
subpackages="$pkgname-doc $pkgname-dbg $pkgname-mod_auth $pkgname-openrc
$pkgname-mod_webdav"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
source="http://download.lighttpd.net/lighttpd/releases-1.4.x/$pkgname-$pkgver.tar.xz
$pkgname.initd
$pkgname.confd
diff --git a/user/listres/APKBUILD b/user/listres/APKBUILD
index 987002899..168ef1a37 100644
--- a/user/listres/APKBUILD
+++ b/user/listres/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/listres-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/live-media/APKBUILD b/user/live-media/APKBUILD
index e8e7a88e4..128b7ad39 100644
--- a/user/live-media/APKBUILD
+++ b/user/live-media/APKBUILD
@@ -1,12 +1,14 @@
# Maintainer:
pkgname=live-media
-pkgver=2019.11.11
+pkgver=2019.12.30
pkgrel=0
pkgdesc="Libraries for multimedia streaming"
url="http://live555.com/liveMedia"
arch="all"
options="!check" # No test suite.
license="LGPL-3.0+"
+depends=""
+makedepends="openssl-dev"
subpackages="$pkgname-dev $pkgname-utils"
source="http://live555.com/liveMedia/public/live.$pkgver.tar.gz"
builddir="$srcdir"/live
@@ -23,7 +25,6 @@ build() {
}
package() {
- local testprog f so
mkdir -p "$pkgdir"/usr/lib
for f in BasicUsageEnvironment UsageEnvironment liveMedia groupsock; do
mkdir -p "$pkgdir"/usr/include/$f
@@ -50,4 +51,4 @@ utils() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="e06f6a1cdfe414ec776c910c099e26e7cbffa67c2367f4af217e0f3c8e5989f593df19884d26a085026b12a6acbf9276a78e01a473139300baa0d2a0d35ba31e live.2019.11.11.tar.gz"
+sha512sums="223ce65751099e5f84767939e75cefa19f10780d7e894991b4f7164c4bafa4ed8942713f237df74933caa0e1f0ead83bf69c95f232f84f7220082613cc84bc83 live.2019.12.30.tar.gz"
diff --git a/user/lksctp-tools/APKBUILD b/user/lksctp-tools/APKBUILD
index c625bb4d5..645230f32 100644
--- a/user/lksctp-tools/APKBUILD
+++ b/user/lksctp-tools/APKBUILD
@@ -8,7 +8,7 @@ url="http://lksctp.sourceforge.net/"
arch="all"
license="GPL-2.0-only AND LGPL-2.1-only"
depends=""
-makedepends="autoconf automake"
+makedepends="autoconf automake libtool"
subpackages="$pkgname-dev $pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/sctp/$pkgname/archive/v$pkgver.tar.gz
header-install.patch
diff --git a/user/lm_sensors/APKBUILD b/user/lm_sensors/APKBUILD
index bf7ed865c..19286ae5f 100644
--- a/user/lm_sensors/APKBUILD
+++ b/user/lm_sensors/APKBUILD
@@ -22,7 +22,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/lm-sensors/lm-sensors/archiv
builddir="$srcdir/$_pkgname-$_pkgver"
prepare() {
- cd "$builddir"
+ default_prepare
+
sed -i -e 's:^# \(PROG_EXTRA\):\1:' Makefile
# Respect LDFLAGS
sed -i -e 's/\$(LIBDIR)$/\$(LIBDIR) \$(LDFLAGS)/g' Makefile
@@ -31,39 +32,32 @@ prepare() {
# do not check for libiconv in ldconfig cache
sed -i -e 's/^LIBICONV.*/LIBICONV ?=/' prog/sensors/Module.mk
-
- default_prepare
}
build() {
- cd "$builddir"
export CFLAGS="$CFLAGS -fno-stack-protector"
make PREFIX=/usr user
}
package() {
- cd "$builddir"
make PROG_EXTRA:=sensord user_install \
PREFIX=/usr \
MANDIR=/usr/share/man \
DESTDIR="$pkgdir"
- cd "$srcdir"
- install -Dm755 fancontrol.initd "$pkgdir"/etc/init.d/fancontrol
+ install -Dm755 "$srcdir"/fancontrol.initd "$pkgdir"/etc/init.d/fancontrol
}
detect() {
depends="perl"
pkgdesc="Detection/migration scripts for lm_sensors"
mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/sbin
- cd "$pkgdir"
- mv usr/bin/sensors-conf-convert "$subpkgdir"/usr/bin/
- mv usr/sbin/sensors-detect "$subpkgdir"/usr/bin/
+ mv "$pkgdir"/usr/bin/sensors-conf-convert "$subpkgdir"/usr/bin/
+ mv "$pkgdir"/usr/sbin/sensors-detect "$subpkgdir"/usr/bin/
}
sensord() {
pkgdesc="sensord daemon"
- cd "$builddir"
mkdir -p "$subpkgdir"/usr/sbin
mv "$pkgdir"/usr/sbin/sensord "$subpkgdir"/usr/sbin/sensord
}
diff --git a/user/lohit-ttf/APKBUILD b/user/lohit-ttf/APKBUILD
index 9b464c39e..cf0d06e27 100644
--- a/user/lohit-ttf/APKBUILD
+++ b/user/lohit-ttf/APKBUILD
@@ -14,8 +14,7 @@ subpackages=""
source="https://releases.pagure.org/lohit/lohit-ttf-$pkgver.tar.gz"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
}
sha512sums="b622be55e16a8ccbad0d2fc6e546c072e0af1954a36095a00f31e09e6dd80e86e98a36f4a4a7b8adf21a3f380f816e6fe77ef2e61f15521abfd9f7f4b8c06cbc lohit-ttf-20140220.tar.gz"
diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD
index 731853147..bb7df17c7 100644
--- a/user/lskat/APKBUILD
+++ b/user/lskat/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=lskat
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
-pkgdesc="Lieutenant Skat is an interactive two-player card game"
+pkgdesc="Lieutenant Skat, an interactive two-player card game"
url="https://games.kde.org/game.php?game=lskat"
arch="all"
license="GPL-2.0-only"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kdbusaddons-dev kdoctools-dev kguiaddons-dev ki18n-dev kxmlgui-dev
kwidgetsaddons-dev libkdegames-dev phonon-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/lskat-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/lskat-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="cb83c64de6cb6988bdd9a0abe14aa88085bcc76f5932709fc74baf91d9f98a9189d29081d422db573c31f84333e9e05de65714311c418b5b218e90c8ed66995e lskat-19.08.2.tar.xz"
+sha512sums="b256c7d60397f442be56c489b32b6c50d8ded0553c3dd96414739a59ac5037a4aacd575f905bccb1ca772cedf541dd0502aa724fd215c67bbc4910dde9dbc1d6 lskat-19.12.1.tar.xz"
diff --git a/user/lsof/APKBUILD b/user/lsof/APKBUILD
index 370d8c7a7..5330d1a7a 100644
--- a/user/lsof/APKBUILD
+++ b/user/lsof/APKBUILD
@@ -1,30 +1,24 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=lsof
-pkgver=4.91
+pkgver=4.93.2
pkgrel=0
pkgdesc="LiSt Open Files"
url="https://people.freebsd.org/~abe"
arch="all"
license="zlib-acknowledgement"
-subpackages="$pkgname-doc"
+depends=""
makedepends="linux-headers cmd:which utmps-dev"
-source="http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/${pkgname}_${pkgver}.tar.gz
+subpackages="$pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/lsof-org/lsof/archive/$pkgver.tar.gz
utmps.patch
+ test-disable-nfs-test.patch
test-enable-suite.patch
test-linux-sysmacros.patch
- test-disable-nfs-test.patch"
-builddir="$srcdir/${pkgname}_${pkgver}"
-
-unpack() {
- default_unpack
- cd "$builddir"
- tar xf "${pkgname}_${pkgver}_src.tar"
-}
+ "
prepare() {
default_prepare
- cd "$builddir/${pkgname}_${pkgver}_src"
sed -i "s|/\* #define\tHASSECURITY\t1 \*/|#define\tHASSECURITY\t1|" \
dialects/linux/machine.h
@@ -32,32 +26,26 @@ prepare() {
}
build () {
- cd "$builddir/${pkgname}_${pkgver}_src"
-
./Configure -n linux
make
}
check() {
- cd "$builddir/${pkgname}_${pkgver}_src/tests"
-
# The LTsock test will fail if /etc/hosts is not set correctly.
# Make sure that 127.0.0.1 and ::1 have aliases corresponding to
# `hostname`.
- printf "y" | make
- make opt
+ printf "y" | make -C tests
+ make -C tests opt
}
package() {
- cd "$builddir/${pkgname}_${pkgver}_src"
-
install -Dm755 lsof "$pkgdir/usr/bin/lsof"
- install -Dm644 lsof.8 "$pkgdir/usr/share/man/man8/lsof.8"
+ install -Dm644 Lsof.8 "$pkgdir/usr/share/man/man8/lsof.8"
install -Dm644 COPYING "$pkgdir/usr/share/licenses/lsof/COPYING"
}
-sha512sums="95937afda1ba58e6636b2a2661d819480ec42b4beafc0e69e6132d7fdffd4e3974a95036a02c6fd8baf92089c73ac969cdc00a297bf0249257867d695bff2f94 lsof_4.91.tar.gz
-dfbfcfd41a4bccf3335ed01cc2dc9a11b6badd3149878d89ef5fed322a914d3d8341c68783140a4973d007907ce54b4438f011c26289df9e27d2d487a8f6b0b0 utmps.patch
-34d9573f90d942c717e3f3ff17283a66981c4a2e8e886746b591f980142d66115bc7afe6bdd0fc660ea6c1b42f591b161b9535e5849b8757e79546c197ccfdda test-linux-sysmacros.patch
-7f3e9b2850af54a5391db6a8f7eaa22329217fd559d3d41ee3bcd33b07b3526d17da75a542d28b013111bc5d5712a718e961aa4fe84ca3c5e73a97e0518ba2ec test-enable-suite.patch
-d299e2070415168f75a9ee6424e18c1496f6d1fd5430b13a92159422c9df58050ac63e22cebd13a5228207f5960cf2cde5830a46c9ec7a4c216f5e6fb71887f4 test-disable-nfs-test.patch"
+sha512sums="3c4a4d503391b1a648a08a4947c2e72a9629b169eddf50738b16a16a82f2a26967e4db2902e4a9157de5a73ae638db48e392117ffbd591e9fafd6b1725cd01a0 lsof-4.93.2.tar.gz
+d6f2f5b991c137abf30b8cd29eebaf7662f7255e6d99b7fba5c945eba09a2c7ce7c444895e72c6871a7d90fe3ad8ca28b052a428127ba0342b13b3b027a3c77f utmps.patch
+f2128d3aa3183244ade8a553f5a1ca7a5db571eae4ebd9c87c05f4b2996de152796573dd35d9c57d0f35671f2eb928b66fe637b1693ec1b8828c9a8d739c6771 test-disable-nfs-test.patch
+72923d42db63435a95b07d17b6c6e8ac64f1a8f20505f851ed706783078bce0c49cac61dd8c05c08d24333c07ad981aaf34d4a4e4d1edb2a82ae8c9e9b8328e0 test-enable-suite.patch
+14473839fa695e84cddac8bc1a33e06aba082bcc56baa6c4a6134a6c55ec1c9d08f756dab483785c0796a9442345853f7762fed76efb60a732fbc709bb06d25f test-linux-sysmacros.patch"
diff --git a/user/lsof/test-disable-nfs-test.patch b/user/lsof/test-disable-nfs-test.patch
index 9ccb11cf9..ed1b88ed4 100644
--- a/user/lsof/test-disable-nfs-test.patch
+++ b/user/lsof/test-disable-nfs-test.patch
@@ -1,7 +1,7 @@
LTnfs requires a NFS filesystem in order to run.
---- lsof_4.91/lsof_4.91_src/tests/Makefile 2006-01-10 13:27:52.000000000 -0500
-+++ lsof_4.91/lsof_4.91_src/tests/Makefile 2018-09-12 18:27:52.309560442 -0400
+--- lsof_4.91/tests/Makefile 2006-01-10 13:27:52.000000000 -0500
++++ lsof_4.91/tests/Makefile 2018-09-12 18:27:52.309560442 -0400
@@ -19,7 +19,7 @@
BASTST= LTbasic
diff --git a/user/lsof/test-enable-suite.patch b/user/lsof/test-enable-suite.patch
index 7601aa9c0..c5fc9286c 100644
--- a/user/lsof/test-enable-suite.patch
+++ b/user/lsof/test-enable-suite.patch
@@ -1,5 +1,5 @@
---- lsof_4.91/lsof_4.91_src/tests/CkTestDB 2010-02-12 15:37:05.000000000 -0500
-+++ lsof_4.91/lsof_4.91_src/tests/CkTestDB 2018-09-12 18:22:36.179562676 -0400
+--- lsof_4.91/tests/CkTestDB 2010-02-12 15:37:05.000000000 -0500
++++ lsof_4.91/tests/CkTestDB 2018-09-12 18:22:36.179562676 -0400
@@ -67,6 +68,5 @@
echo ""
- exit 1
diff --git a/user/lsof/test-linux-sysmacros.patch b/user/lsof/test-linux-sysmacros.patch
index bc75a9f39..1764f5369 100644
--- a/user/lsof/test-linux-sysmacros.patch
+++ b/user/lsof/test-linux-sysmacros.patch
@@ -1,5 +1,5 @@
---- lsof_4.91/lsof_4.91_src/tests/LTlib.c 2017-09-10 19:05:11.000000000 -0400
-+++ lsof_4.91/lsof_4.91_src/tests/LTlib.c 2018-09-12 18:05:26.719569950 -0400
+--- lsof_4.91/tests/LTlib.c 2017-09-10 19:05:11.000000000 -0400
++++ lsof_4.91/tests/LTlib.c 2018-09-12 18:05:26.719569950 -0400
@@ -189,6 +189,12 @@
#endif /* defined(LT_DIAL_uw) */
diff --git a/user/lsof/utmps.patch b/user/lsof/utmps.patch
index 91324e28e..f4790a818 100644
--- a/user/lsof/utmps.patch
+++ b/user/lsof/utmps.patch
@@ -1,5 +1,5 @@
---- lsof_4.91/lsof_4.91_src/Configure 2018-02-14 09:18:55.000000000 -0500
-+++ lsof_4.91/lsof_4.91_src/Configure 2018-09-12 17:48:25.269577168 -0400
+--- lsof_4.91/Configure 2018-02-14 09:18:55.000000000 -0500
++++ lsof_4.91/Configure 2018-09-12 17:48:25.269577168 -0400
@@ -2943,6 +2943,12 @@
LSOF_CFGF="$LSOF_CFGF -DHASIPv6"
fi # }
diff --git a/user/lua-expat/32bit.patch b/user/lua-expat/32bit.patch
new file mode 100644
index 000000000..5a09710e1
--- /dev/null
+++ b/user/lua-expat/32bit.patch
@@ -0,0 +1,11 @@
+--- luaexpat-1.3.3/makefile.old 2018-11-27 11:31:28.000000000 +0000
++++ luaexpat-1.3.3/makefile 2020-01-24 06:06:47.843102618 +0000
+@@ -36,7 +36,7 @@
+ -Wpointer-arith \
+ -Wshadow \
+ -Wwrite-strings \
+- -DLUA_C89_NUMBERS
++ -Wno-long-long
+
+ CFLAGS = -fPIC -std=gnu99 $(CWARNS) -ansi -O2 -I$(LUA_INC) -I$(EXPAT_INC)
+ CC = gcc
diff --git a/user/lua-expat/APKBUILD b/user/lua-expat/APKBUILD
index 9c8a6713a..704f89173 100644
--- a/user/lua-expat/APKBUILD
+++ b/user/lua-expat/APKBUILD
@@ -1,9 +1,8 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
# Contribtor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lua-expat
-_name=expat
-pkgver=1.3.0
+pkgver=1.3.3
pkgrel=0
pkgdesc="SAX XML parser based on the Expat library"
url="https://matthewwild.co.uk/projects/luaexpat/"
@@ -11,22 +10,25 @@ arch="all"
license="MIT"
depends="lua5.3"
makedepends="lua5.3-dev expat-dev"
-source="http://matthewwild.co.uk/projects/luaexpat/luaexpat-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/tomasguisasola/luaexpat/archive/v1.3.3.tar.gz
+ 32bit.patch
+ "
builddir="$srcdir/luaexpat-$pkgver"
build() {
- cd "$builddir"
make LUA_V=5.3
}
check() {
- cd "$builddir"
- LUA_CPATH="./src/?.so" lua tests/test.lua
+ LUA_CPATH="./src/?.so.1.3.3" lua tests/test.lua
}
package() {
- cd "$builddir"
- make LUA_V=5.3 DESTDIR="$pkgdir" install
+ make \
+ LUA_LIBDIR="$pkgdir"/usr/lib/lua5.3 \
+ LUA_DIR="$pkgdir"/usr/share/lua5.3 \
+ LUA_V=5.3 DESTDIR="$pkgdir" install
}
-sha512sums="91884653310e2dc89ade6d1653875ac8607640a21853d3ccb1fd0f833812e41981fad5c40101732ec249104d2c50c9a332208d1e44423b8428065a223c60b4ae luaexpat-1.3.0.tar.gz"
+sha512sums="aa3f730c64cae3791fc1125302178ec2398d2380e8ec0e65ca4b29f532f181f149baaf555bf687e502b28726d3fd0baafd4f73cf26f04f625d18bbaddb043d63 lua-expat-1.3.3.tar.gz
+ac5b05991dfe36bcc0c9ff7570110dbb1face387c0b65e4735b99cedaff5e29311a919b5e8ce6dae2ac674eadd2fa0bea6ec547754071d325dcce6460eeef36e 32bit.patch"
diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD
index e0deea91a..11e166311 100644
--- a/user/lua-filesystem/APKBUILD
+++ b/user/lua-filesystem/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lua-filesystem
_pkgname=luafilesystem
pkgver=1.7.0.2
@@ -16,18 +16,15 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/keplerproject/$_pkgname/arc
builddir="$srcdir/$_pkgname-$_pkgver"
build() {
- cd "$builddir"
make CFLAGS="$CFLAGS $(pkg-config lua --cflags) -fPIC"
}
check() {
- cd "$builddir"
LUA_CPATH=./src/?.so lua tests/test.lua
}
package() {
- local rockdir="$pkgdir/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver"
- cd "$builddir"
+ rockdir="$pkgdir/usr/lib/luarocks/rocks-5.3/$_pkgname/$_rockver"
make LUA_LIBDIR="$pkgdir/$(pkg-config --variable=INSTALL_CMOD lua)" install
mkdir -p "$rockdir"
echo 'rock_manifest = {}' > "$rockdir"/rock_manifest
diff --git a/user/lua-lgi/APKBUILD b/user/lua-lgi/APKBUILD
index f9b07ca3b..be1bd5334 100644
--- a/user/lua-lgi/APKBUILD
+++ b/user/lua-lgi/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
pkgdesc="Dynamic Lua binding to GObject libraries using GObject-Introspection"
url="https://github.com/pavouk/lgi"
arch="all"
+options="!check" # Test suite requires D-Bus.
license="MIT"
-options="!check" # checks require dbus
depends=""
makedepends="glib-dev gobject-introspection-dev libffi-dev lua5.3-dev"
subpackages="$pkgname-doc"
@@ -15,18 +15,15 @@ source="lgi-$pkgver.tar.gz::https://github.com/pavouk/lgi/archive/$pkgver.tar.gz
builddir="$srcdir"/lgi-$pkgver
build() {
- cd "$builddir"
make PREFIX=/usr LUA_VERSION="5.3" \
LUA_CFLAGS="$(pkg-config --cflags lua)"
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make install PREFIX=/usr LUA_VERSION="5.3" DESTDIR="$pkgdir"
mkdir -p "$pkgdir"/usr/share/doc/lua-lgi
diff --git a/user/lua-sec/APKBUILD b/user/lua-sec/APKBUILD
index 8244f3306..2ab2f12fc 100644
--- a/user/lua-sec/APKBUILD
+++ b/user/lua-sec/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="TLS/SSL Support for Lua"
url="https://github.com/brunoos/luasec/wiki"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="MIT"
depends="lua5.3 lua-socket"
makedepends="lua5.3-dev openssl-dev"
diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD
index 89cbd7447..7c0197036 100644
--- a/user/lua-socket/APKBUILD
+++ b/user/lua-socket/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lua-socket
_name=luasocket
pkgver=3.0_rc1_git20160306
@@ -19,19 +19,16 @@ source="luasocket-$_ver.tar.gz::https://github.com/diegonehab/luasocket/archive/
builddir="$srcdir/$_name-$_ver"
build() {
- cd "$builddir"
make LUAV=""
}
check() {
- cd "$builddir"
mkdir -p src/socket && cp src/socket-$_ver.so src/socket/core.so
mkdir -p src/mime && cp src/mime-1.0.3.so src/mime/core.so
LUA_CPATH=./src/?.so LUA_PATH="./src/?.lua;;" lua test/hello.lua
}
package() {
- cd "$builddir"
make prefix=/usr DESTDIR="$pkgdir" LUAV="5.3" install-unix
}
diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD
index dbceb82e5..42695a0ef 100644
--- a/user/luarocks/APKBUILD
+++ b/user/luarocks/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=luarocks
pkgver=3.2.1
pkgrel=0
diff --git a/user/luit/APKBUILD b/user/luit/APKBUILD
index 09e135e12..5464e3d9d 100644
--- a/user/luit/APKBUILD
+++ b/user/luit/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/luit-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD
index 41752c57a..b5a76d86d 100644
--- a/user/lximage-qt/APKBUILD
+++ b/user/lximage-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lximage-qt
pkgver=0.14.1
pkgrel=0
@@ -15,11 +15,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 libexif-dev
source="https://github.com/lxqt/lximage-qt/releases/download/$pkgver/lximage-qt-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -27,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd lximage-qt-0.14.1.tar.xz"
diff --git a/user/lxmenu-data/APKBUILD b/user/lxmenu-data/APKBUILD
index 846d44da3..a8d4d4b92 100644
--- a/user/lxmenu-data/APKBUILD
+++ b/user/lxmenu-data/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxmenu-data
pkgver=0.1.5
pkgrel=1
@@ -8,17 +8,16 @@ url="https://lxqt.org"
arch="noarch"
options="!check" # No test suite.
license="LGPL-2.1+"
+depends=""
makedepends="automake autoconf glib-dev intltool"
source="lxmenu-data-$pkgver.tar.gz::https://github.com/lxde/lxmenu-data/archive/$pkgver.tar.gz"
prepare() {
default_prepare
- cd "$builddir"
./autogen.sh
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,7 +28,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD
index 8a6f865c9..767194b42 100644
--- a/user/lxqt-about/APKBUILD
+++ b/user/lxqt-about/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-about
pkgver=0.14.1
pkgrel=0
@@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev
source="https://github.com/lxqt/lxqt-about/releases/download/$pkgver/lxqt-about-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,13 +24,12 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="09cbb4c6c331b16b551d1b63ad4643f424fbaa35cfa9e2d4c70393fae499d403bf8a70c8105d258bd84200d06862033bfe0a082500e794b0db10df38d27b407a lxqt-about-0.14.1.tar.xz"
diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD
index 2dc1b1db3..a464f20d0 100644
--- a/user/lxqt-admin/APKBUILD
+++ b/user/lxqt-admin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-admin
pkgver=0.14.1
pkgrel=0
@@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev
source="https://github.com/lxqt/lxqt-admin/releases/download/$pkgver/lxqt-admin-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,13 +24,12 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="bd6272a3042a71e9e00b2ba10be2575649c2d2750a4e00a6e11adaae6b91ccab5e3cf79a8ceb7bfbe808ec80c139b93e02cd96990f80b68a77a974c063e6a373 lxqt-admin-0.14.1.tar.xz"
diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD
index 1447fdee0..a2ffa3160 100644
--- a/user/lxqt-build-tools/APKBUILD
+++ b/user/lxqt-build-tools/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-build-tools
pkgver=0.6.0
pkgrel=0
@@ -11,28 +11,26 @@ options="!check"
license="BSD-3-Clause"
depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev"
+subpackages=""
source="lxqt-build-tools-$pkgver.tar.gz::https://github.com/lxde/lxqt-build-tools/archive/$pkgver.tar.gz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
- -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="701b2f239daeb72dd94e2d72920e85e161daeb35de24023d81bb271c3abf36916d83b4b47b046e400e865e71ee236cbfc0a7047f9b0a3529cd9b8363279fb88a lxqt-build-tools-0.6.0.tar.gz"
diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD
index 0198540b4..5f64da9ce 100644
--- a/user/lxqt-config/APKBUILD
+++ b/user/lxqt-config/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-config
pkgver=0.14.1
pkgrel=0
@@ -16,29 +16,25 @@ subpackages="$pkgname-doc"
source="https://github.com/lxqt/lxqt-config/releases/download/$pkgver/lxqt-config-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make -j1
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -j1 -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="747644f8e0623cb2e8eadda57c7307387423152a089d5b423b06650fbf235371764a26e82363cbee9db5c1145e3fdb754e6ecdcf0930dccec375dda424c8b13f lxqt-config-0.14.1.tar.xz"
diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD
index a49fea8d7..6ad593a75 100644
--- a/user/lxqt-desktop/APKBUILD
+++ b/user/lxqt-desktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-desktop
pkgver=0.13.0
pkgrel=1
@@ -14,17 +14,10 @@ depends="breeze breeze-icons oxygen ttf-liberation xorg-server dbus-x11 openbox
lxqt-notificationd lxqt-globalkeys lxqt-config lxqt-admin lxqt-about
lximage-qt lxqt-themes pavucontrol-qt qt5ct obconf-qt qps screengrab"
makedepends=""
-install=""
subpackages="$pkgname-doc"
source="org.adelie-linux.about-lxqt.desktop startlxqt startlxqt.1"
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
- cd "$srcdir"
-}
package() {
- cd "$srcdir"
install -D -m644 "$srcdir"/org.adelie-linux.about-lxqt.desktop \
"$pkgdir"/usr/share/applications/org.adelie-linux.about-lxqt.desktop
install -D -m755 "$srcdir"/startlxqt "$pkgdir"/usr/bin/startlxqt
diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD
index 379de923d..da75788ad 100644
--- a/user/lxqt-globalkeys/APKBUILD
+++ b/user/lxqt-globalkeys/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-globalkeys
pkgver=0.14.3
pkgrel=0
@@ -15,11 +15,9 @@ subpackages="$pkgname-dev"
source="https://github.com/lxqt/lxqt-globalkeys/releases/download/$pkgver/lxqt-globalkeys-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -27,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="205496c6be8fcefc4b0c7fc1beeac2a5ef996e1580d7662da6271149b3d26819b4db21260699bdd99db6a3e2874c7ac2670a6579c46985dcf6223ca6c98c125c lxqt-globalkeys-0.14.3.tar.xz"
diff --git a/user/lxqt-l10n/APKBUILD b/user/lxqt-l10n/APKBUILD
index cc60400d1..b13843f75 100644
--- a/user/lxqt-l10n/APKBUILD
+++ b/user/lxqt-l10n/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-l10n
pkgver=0.13.0
pkgrel=1
@@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev libqtxdg-dev
source="https://github.com/lxde/lxqt-l10n/releases/download/$pkgver/lxqt-l10n-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,13 +24,12 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="cbafc0f1c12a9c14af8ed896f5147d90fcd24786be0cc5de7f8897e31ac012a7308604622635f43709edeb13824395806e6d8e89355a0fd6799227f8d0d8f686 lxqt-l10n-0.13.0.tar.xz"
diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD
index 76bf8585f..137b19cf8 100644
--- a/user/lxqt-notificationd/APKBUILD
+++ b/user/lxqt-notificationd/APKBUILD
@@ -1,11 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-notificationd
pkgver=0.14.1
pkgrel=0
pkgdesc="Daemon for notifications in LXQt"
url="https://lxqt.org"
arch="all"
+options="!check" # No test suite.
license="LGPL-2.1+"
depends=""
makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}.0
@@ -13,11 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}
source="https://github.com/lxqt/lxqt-notificationd/releases/download/$pkgver/lxqt-notificationd-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="dcd1892ff66d6beb5c8953c6731f798a59272365fb7439277732b145cc9e6479314415481d9e8aae9fd670d779011c3d7bb3874b05a67cfad2a722f467866795 lxqt-notificationd-0.14.1.tar.xz"
diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD
index b45edca56..0778adc3d 100644
--- a/user/lxqt-openssh-askpass/APKBUILD
+++ b/user/lxqt-openssh-askpass/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-openssh-askpass
pkgver=0.14.1
pkgrel=0
@@ -15,11 +15,9 @@ subpackages="$pkgname-doc"
source="https://github.com/lxde/lxqt-openssh-askpass/releases/download/$pkgver/lxqt-openssh-askpass-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -27,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="ab35cd719d4a31a495bed68a30cad5bf85701d223ee7306f0dad40717d0c2821af53e07a929b5855fb0cd680684fb790a638b59a1ea3ef288e0f656ab490b5bf lxqt-openssh-askpass-0.14.1.tar.xz"
diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD
index 2dfef7350..8f8a38643 100644
--- a/user/lxqt-panel/APKBUILD
+++ b/user/lxqt-panel/APKBUILD
@@ -1,11 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-panel
pkgver=0.14.1
pkgrel=0
pkgdesc="Panel for LXQt desktop"
url="https://lxqt.org"
arch="all"
+options="!check" # No test suite.
license="LGPL-2.1+"
depends=""
makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 kguiaddons-dev
@@ -17,11 +18,9 @@ subpackages="$pkgname-doc"
source="https://github.com/lxqt/lxqt-panel/releases/download/$pkgver/lxqt-panel-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -29,18 +28,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="e7cb361a13ac480cda50bc0549d5501f0d4f5bb6c8e257febf81550aaa88c0c55b615762aedb1f03fd654f79efe5aa2590b1dd592f6ae8c7e5a8d08086e0a687 lxqt-panel-0.14.1.tar.xz"
diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD
index d940b6d52..7b677a646 100644
--- a/user/lxqt-policykit/APKBUILD
+++ b/user/lxqt-policykit/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-policykit
pkgver=0.14.1
pkgrel=0
@@ -16,11 +16,9 @@ subpackages="$pkgname-doc"
source="https://github.com/lxqt/lxqt-policykit/releases/download/$pkgver/lxqt-policykit-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -28,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="c3df41a45ef4d04eba9ce0c9f29d4c9b68a192302e85e192a26ae73617b87d0ad70ec64135f500485d4c10095754e36935bf9790ffd83d0197b1bb784971a940 lxqt-policykit-0.14.1.tar.xz"
diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD
index 68907d723..0b3097cdd 100644
--- a/user/lxqt-powermanagement/APKBUILD
+++ b/user/lxqt-powermanagement/APKBUILD
@@ -1,11 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-powermanagement
pkgver=0.14.1
pkgrel=0
pkgdesc="Power management utilities for LXQt"
url="https://lxqt.org"
arch="all"
+options="!check" # No test suite.
license="LGPL-2.1+"
depends=""
makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 upower-dev
@@ -14,11 +15,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 upower-dev
source="https://github.com/lxqt/lxqt-powermanagement/releases/download/$pkgver/lxqt-powermanagement-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="04c72e8f73fff647f0a1d987db2879dffaeba7accfa320bc3b101befdb041ce391debd5f6de12cd2614f9ddc9bf07644d778bb33611a3a4690fe818f7bc81d10 lxqt-powermanagement-0.14.1.tar.xz"
diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD
index ae0a30b03..9d237c3f6 100644
--- a/user/lxqt-qtplugin/APKBUILD
+++ b/user/lxqt-qtplugin/APKBUILD
@@ -1,11 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-qtplugin
pkgver=0.14.0
pkgrel=0
pkgdesc="Qt plugin for platform integration with LXQt"
url="https://lxqt.org/"
arch="all"
+options="!check" # No test suite.
license="LGPL-2.1+"
depends=""
makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev
@@ -14,11 +15,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev
source="https://github.com/lxqt/lxqt-qtplugin/releases/download/$pkgver/lxqt-qtplugin-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c lxqt-qtplugin-0.14.0.tar.xz"
diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD
index d44d72c1e..7acd62c9b 100644
--- a/user/lxqt-runner/APKBUILD
+++ b/user/lxqt-runner/APKBUILD
@@ -1,11 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-runner
pkgver=0.14.1
pkgrel=0
pkgdesc="Qt-based application launcher for LXQt"
url="https://lxqt.org"
arch="all"
+options="!check" # No test suite.
license="LGPL-2.1+"
depends=""
makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0
@@ -16,11 +17,9 @@ subpackages="$pkgname-doc"
source="https://github.com/lxqt/lxqt-runner/releases/download/$pkgver/lxqt-runner-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="62d196d37e87bc9154fa2cd9abcb8671277bffdb8673a6531bcb93161944cb8a31298587f8323d79a290292fc73765ea15990106828335879b87029ff1aba28c lxqt-runner-0.14.1.tar.xz"
diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD
index 0b960dee0..d6cc987a0 100644
--- a/user/lxqt-session/APKBUILD
+++ b/user/lxqt-session/APKBUILD
@@ -1,11 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-session
pkgver=0.14.1
pkgrel=0
pkgdesc="Session management utilities for LXQt"
url="https://lxqt.org"
arch="all"
+options="!check" # No test suite.
license="LGPL-2.1+"
depends="xdg-user-dirs"
makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 eudev-dev
@@ -14,11 +15,9 @@ subpackages="$pkgname-doc"
source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
rm "$pkgdir"/usr/bin/startlxqt
rm "$pkgdir"/usr/share/man/man1/start*
}
diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD
index 5a15a9cfb..c65fe652c 100644
--- a/user/lxqt-sudo/APKBUILD
+++ b/user/lxqt-sudo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-sudo
pkgver=0.14.1
pkgrel=0
@@ -15,11 +15,9 @@ subpackages="$pkgname-doc"
source="https://github.com/lxqt/lxqt-sudo/releases/download/$pkgver/lxqt-sudo-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -27,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="b2741ead9c03c2dddf878b7658316ad0ce170068aca413b48b2f614e6ee09e7494e9907f7bf46de09c84e50b75cd523b059d47f9a0d2be11b340824475ca9222 lxqt-sudo-0.14.1.tar.xz"
diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD
index 233511d95..6881e5a4d 100644
--- a/user/lxqt-themes/APKBUILD
+++ b/user/lxqt-themes/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-themes
pkgver=0.14.0
pkgrel=0
@@ -13,11 +13,9 @@ makedepends="cmake lxqt-build-tools>=0.6.0"
source="https://github.com/lxde/lxqt-themes/releases/download/$pkgver/lxqt-themes-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -25,13 +23,12 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2 lxqt-themes-0.14.0.tar.xz"
diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD
index 24af506f4..4bd75c160 100644
--- a/user/lynx/APKBUILD
+++ b/user/lynx/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lynx
pkgver=2.8.9_p1
_relver="${pkgver%_p*}rel.${pkgver#*_p}"
@@ -16,7 +16,6 @@ source="https://invisible-mirror.net/archives/lynx/tarballs/${pkgname}${_relver}
builddir="$srcdir/${pkgname}${_relver}"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
./lynx -version
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install install-help install-doc \
helpdir=/usr/share/doc/lynx/help \
docdir=/usr/share/doc/lynx
diff --git a/user/mac-fdisk/APKBUILD b/user/mac-fdisk/APKBUILD
index 1120b249b..fa5b7d902 100644
--- a/user/mac-fdisk/APKBUILD
+++ b/user/mac-fdisk/APKBUILD
@@ -7,8 +7,8 @@ pkgrel=2
pkgdesc="68K and PowerPC fixed disk partitioning utility"
url="https://adelielinux.org/"
arch="all !aarch64" # Literally does not support this arch.
-license="GPL-2.0"
options="!check" # No test suite.
+license="GPL-2.0"
depends=""
makedepends="linux-headers"
subpackages="$pkgname-doc"
@@ -23,16 +23,15 @@ source="https://distfiles.adelielinux.org/source/mac-fdisk_0.1.orig.tar.gz
mac-fdisk-large-disk-support.patch
mac-fdisk-largerthan2gb.patch
mac-fdisk-non-glibc-support.patch
- flush-stdout.patch"
+ flush-stdout.patch
+ "
builddir="$srcdir/$pkgname-$_pkgver.orig"
build() {
- cd "$builddir"
make CFLAGS="-D_GNU_SOURCE"
}
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/sbin
make DESTDIR="$pkgdir" install
diff --git a/user/mactel-boot/APKBUILD b/user/mactel-boot/APKBUILD
index 8909202af..e0e1bf16e 100644
--- a/user/mactel-boot/APKBUILD
+++ b/user/mactel-boot/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
source="http://www.codon.org.uk/~mjg59/mactel-boot/mactel-boot-$pkgver.tar.bz2"
build() {
- cd "$builddir"
make hfs-bless
}
diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD
index 863b8122c..2735f0680 100644
--- a/user/marble/APKBUILD
+++ b/user/marble/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=marble
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Free, open-source map and virtual globe"
url="https://marble.kde.org/"
@@ -15,10 +15,9 @@ makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev zlib-dev
kio-dev kparts-dev kcrash-dev ki18n-dev phonon-dev plasma-framework-dev
qt5-qtpositioning-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs"
-source="https://download.kde.org/stable/applications/$pkgver/src/marble-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/marble-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -29,13 +28,12 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="d18cfa59be6b360271afc711f61925a09dc4a304eaf41abbaeb6c7c6dc5aedff35eab658c47abba6fa5919940b6a7236292d38cc2e6eafe792c4188f090c1c61 marble-19.08.2.tar.xz"
+sha512sums="ccc7bcef68ce372c11b17e8070c72d808a953f0dfed50c366d0e83c76d4f538892034b734be77f44d0ae75e80b72c2db79ac331fd178f8a5b20f4e3adde52487 marble-19.12.1.tar.xz"
diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD
index c227e07b1..db9f1bfd6 100644
--- a/user/marco/APKBUILD
+++ b/user/marco/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=marco
pkgver=1.22.3
pkgrel=0
@@ -9,13 +9,13 @@ arch="all"
license="GPL-2.0+ AND MIT-advertising AND MIT-CMU"
depends=""
makedepends="gtk+3.0-dev intltool itstool libcanberra-dev libice-dev libsm-dev
- libxml2-utils zenity"
+ libxml2-utils startup-notification-dev zenity"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/marco-$pkgver.tar.xz
- correctly-posix.patch"
+ correctly-posix.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mariadb/APKBUILD b/user/mariadb/APKBUILD
index 9dced4d5f..786a4e1a6 100644
--- a/user/mariadb/APKBUILD
+++ b/user/mariadb/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Dan Theisen <djt@hxx.in>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=mariadb
-pkgver=10.4.8
+pkgver=10.4.11
pkgrel=0
pkgdesc="Open source database server"
url="https://mariadb.org/"
@@ -27,7 +27,6 @@ subpackages="$pkgname-client $pkgname-server $pkgname-libs $pkgname-embedded
source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz
crc32-power.patch
gcc_builtins_ppc.h
- libedit.patch
ppchax.patch
mariadb.initd
mariadb-server.limits
@@ -262,10 +261,9 @@ doc() {
default_doc
}
-sha512sums="1aa7117734f4ebeb08395289ff1295e1d2ed2f89e8ccf3224cd60afaf2be56f81e8f0448e7619eeb6c858355a2b1e224efe42a0f400941f138342318adb66c42 mariadb-10.4.8.tar.gz
+sha512sums="2a1a8d90e326530b41a8a7d6889325cefcba5914451a48c6a20d5d5cd68004835e76e6ecac628554167a014f9c0b1487c15f37151afd771ea0166a4c40afd7d2 mariadb-10.4.11.tar.gz
03a4f60674cb45bcccb59971260c56f0f5f64eb79ad4078c485bc8112df2b9ee2b4eb08350530443b318440787b672b2947bc439783e813a32350f9179417cd0 crc32-power.patch
15ae6d4564c5c8b8583502acd54bf0019e8a62ebcf87278015506e58848cb6996ff61ca055897f9192b8818808adeeac15b8f786065cfd071cc264ca1922f7e3 gcc_builtins_ppc.h
-41dc407cc16e7af5a8b9527489016a052a8bce85bd3d00f0d06b98b3fef16a693849d15a9a15136ee8148829fe4570d03df65dfb6fe9f0bccc447cab1bd666f4 libedit.patch
-0725c1c04ce01d6035d4fef5018709c8814228bf250503455c2aa7c972278fcb78b47e681a721cb42dc61508075e1485116d8c7ac924c584b4bf5ca6b27b6594 ppchax.patch
+0cb265173923cb85517a1144cfa904dafe059c1f859e13b4415442cabbb414db5904f2dcee0e865914b0f9c181d1d61d220834cb187b14f8538a0d2552025a9d ppchax.patch
1a2b058aad5fd6d6964db58b663591299a5bf82e7ad21a105d53a3e7ad1c3674c737caf3ee12799cce947cf8ead1f3e789dd8afcfc769891f08208b3006f9654 mariadb.initd
d47324b34a87410eddb554f65199d145dfba9ae40407a62fb77df4e1ebf13087d15eb28e61e5e7cc9139eb42f093a0955136edae4020822652a1f0b4e219849e mariadb-server.limits"
diff --git a/user/mariadb/libedit.patch b/user/mariadb/libedit.patch
deleted file mode 100644
index 14dc9db49..000000000
--- a/user/mariadb/libedit.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From d9342e88289fa588ea2f1a094dbfc32f0693e23d Mon Sep 17 00:00:00 2001
-From: Sebastian Kemper <sebastian_ml@gmx.net>
-Date: Tue, 9 Apr 2019 22:28:10 +0200
-Subject: [PATCH] cmake: support new libedit interface
-
-libedit changed it's interface a while ago. MariaDB's cmake file doesn't
-recognize the new interface, the compile test fails:
-
-/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx: In function 'int main(int, char**)':
-/mariadb-10.2.19/CMakeFiles/CMakeTmp/src.cxx:6:47: error: invalid conversion from 'char*' to 'int' [-fpermissive]
- int res= (*rl_completion_entry_function)(0,0);
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
-
-Fix this by adding a detection for the new interface as well.
-
-Run-tested on a MIPS machine.
-
-Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
----
- cmake/readline.cmake | 17 +++++++++++++++--
- 1 file changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/readline.cmake b/cmake/readline.cmake
-index 12a8980b6a90..a2b2cc4c241f 100644
---- a/cmake/readline.cmake
-+++ b/cmake/readline.cmake
-@@ -160,8 +160,20 @@ MACRO (MYSQL_FIND_SYSTEM_LIBEDIT)
- int res= (*rl_completion_entry_function)(0,0);
- completion_matches(0,0);
- }"
-- LIBEDIT_INTERFACE)
-- SET(USE_LIBEDIT_INTERFACE ${LIBEDIT_INTERFACE})
-+ LIBEDIT_HAVE_COMPLETION_INT)
-+
-+ CHECK_CXX_SOURCE_COMPILES("
-+ #include <stdio.h>
-+ #include <readline.h>
-+ int main(int argc, char **argv)
-+ {
-+ char res= *(*rl_completion_entry_function)(0,0);
-+ completion_matches(0,0);
-+ }"
-+ LIBEDIT_HAVE_COMPLETION_CHAR)
-+ IF(LIBEDIT_HAVE_COMPLETION_INT OR LIBEDIT_HAVE_COMPLETION_CHAR)
-+ SET(USE_LIBEDIT_INTERFACE 1)
-+ ENDIF()
- ENDIF()
- ENDMACRO()
-
-@@ -187,6 +199,7 @@ MACRO (MYSQL_CHECK_READLINE)
- IF(USE_LIBEDIT_INTERFACE)
- SET(MY_READLINE_INCLUDE_DIR ${LIBEDIT_INCLUDE_DIR})
- SET(MY_READLINE_LIBRARY ${LIBEDIT_LIBRARY} ${CURSES_LIBRARY})
-+ SET(USE_NEW_READLINE_INTERFACE ${LIBEDIT_HAVE_COMPLETION_CHAR})
- ELSE()
- MYSQL_USE_BUNDLED_READLINE()
- ENDIF()
diff --git a/user/mariadb/ppchax.patch b/user/mariadb/ppchax.patch
index 26ffb5189..4ce0d304b 100644
--- a/user/mariadb/ppchax.patch
+++ b/user/mariadb/ppchax.patch
@@ -1,6 +1,6 @@
--- mariadb-10.4.6/configure.cmake.old 2019-06-17 22:00:31.000000000 +0000
+++ mariadb-10.4.6/configure.cmake 2019-07-06 23:21:57.705655766 +0000
-@@ -922,6 +922,10 @@
+@@ -867,6 +867,10 @@
return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
}"
HAVE_GCC_C11_ATOMICS)
@@ -13,7 +13,7 @@
SET(HAVE_valgrind 1)
--- mariadb-10.4.6/mysys/CMakeLists.txt.old 2019-06-17 22:00:32.000000000 +0000
+++ mariadb-10.4.6/mysys/CMakeLists.txt 2019-07-07 00:03:56.956394100 +0000
-@@ -91,6 +91,10 @@
+@@ -92,6 +92,10 @@
TARGET_LINK_LIBRARIES(mysys pthread)
ENDIF()
diff --git a/user/mate-applets/APKBUILD b/user/mate-applets/APKBUILD
index e3eb7c72d..387e30bac 100644
--- a/user/mate-applets/APKBUILD
+++ b/user/mate-applets/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-applets
pkgver=1.22.2
pkgrel=0
@@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/1.22/mate-applets-$pkgver.tar.xz"
build() {
- cd "$builddir"
rm -r mateweather/docs/ru
./configure \
--build=$CBUILD \
@@ -29,12 +28,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-backgrounds/APKBUILD b/user/mate-backgrounds/APKBUILD
index bd70d43a8..e47e5b7d3 100644
--- a/user/mate-backgrounds/APKBUILD
+++ b/user/mate-backgrounds/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-backgrounds
pkgver=1.22.0
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-backgrounds-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-calc/APKBUILD b/user/mate-calc/APKBUILD
index 0a0d5c90f..7b41ac51b 100644
--- a/user/mate-calc/APKBUILD
+++ b/user/mate-calc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-calc
pkgver=1.22.2
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-calc-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-common/APKBUILD b/user/mate-common/APKBUILD
index e84227d22..943cf6a49 100644
--- a/user/mate-common/APKBUILD
+++ b/user/mate-common/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-common
pkgver=1.22.2
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://pub.mate-desktop.org/releases/1.22/mate-common-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-complete/APKBUILD b/user/mate-complete/APKBUILD
index f3a5ac75a..a828fd924 100644
--- a/user/mate-complete/APKBUILD
+++ b/user/mate-complete/APKBUILD
@@ -1,26 +1,28 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-complete
pkgver=1.22.0
pkgrel=0
-url="https://mate-desktop.org"
pkgdesc="Complete MATE desktop environment"
+url="https://mate-desktop.org"
arch="noarch"
options="!check" # No tests
-license=" "
+license="Public-Domain"
depends="atril caja caja-dropbox caja-extensions engrampa eom marco
- mate-applets mate-backgrounds mate-calc mate-control-center
- mate-desktop mate-icon-theme mate-indicator-applet mate-media
- mate-menus mate-netbook mate-notification-daemon mate-panel
- mate-polkit mate-power-manager mate-screensaver mate-sensors-applet
- mate-session-manager mate-settings-daemon mate-system-monitor
- mate-terminal mate-user-guide mate-user-share mate-utils mozo pluma"
+ mate-applets mate-backgrounds mate-calc mate-control-center
+ mate-desktop mate-icon-theme mate-indicator-applet mate-media
+ mate-menus mate-netbook mate-notification-daemon mate-panel
+ mate-polkit mate-power-manager mate-screensaver mate-sensors-applet
+ mate-session-manager mate-settings-daemon mate-system-monitor
+ mate-terminal mate-user-guide mate-user-share mate-utils mozo pluma"
+makedepends=""
+subpackages=""
source="org.adelie-linux.about-mate.desktop"
package() {
- cd "$srcdir"
mkdir -p "$pkgdir"/usr/share/applications
- install -Dm644 org.adelie-linux.about-mate.desktop "$pkgdir"/usr/share/applications
+ install -Dm644 "$srcdir"/org.adelie-linux.about-mate.desktop \
+ "$pkgdir"/usr/share/applications
}
sha512sums="24fd0524d949a22b22e38c81667f31498bc524302c52128c10d8a5802315720543426ba82245f5e7510832c493389ff59f36be14433f1a6a6c68993f733f329c org.adelie-linux.about-mate.desktop"
diff --git a/user/mate-control-center/APKBUILD b/user/mate-control-center/APKBUILD
index c65bae49d..5bba038de 100644
--- a/user/mate-control-center/APKBUILD
+++ b/user/mate-control-center/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-control-center
pkgver=1.22.2
pkgrel=0
@@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-control-center-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-desktop/APKBUILD b/user/mate-desktop/APKBUILD
index b88573a5f..0b5f7655e 100644
--- a/user/mate-desktop/APKBUILD
+++ b/user/mate-desktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-desktop
pkgver=1.22.2
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-desktop-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-icon-theme/APKBUILD b/user/mate-icon-theme/APKBUILD
index 424ac19ed..a2636e0e7 100644
--- a/user/mate-icon-theme/APKBUILD
+++ b/user/mate-icon-theme/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-icon-theme
pkgver=1.22.2
pkgrel=0
@@ -11,10 +11,8 @@ depends=""
makedepends="icon-naming-utils-dev intltool"
subpackages="$pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-icon-theme-$pkgver.tar.xz"
-builddir="$srcdir/mate-icon-theme-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-indicator-applet/APKBUILD b/user/mate-indicator-applet/APKBUILD
index 1988c358a..2f5f5a2e6 100644
--- a/user/mate-indicator-applet/APKBUILD
+++ b/user/mate-indicator-applet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-indicator-applet
pkgver=1.22.1
pkgrel=0
@@ -8,14 +8,13 @@ url="https://mate-desktop.org"
arch="all"
license="GPL-3.0+ AND LGPL-2.0+"
depends=""
-makedepends="ayatana-ido-dev gtk+3.0-dev intltool libayatana-indicator-dev
+makedepends="ayatana-ido-dev bash gtk+3.0-dev intltool libayatana-indicator-dev
mate-panel-dev"
subpackages="$pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-indicator-applet-$pkgver.tar.xz"
build() {
- cd "$builddir"
- ./configure \
+ bash ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-media/APKBUILD b/user/mate-media/APKBUILD
index 11d43613a..989b2ee3c 100644
--- a/user/mate-media/APKBUILD
+++ b/user/mate-media/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-media
pkgver=1.22.2
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/1.22/mate-media-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-menus/APKBUILD b/user/mate-menus/APKBUILD
index d2d6d33d5..4c0bf55f9 100644
--- a/user/mate-menus/APKBUILD
+++ b/user/mate-menus/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-menus
pkgver=1.22.1
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-lang"
source="https://pub.mate-desktop.org/releases/1.22/mate-menus-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-netbook/APKBUILD b/user/mate-netbook/APKBUILD
index 381e9d991..f624765d6 100644
--- a/user/mate-netbook/APKBUILD
+++ b/user/mate-netbook/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-netbook
pkgver=1.22.2
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-netbook-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-notification-daemon/APKBUILD b/user/mate-notification-daemon/APKBUILD
index d3a0235c7..571c88554 100644
--- a/user/mate-notification-daemon/APKBUILD
+++ b/user/mate-notification-daemon/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-notification-daemon
pkgver=1.22.1
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-notification-daemon-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-panel/APKBUILD b/user/mate-panel/APKBUILD
index 36cbb8c84..51dcc721d 100644
--- a/user/mate-panel/APKBUILD
+++ b/user/mate-panel/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-panel
pkgver=1.22.2
pkgrel=0
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-panel-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-polkit/APKBUILD b/user/mate-polkit/APKBUILD
index 345159cbc..896c32f83 100644
--- a/user/mate-polkit/APKBUILD
+++ b/user/mate-polkit/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-polkit
pkgver=1.22.0
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-polkit-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-power-manager/APKBUILD b/user/mate-power-manager/APKBUILD
index 56d13b5c1..f57878d26 100644
--- a/user/mate-power-manager/APKBUILD
+++ b/user/mate-power-manager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-power-manager
pkgver=1.22.2
pkgrel=0
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-power-manager-$pkgver.tar.xz"
build() {
- cd "$builddir"
LIBS="-lexecinfo" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-screensaver/APKBUILD b/user/mate-screensaver/APKBUILD
index 1fd702a93..950df7f52 100644
--- a/user/mate-screensaver/APKBUILD
+++ b/user/mate-screensaver/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-screensaver
pkgver=1.22.2
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-screensaver-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-sensors-applet/APKBUILD b/user/mate-sensors-applet/APKBUILD
index fcb3ebb96..a74080090 100644
--- a/user/mate-sensors-applet/APKBUILD
+++ b/user/mate-sensors-applet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-sensors-applet
pkgver=1.22.1
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-sensors-applet-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-session-manager/APKBUILD b/user/mate-session-manager/APKBUILD
index a7c5baaea..c2f08ee15 100644
--- a/user/mate-session-manager/APKBUILD
+++ b/user/mate-session-manager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-session-manager
pkgver=1.22.2
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-session-manager-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-settings-daemon/APKBUILD b/user/mate-settings-daemon/APKBUILD
index fb99c523e..ad53dd7f3 100644
--- a/user/mate-settings-daemon/APKBUILD
+++ b/user/mate-settings-daemon/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-settings-daemon
pkgver=1.22.1
pkgrel=0
@@ -15,24 +15,22 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-settings-daemon-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
- --localstatedir=/var
+ --localstatedir=/var \
+ --enable-pulse
make
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-system-monitor/APKBUILD b/user/mate-system-monitor/APKBUILD
index 78b1b08c8..5ea10996b 100644
--- a/user/mate-system-monitor/APKBUILD
+++ b/user/mate-system-monitor/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-system-monitor
pkgver=1.22.2
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-system-monitor-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-terminal/APKBUILD b/user/mate-terminal/APKBUILD
index 02da7e5b3..cd515445f 100644
--- a/user/mate-terminal/APKBUILD
+++ b/user/mate-terminal/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-terminal
pkgver=1.22.1
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-terminal-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-user-guide/APKBUILD b/user/mate-user-guide/APKBUILD
index 1f8f61ef6..b303dc7e8 100644
--- a/user/mate-user-guide/APKBUILD
+++ b/user/mate-user-guide/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-user-guide
pkgver=1.22.3
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-user-guide-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mate-user-share/APKBUILD b/user/mate-user-share/APKBUILD
index b519c9701..9b540a3df 100644
--- a/user/mate-user-share/APKBUILD
+++ b/user/mate-user-share/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-user-share
pkgver=1.22.1
pkgrel=0
diff --git a/user/mate-utils/APKBUILD b/user/mate-utils/APKBUILD
index 0a8677b18..74a8dd551 100644
--- a/user/mate-utils/APKBUILD
+++ b/user/mate-utils/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-utils
pkgver=1.22.2
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mate-utils-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mdadm/APKBUILD b/user/mdadm/APKBUILD
index d15aefbc9..4025c9cc3 100644
--- a/user/mdadm/APKBUILD
+++ b/user/mdadm/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer:
pkgname=mdadm
pkgver=4.1
-pkgrel=0
+pkgrel=2
pkgdesc="Tool for managing Linux soft RAID arrays"
url="http://neil.brown.name/blog/mdadm"
arch="all"
@@ -17,15 +17,15 @@ source="https://mirrors.kernel.org/pub/linux/utils/raid/$pkgname/$pkgname-$pkgve
$pkgname.initd
$pkgname.confd
$pkgname-raid.initd
+ sysmacros.patch
+ time64.patch
"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm644 $pkgname.conf-example "$pkgdir"/etc/$pkgname.conf
install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
@@ -45,12 +45,13 @@ misc() {
pkgdesc="$pkgdesc (misc scripts)"
depends="$pkgname bash"
- cd "$builddir"
- install -Dm755 misc/mdcheck "$subpkgdir"/usr/sbin/mdcheck
- install -Dm755 misc/syslog-events "$subpkgdir"/usr/sbin/handle-mdadm-events
+ install -Dm755 "$builddir"/misc/mdcheck "$subpkgdir"/usr/sbin/mdcheck
+ install -Dm755 "$builddir"/misc/syslog-events "$subpkgdir"/usr/sbin/handle-mdadm-events
}
sha512sums="f9bff760795ba7361f19fd1cbc02efedcdaa4b0125b99cf1369e78f30e5c128126751915fde41407d46c544514d864bf82b508419bc08f1db7aa447557e2ca9e mdadm-4.1.tar.gz
ca5f4e3ff5b284102b44e818d11622e1889066e3d18edce2d62c1a44ee8f4cfdc0979121c0462a916c638423c5ebc706c46aa996a7c4f68e030589adc62803f4 mdadm.initd
7d45bf489ef93a4f217ffcf72311eb661b8de7fbf63a5344697252c0d3a684b0123ff60efa5f218da4eb4cda7c88d91c2ef3625d5e44a588e3e1210cb60b0ab9 mdadm.confd
-37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c mdadm-raid.initd"
+37022593ba090eb0690669b99d6386152242c017c1e608cea7b5420b7a6f754b377e916e4f81e2abf9941e791db78b5820e63db0e706d5de8b35e796678e921c mdadm-raid.initd
+47564bba9d45dfb39d63df9e6cd96ad03b37b314e794af180911481feb4e038035aa1ea6d3de2061982f46b51d1a205168f98e6f0a092f55f6f8e760dbabdae6 sysmacros.patch
+53c2fe442e8657a7a5a011eab1cd1bfcca6c315ee42e4148a50e1314d238f957e7e722e1264c64c548d398a2c6b10600cccf45a4fb69351d3d9ad403f90c1fde time64.patch"
diff --git a/user/mdadm/sysmacros.patch b/user/mdadm/sysmacros.patch
new file mode 100644
index 000000000..22a393447
--- /dev/null
+++ b/user/mdadm/sysmacros.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/580188
+
+From 5c97e465b33bf8fefb17da7f553a1c3812e508d5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 19 Apr 2016 18:10:54 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev prototypes
+
+These funcs are defined in sys/sysmacros.h, so include it for them.
+It works today due to an implicit include by sys/types.h, but the
+various Linux C libraries are moving away from that.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ mdadm.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mdadm.h b/mdadm.h
+index d209488..b8767a7 100755
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -33,6 +33,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ # endif
+ #endif
+
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <stdint.h>
+--
+2.7.4
+
diff --git a/user/mdadm/time64.patch b/user/mdadm/time64.patch
new file mode 100644
index 000000000..fd05fcb2f
--- /dev/null
+++ b/user/mdadm/time64.patch
@@ -0,0 +1,19 @@
+--- mdadm-4.1/monitor.c.old 2018-10-01 18:26:06.000000000 +0000
++++ mdadm-4.1/monitor.c 2020-01-22 19:51:39.575877908 +0000
+@@ -20,6 +20,7 @@
+
+ #include "mdadm.h"
+ #include "mdmon.h"
++#include <inttypes.h>
+ #include <sys/syscall.h>
+ #include <sys/select.h>
+ #include <signal.h>
+@@ -447,7 +448,7 @@
+ }
+
+ gettimeofday(&tv, NULL);
+- dprintf("(%d): %ld.%06ld state:%s prev:%s action:%s prev: %s start:%llu\n",
++ dprintf("(%d): %"PRId64".%06"PRId64" state:%s prev:%s action:%s prev: %s start:%llu\n",
+ a->info.container_member,
+ tv.tv_sec, tv.tv_usec,
+ array_states[a->curr_state],
diff --git a/user/mdds/APKBUILD b/user/mdds/APKBUILD
index 3fe25f000..de74188c5 100644
--- a/user/mdds/APKBUILD
+++ b/user/mdds/APKBUILD
@@ -8,11 +8,11 @@ url="https://gitlab.com/mdds/mdds"
arch="noarch"
license="MIT"
depends=""
-makedepends=""
checkdepends="boost-dev"
+makedepends=""
subpackages="$pkgname-doc"
-source="http://kohei.us/files/$pkgname/src/$pkgname-$pkgver.tar.bz2"
replaces="$pkgname-dev"
+source="http://kohei.us/files/$pkgname/src/$pkgname-$pkgver.tar.bz2"
build() {
./configure \
diff --git a/user/mednafen/APKBUILD b/user/mednafen/APKBUILD
index ae73a2f66..64559ad16 100644
--- a/user/mednafen/APKBUILD
+++ b/user/mednafen/APKBUILD
@@ -6,12 +6,12 @@ pkgrel=0
pkgdesc="Portable multi-system emulator"
url="https://mednafen.github.io/"
arch="all !s390x"
-options="!check !dbg" # mednafen does not ship actual tests
+options="!check !dbg" # mednafen does not ship actual tests
subpackages="$pkgname-lang"
license="GPL-2.0-only"
depends=""
makedepends="alsa-lib-dev flac-dev libogg-dev libsndfile-dev libvorbis-dev
- lzo-dev sdl2-dev zlib-dev"
+ lzo-dev sdl2-dev zlib-dev autoconf automake"
source="https://mednafen.github.io/releases/files/$pkgname-$pkgver.tar.xz
ppc.patch
ppc64.patch
diff --git a/user/menu-cache/APKBUILD b/user/menu-cache/APKBUILD
index 0ed6c1272..dd8b8a0f5 100644
--- a/user/menu-cache/APKBUILD
+++ b/user/menu-cache/APKBUILD
@@ -8,12 +8,12 @@ url="https://lxde.org/"
arch="all"
options="!check libtool" # No test suite.
license="GPL-2.0+"
+depends=""
makedepends="glib-dev libfm-extra-dev"
subpackages="$pkgname-dev"
source="https://downloads.sourceforge.net/lxde/menu-cache/1.1/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--prefix=/usr \
--sysconfdir=/etc \
@@ -23,7 +23,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mesa-demos/APKBUILD b/user/mesa-demos/APKBUILD
index d1c172828..7a79aa829 100644
--- a/user/mesa-demos/APKBUILD
+++ b/user/mesa-demos/APKBUILD
@@ -5,15 +5,15 @@ pkgname=mesa-demos
pkgver=8.4.0
pkgrel=1
pkgdesc="Mesa demos and utils"
-url="http://mesa3d.org"
+url="https://mesa3d.org"
arch="all"
+options="!check" # No test suite.
license="X11"
-options="!check" # No testsuite
+depends=""
makedepends="mesa-dev glew-dev glu-dev freeglut-dev freetype-dev libtool"
-source="ftp://ftp.freedesktop.org/pub/mesa/demos/$pkgname-$pkgver.tar.bz2"
+source="https://mesa.freedesktop.org/archive/demos/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
./configure \
--build=$CBUILD \
@@ -23,7 +23,6 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
# conflicts with X11 bitmap tool
mv "$pkgdir"/usr/bin/bitmap "$pkgdir"/usr/bin/bitmap-demo
diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD
index b6684032d..c1f74e159 100644
--- a/user/mesa/APKBUILD
+++ b/user/mesa/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=mesa
-pkgver=19.3.1
+pkgver=19.3.3
_llvmver=8
pkgrel=0
pkgdesc="Mesa DRI OpenGL library"
@@ -21,8 +21,10 @@ subpackages="$pkgname-dev $pkgname-dri
# requires glslang: $pkgname-vulkan-overlay
source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz
amdgpu-pthread-header.patch
+ intel-vulkan.patch
musl-fixes.patch
musl-fix-includes.patch
+ no-tls.patch
"
_dri_driverdir=/usr/lib/xorg/modules/dri
@@ -37,8 +39,7 @@ x86* | pmmx)
_vulkan_drivers="${_vulkan_drivers},intel"
;;
aarch64 | arm*)
- _gallium_drivers="${_gallium_drivers},vc4,freedreno,tegra,kmsro,v3d,lima,panfrost,etnativ"
- _vulkan_drivers="${_vulkan_drivers},freedreno"
+ _gallium_drivers="${_gallium_drivers},vc4,freedreno,tegra,kmsro,v3d,lima,panfrost,etnaviv"
case "$CARCH" in
armhf) CFLAGS="$CFLAGS -mfpu=neon";;
esac
@@ -57,7 +58,6 @@ build() {
-Dgallium-drivers=$_gallium_drivers \
-Dvulkan-drivers=$_vulkan_drivers \
-Dosmesa=gallium \
- -Duse-elf-tls=false \
$_arch_conf \
build
@@ -137,6 +137,7 @@ dri() {
replaces="mesa-dri-ati mesa-dri-freedreno mesa-dri-intel
mesa-dri-nouveau mesa-dri-swrast mesa-dri-tegra mesa-dri-vc4
mesa-dri-virtio mesa-dri-vmwgfx"
+ provides="$replaces"
install -d "$subpkgdir"/usr/lib
install -d "$subpkgdir"/usr/share/vulkan
install -d "$subpkgdir"/$_dri_driverdir
@@ -147,7 +148,9 @@ dri() {
mv "$pkgdir"/usr/share/vulkan/icd.d "$subpkgdir"/usr/share/vulkan/
}
-sha512sums="338d2e37122ef22cc4e27a2f3c39e23e419703a507ace99383c749a563936c5f0428cce9a68ac80d0bd2ff57be8a55f42aee0ed6d16bf6b77b4e59d428729568 mesa-19.3.1.tar.xz
+sha512sums="1f792fbde71132afd4a43d6abe6a3d640f375e83641c6144c82312774434c9588ffba65a3ba38394947bd753656aa85213b6cd9f745cec0040c0559eb41f0dc9 mesa-19.3.3.tar.xz
245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch
+ba954ea9aa49e5cdfec08f310f41abf09e01a2a889a09b6c32a154b750d3ebb2bfb5a9b7d244c06d26442688aeeb7f212f5f3c98c6db69f878098a49d476ff70 intel-vulkan.patch
9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch
-c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch"
+c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch
+56e829b0570cf5215c191330a5162356b77eeb555eb8127e30da57bdff9d369c1bb3de3bd7ee36233d6d610c0cec81773879da05cc0b391e06ff4d7507bef8a8 no-tls.patch"
diff --git a/user/mesa/intel-vulkan.patch b/user/mesa/intel-vulkan.patch
new file mode 100644
index 000000000..6ba03d6d1
--- /dev/null
+++ b/user/mesa/intel-vulkan.patch
@@ -0,0 +1,26 @@
+From 791ece114e2e27fa4ede1a998650964bd37d867b Mon Sep 17 00:00:00 2001
+From: Eric Engestrom <eric.engestrom@intel.com>
+Date: Sun, 27 Oct 2019 00:04:33 +0100
+Subject: [PATCH] anv: add missing xmlconfig headers dependency
+
+Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
+Acked-by: Dylan Baker <dylan@pnwbakers.com>
+---
+ src/intel/vulkan/meson.build | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
+index 69e472f719b..10fc4c4e611 100644
+--- a/src/intel/vulkan/meson.build
++++ b/src/intel/vulkan/meson.build
+@@ -133,6 +133,7 @@ anv_deps = [
+ dep_valgrind,
+ idep_nir_headers,
+ idep_vulkan_util_headers,
++ idep_xmlconfig_headers,
+ ]
+ anv_flags = [
+ c_vis_args,
+--
+2.24.1
+
diff --git a/user/mesa/no-tls.patch b/user/mesa/no-tls.patch
new file mode 100644
index 000000000..b5e0b3adb
--- /dev/null
+++ b/user/mesa/no-tls.patch
@@ -0,0 +1,14 @@
+--- mesa-19.3.1/meson.build.old 2019-12-18 18:36:00.000000000 +0000
++++ mesa-19.3.1/meson.build 2020-01-26 05:11:44.774286868 +0000
+@@ -386,11 +386,6 @@
+ endif
+ endif
+
+-# Android uses emutls for versions <= P/28. For USE_ELF_TLS we need ELF TLS.
+-if host_machine.system() != 'windows' and (not with_platform_android or get_option('platform-sdk-version') >= 29)
+- pre_args += '-DUSE_ELF_TLS'
+-endif
+-
+ if with_glx != 'disabled'
+ if not (with_platform_x11 and with_any_opengl)
+ error('Cannot build GLX support without X11 platform support and at least one OpenGL API')
diff --git a/user/milou/APKBUILD b/user/milou/APKBUILD
index 787a48375..2520bb45d 100644
--- a/user/milou/APKBUILD
+++ b/user/milou/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=milou
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Search and launch plasmoid"
url="https://www.kde.org/"
@@ -9,9 +9,9 @@ arch="all"
license="GPL-2.0+ AND (GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only)"
depends=""
makedepends="cmake extra-cmake-modules python3 kcoreaddons-dev kdeclarative-dev
- ki18n-dev krunner-dev kservice-dev plasma-framework-dev"
+ ki18n-dev kitemmodels-dev krunner-dev kservice-dev plasma-framework-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/milou-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/milou-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -24,7 +24,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="87b34643c32e9c57cc3aa8b12b536d2cb1bf38fb8f4c4ea7df7b6022c498d3f3d796cb825b14d9fa7b636c30bfb2d136d4771b68e9951d4e5e9fc98bd4a53a28 milou-5.12.8.tar.xz"
+sha512sums="ce5d13440bde18916dbc14db703b05fc62aa1c64b85cfaba1aea1d29cf83e5904e21eec9ecbae9d2e27b18b0b44640d2c30f81c1aff667f19ec9ecf005623cf8 milou-5.17.90.tar.xz"
diff --git a/user/mimetic/APKBUILD b/user/mimetic/APKBUILD
index c69f27270..8913eecd8 100644
--- a/user/mimetic/APKBUILD
+++ b/user/mimetic/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mimetic
pkgver=0.9.8
pkgrel=0
@@ -16,13 +16,11 @@ source="http://www.codesink.org/download/mimetic-$pkgver.tar.gz
"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/minicom/APKBUILD b/user/minicom/APKBUILD
index d597290e8..7ff093995 100644
--- a/user/minicom/APKBUILD
+++ b/user/minicom/APKBUILD
@@ -3,7 +3,7 @@
pkgname=minicom
pkgver=2.7.1
pkgrel=0
-pkgdesc="menu driven communications program for terminals"
+pkgdesc="Menu-driven communications program for terminals"
url="https://fossies.org/linux/minicom/"
arch="all"
license="GPL-2.0+"
@@ -11,10 +11,10 @@ depends=""
makedepends="ncurses-dev gettext-tiny-dev linux-headers"
subpackages="$pkgname-doc $pkgname-lang"
source="https://fossies.org/linux/misc/$pkgname-$pkgver.tar.gz
- fix-includes.patch"
+ fix-includes.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/minivmac/APKBUILD b/user/minivmac/APKBUILD
index 71a16a1b2..08a38f1fb 100644
--- a/user/minivmac/APKBUILD
+++ b/user/minivmac/APKBUILD
@@ -10,15 +10,12 @@ options="!check" # minivmac does not ship a test suite
license="GPL-2.0-only"
depends=""
makedepends="libx11-dev libxcb-dev libxau-dev libbsd-dev libxdmcp-dev"
-source="http://oddball.tech/code/emu_pkg/$pkgname-$pkgver.tar.xz"
+source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
CARCH=$CARCH ./configure
- cd "$builddir"/mnvmplus
- make -j1
- cd "$builddir"/mnvmII
- make -j1
+ make -C mnvmplus -j1
+ make -C mnvmII -j1
}
package() {
@@ -26,4 +23,4 @@ package() {
install -m755 "$builddir"/mnvmII/minivmac "$pkgdir"/usr/bin/minivmacII
}
-sha512sums="ff28266641dd37df74c84c16c8bf32282729d55ae6512d4a98abf92ba40692f9fc107b501f072755ba0f8a0322d4f755915d9be74a407ce89af94bfd24d11043 minivmac-3.5.8.tar.xz"
+sha512sums="ff28266641dd37df74c84c16c8bf32282729d55ae6512d4a98abf92ba40692f9fc107b501f072755ba0f8a0322d4f755915d9be74a407ce89af94bfd24d11043 minivmac-3.5.8.tar.xz"
diff --git a/user/minizip/APKBUILD b/user/minizip/APKBUILD
new file mode 100644
index 000000000..df93d126f
--- /dev/null
+++ b/user/minizip/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=minizip
+pkgver=1.2.11
+pkgrel=0
+pkgdesc="Miniature ZIP archive manipulation library"
+url="https://zlib.net"
+arch="all"
+license="zlib"
+depends=""
+makedepends="autoconf automake libtool zlib-dev"
+subpackages="$pkgname-dev"
+source="https://zlib.net/zlib-$pkgver.tar.gz"
+builddir="$srcdir"/zlib-$pkgver/contrib/minizip
+
+prepare() {
+ default_prepare
+ autoreconf -vif
+}
+
+build() {
+ ./configure \
+ --prefix=/usr \
+ --enable-shared
+ make
+}
+
+check() {
+ make check
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae zlib-1.2.11.tar.gz"
diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD
index fba6ff5c7..26f6162d8 100644
--- a/user/minuet/APKBUILD
+++ b/user/minuet/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=minuet
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Music education software"
url="https://minuet.kde.org/"
@@ -12,10 +12,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
qt5-qtquickcontrols2-dev qt5-qtsvg-dev kcoreaddons-dev ki18n-dev
kcrash-dev kdoctools-dev fluidsynth-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/minuet-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/minuet-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="38b937e85c60adf5241ed16402563b386a8ebee4ae9eddef4ffd1b27f8ab9535c6507f1889c0a9fcf1ac0e6ff20bd100a17a30424b3521a91bccc2fbfacf751f minuet-19.08.2.tar.xz"
+sha512sums="a5e5b7ea26f8dc3b20c0bb4ce9015fb704f30ad6221c6729ad8bf11cb68b09e4cfb53a541f7786916ce6ea37806d24d73882ea39158cac9d5eee6832fbf42090 minuet-19.12.1.tar.xz"
diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD
index acbe85329..192101edb 100644
--- a/user/mksh/APKBUILD
+++ b/user/mksh/APKBUILD
@@ -8,12 +8,12 @@ url="http://mirbsd.de/mksh"
arch="all"
license="MirOS OR ISC"
depends=""
-makedepends=""
checkdepends="ed perl"
+makedepends=""
subpackages="$pkgname-doc"
install="mksh.post-install mksh.post-upgrade mksh.pre-deinstall"
source="http://www.mirbsd.org/MirOS/dist/mir/${pkgname}/${pkgname}-R${pkgver}.tgz"
-builddir=$srcdir/$pkgname
+builddir="$srcdir"/$pkgname
build() {
# Build the main shell:
@@ -27,10 +27,10 @@ build() {
}
check() {
- echo "Running the test suite for mksh:"
+ msg "Running the test suite for mksh"
./test_mksh.sh
- echo "Running the test suite for lksh:"
+ msg "Running the test suite for lksh:"
./test_lksh.sh
}
diff --git a/user/mlt/APKBUILD b/user/mlt/APKBUILD
index ad94dd2ff..fcab2635f 100644
--- a/user/mlt/APKBUILD
+++ b/user/mlt/APKBUILD
@@ -1,13 +1,14 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer:
pkgname=mlt
-pkgver=6.16.0
+pkgver=6.18.0
pkgrel=0
pkgdesc="MLT multimedia framework"
url="https://www.mltframework.org/"
arch="all"
options="!check" # No test suite.
license="LGPL-2.1+ AND GPL-3.0+"
+depends=""
makedepends="bsd-compat-headers ffmpeg-dev fftw-dev frei0r-plugins-dev
gtk+2.0-dev libexif-dev libsamplerate-dev libxml2-dev sdl-dev sdl2-dev
qt5-qtbase-dev qt5-qtsvg-dev sdl_image-dev sox-dev"
@@ -17,10 +18,11 @@ source="https://github.com/mltframework/mlt/releases/download/v$pkgver/mlt-$pkgv
"
build() {
- local _maybe_asm=""
+ _maybe_asm=""
case $CTARGET_ARCH in
pmmx) _maybe_asm="--disable-sse --target-arch=i586" ;;
+ ppc) export LDFLAGS="$LDFLAGS -latomic" ;;
esac
./configure \
@@ -43,5 +45,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26 mlt-6.16.0.tar.gz
+sha512sums="af6042fa554a7bf87060aaab401c51111fd03a1e50037024662fe727a2281c218f62db07f2c44db62d46f2b9ff67d4599f7aaccc2b337e20394383a24e3c5953 mlt-6.18.0.tar.gz
d00f01d50d5c78b1da5b43dc2b0bbfc49d5e383b602169ae9554734d29f6d43b9da8f97546141933c06ff0367bb4c9f0d2161bbcb6f016265bb0aa1dcbfcb3b1 mlt-6.14.0-locale-header.patch"
diff --git a/user/modemmanager/APKBUILD b/user/modemmanager/APKBUILD
index 66c605788..ee6aa8974 100644
--- a/user/modemmanager/APKBUILD
+++ b/user/modemmanager/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=modemmanager
-pkgver=1.12.0
+pkgver=1.12.2
pkgrel=0
pkgdesc="Software to control mobile broadband modems"
url="https://www.freedesktop.org/wiki/Software/ModemManager/"
@@ -43,6 +43,6 @@ package() {
"$srcdir"/01-org.freedesktop.ModemManager.rules
}
-sha512sums="7c8b123d4f337a9d19726e241c0e52089e9075cb17ea1e8cd9ca60ed5bc135331bcf0bec054f261c5611149bf1838b27abf8dc3fc7aa39be166917156b491bd7 ModemManager-1.12.0.tar.xz
+sha512sums="d0a80bcd3cc9ee92af438cf155c49fa645d2e554e600aa50e5c0319a40a3be5378ca7ce3cf070a4ce7f2fec1c53e6be5d14ae8c53ff4e589e4e2a1ebcad7dea8 ModemManager-1.12.2.tar.xz
78e1c2ef604fb8b204618b9ecdc741ed7087fcc46ee563dbaaf6c9c0185165be58abfc3bf8ba89129fce7570c172cd1ac1e191e6d1200e3029c14a585ff40b83 no-translit.patch
31ded548acc8ccfcca5cd54384819b73ad9ac83556b754fa03a1a9c08aed7f913c7f066000abef0e52310721ef8c00ca8f48f1f762faaa5792420f62b5201881 01-org.freedesktop.ModemManager.rules"
diff --git a/user/monoid/APKBUILD b/user/monoid/APKBUILD
index 449d177e1..da210f0f7 100644
--- a/user/monoid/APKBUILD
+++ b/user/monoid/APKBUILD
@@ -15,8 +15,7 @@ source="https://raw.githubusercontent.com/larsenwork/monoid/2db2d289f4e61010dd3f
builddir="$srcdir/"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ "$builddir"/*.ttf
}
sha512sums="2776bbc7febf17c10f87bbdd3e6e4fd7c24b93286009d1dcb0ca8058e1e1437c3179068ab608c3f69ae07c08950ececb4d0ad88e82ccba4a6bd2d8b63f71a9c8 Monoid-Small.zip"
diff --git a/user/montecarlo/APKBUILD b/user/montecarlo/APKBUILD
index f3c794409..c49434e64 100644
--- a/user/montecarlo/APKBUILD
+++ b/user/montecarlo/APKBUILD
@@ -15,8 +15,6 @@ source="http://www.bok.net/MonteCarlo/downloads/MonteCarlo-PCF.tgz"
builddir="$srcdir/MonteCarlo-PCF"
package() {
- cd "$builddir"
- local _font
for _font in *.pcf; do
gzip -9 $_font
install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/misc/ $_font.gz
diff --git a/user/mosh/APKBUILD b/user/mosh/APKBUILD
index 7ec12f783..d138bd4f3 100644
--- a/user/mosh/APKBUILD
+++ b/user/mosh/APKBUILD
@@ -20,12 +20,10 @@ prepare() {
default_prepare
# Test unicode-later-combining is failing. Ideally we want to fix it.
sed -i '/unicode-later-combining.test/d' "$builddir"/src/tests/Makefile.am
- cd "$builddir"
./autogen.sh
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -38,12 +36,10 @@ build() {
}
check() {
- cd "$builddir"
make check VERBOSE=1 V=1
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mosquitto/APKBUILD b/user/mosquitto/APKBUILD
index e7cd25057..7e19f62f4 100644
--- a/user/mosquitto/APKBUILD
+++ b/user/mosquitto/APKBUILD
@@ -2,15 +2,16 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=mosquitto
-pkgver=1.6.6
+pkgver=1.6.8
pkgrel=0
pkgdesc="An Open Source MQTT Broker"
url="https://mosquitto.org/"
arch="all"
+options="!check" # "Connection refused" during testing.
license="EPL-1.0 AND EDL-1.0 AND MIT AND BSD-3-Clause"
depends=""
-makedepends="c-ares-dev openssl-dev util-linux-dev"
checkdepends="python3"
+makedepends="c-ares-dev openssl-dev util-linux-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc
$pkgname-clients"
install="$pkgname.pre-install"
@@ -18,7 +19,7 @@ source="http://mosquitto.org/files/source/$pkgname-$pkgver.tar.gz
mosquitto.initd
disable-flaky-test.patch
openrc-conf.patch
- python3.patch"
+ "
# secfixes:
# 1.6.6-r0:
@@ -73,8 +74,7 @@ clients() {
mv "$pkgdir"/usr/bin/mosquitto_[ps]ub "$subpkgdir"/usr/bin/
}
-sha512sums="ea6ba7b57773c8f4a59e708ae305a0e38ca85df94854410b29cccddbe10bbb91c2ea5e827fefb3f57cb4fce188ab9c3021804f1ae398b7fd5e9e965354b68bc1 mosquitto-1.6.6.tar.gz
+sha512sums="c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071 mosquitto-1.6.8.tar.gz
681fddc737b3ef3e6c052f0c854a730df290352640a18a63e23ef83d14c425558aff87805d1eb95e44de101b5df48872173af9f5414464ffa8cf727ea2c0491e mosquitto.initd
3886171e36f759a717aa6626d5b8dbd392963c737d5de28b4d52b81359008927b99ff7a0ca82f56a0e5deaed4585571759ba9216336a664fd346845837c2bc18 disable-flaky-test.patch
-b07f9bec2751ab32c43f53e74d8fca18dbf2d7ce7f8fab562dbcf75de19609ba6219d735ac504697404e0ed36613a14074e3a19e735297195877798f778d337a openrc-conf.patch
-078197e6c3e59b664f5fdd1e4a4f669c9a76ab84fe4a5d8602ac80406b85c4e1cce29d9372e76d995155b74abb438d0dc0cdcdb98251fb904122073c4088d76a python3.patch"
+b07f9bec2751ab32c43f53e74d8fca18dbf2d7ce7f8fab562dbcf75de19609ba6219d735ac504697404e0ed36613a14074e3a19e735297195877798f778d337a openrc-conf.patch"
diff --git a/user/mosquitto/python3.patch b/user/mosquitto/python3.patch
deleted file mode 100644
index f348cbc3e..000000000
--- a/user/mosquitto/python3.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- mosquitto-1.6.4/test/broker/09-extended-auth-change-username.py.old 2019-08-01 19:50:01.000000000 +0000
-+++ mosquitto-1.6.4/test/broker/09-extended-auth-change-username.py 2019-08-27 22:20:08.560518752 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- # Check whether an extended auth plugin can change the username of a client.
-
---- mosquitto-1.6.4/test/broker/09-extended-auth-multistep-reauth.py.old 2019-08-01 19:50:01.000000000 +0000
-+++ mosquitto-1.6.4/test/broker/09-extended-auth-multistep-reauth.py 2019-08-27 22:22:11.530519618 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- from mosq_test_helper import *
-
---- mosquitto-1.6.4/test/broker/09-extended-auth-multistep.py.old 2019-08-01 19:50:01.000000000 +0000
-+++ mosquitto-1.6.4/test/broker/09-extended-auth-multistep.py 2019-08-27 22:20:37.030518952 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- from mosq_test_helper import *
-
---- mosquitto-1.6.4/test/broker/09-extended-auth-single.py.old 2019-08-01 19:50:01.000000000 +0000
-+++ mosquitto-1.6.4/test/broker/09-extended-auth-single.py 2019-08-27 22:21:42.250519412 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- # Multi tests for extended auth with a single step.
- # * Error in plugin
---- mosquitto-1.6.4/test/broker/09-extended-auth-single2.py.old 2019-08-01 19:50:01.000000000 +0000
-+++ mosquitto-1.6.4/test/broker/09-extended-auth-single2.py 2019-08-27 22:21:02.220519130 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- # Multi tests for extended auth with a single step - multiple plugins at once.
- # * Error in plugin
---- mosquitto-1.6.4/test/broker/09-extended-auth-unsupported.py.old 2019-08-01 19:50:01.000000000 +0000
-+++ mosquitto-1.6.4/test/broker/09-extended-auth-unsupported.py 2019-08-27 22:21:20.360519257 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
-
- # Test whether an unsupported extended auth is rejected.
-
diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD
index be5799335..f7e87a35d 100644
--- a/user/mousepad/APKBUILD
+++ b/user/mousepad/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mousepad
pkgver=0.4.2
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Simple text editor for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="dbus-glib-dev glib-dev gtk+3.0-dev gtksourceview-3.0-dev intltool
xfconf-dev"
subpackages="$pkgname-lang"
diff --git a/user/mozo/APKBUILD b/user/mozo/APKBUILD
index 2c7c919c4..777285dc4 100644
--- a/user/mozo/APKBUILD
+++ b/user/mozo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mozo
pkgver=1.22.2
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/mozo-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/mpg123/APKBUILD b/user/mpg123/APKBUILD
index 17d2929e4..7c75ee723 100644
--- a/user/mpg123/APKBUILD
+++ b/user/mpg123/APKBUILD
@@ -7,9 +7,9 @@ url="https://www.mpg123.org/"
arch="all"
options="libtool textrels"
license="LGPL-2.1-only"
-subpackages="$pkgname-dev $pkgname-doc"
depends=""
makedepends="alsa-lib-dev libtool linux-headers pulseaudio-dev"
+subpackages="$pkgname-dev $pkgname-doc"
source="https://www.mpg123.org/download/$pkgname-$pkgver.tar.bz2"
build() {
diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD
index 576de2514..8f703f637 100644
--- a/user/mplayer/APKBUILD
+++ b/user/mplayer/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mplayer
pkgver=1.4
pkgrel=1
diff --git a/user/mpv/APKBUILD b/user/mpv/APKBUILD
index 9c12a7aa6..09b6931fe 100644
--- a/user/mpv/APKBUILD
+++ b/user/mpv/APKBUILD
@@ -1,13 +1,14 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mpv
-pkgver=0.29.1
-pkgrel=2
+pkgver=0.30.0
+pkgrel=0
pkgdesc="An improved fork of mplayer"
url="https://mpv.io"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="LGPL-2.1+ AND GPL-2.0+ AND ISC AND BSD-2-Clause AND MIT AND BSD-3-Clause"
+depends=""
makedepends="python3
zlib-dev libarchive-dev py3-docutils uchardet-dev ncurses-dev
@@ -32,10 +33,8 @@ build() {
--disable-javascript \
--disable-wayland \
--disable-gl-wayland \
- --enable-dvdread \
--enable-dvdnav \
- --enable-cdda \
- --enable-tv
+ --enable-cdda
python3 ./waf build
}
@@ -43,4 +42,4 @@ package() {
python3 ./waf install --destdir="$pkgdir"
}
-sha512sums="ec57c9ceaaf2915ee237dd5a1c5ea5d22725d8611e28a9b998e5bb0d8ab5bdf3631d0267fc7b54da31cb1eaa145ef35841e68846bd41c3b9e1024902e92fd086 mpv-0.29.1.tar.gz"
+sha512sums="2b3cc626575b5e56308f5f9ecf926957a36c861c85f700a4a3ede72cf7f7ea08729d20f810693117e21aeeff649f08718e73ead7d117521bf88d746708a72c66 mpv-0.30.0.tar.gz"
diff --git a/user/mtdev/APKBUILD b/user/mtdev/APKBUILD
index 38b63184b..18a1826f0 100644
--- a/user/mtdev/APKBUILD
+++ b/user/mtdev/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=mtdev
-pkgver=1.1.5
-pkgrel=3
+pkgver=1.1.6
+pkgrel=0
pkgdesc="Multitouch Protocol Translation Library"
url="http://bitmath.org/code/mtdev/"
arch="all"
@@ -11,7 +11,9 @@ depends=""
depends_dev="linux-headers"
makedepends="$depends_dev"
subpackages="$pkgname-dev"
-source="http://bitmath.org/code/mtdev/mtdev-$pkgver.tar.gz"
+source="http://bitmath.org/code/mtdev/mtdev-$pkgver.tar.gz
+ printf-format.patch
+ "
prepare() {
default_prepare
@@ -43,4 +45,5 @@ dev() {
mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
}
-sha512sums="f59f8cda9b81e17253ff2da93a14b6f8e48361aff890dd5d1bb89ca385d713c212f961ed34fc5b866affd83013530a036736faca071ec9a424091979a12c9208 mtdev-1.1.5.tar.gz"
+sha512sums="e643264baa880abfc31b53f8e8ed54fe1adea4bc110fab57d36be16caba84f970c09fc864244c64b0a76e85f5f021fd086c12f96badbd886da6ccf254ab678e9 mtdev-1.1.6.tar.gz
+5a429ab3f7773e86eafb5beaff466ca6e209a131bfc1fd633e3ba4bfdf92caadf5037a3e84efb512bdc12891b2cc44ebb61b826daf3e66a7735004cc1dcd2713 printf-format.patch"
diff --git a/user/mtdev/printf-format.patch b/user/mtdev/printf-format.patch
new file mode 100644
index 000000000..46d187f64
--- /dev/null
+++ b/user/mtdev/printf-format.patch
@@ -0,0 +1,19 @@
+--- mtdev-1.1.6/test/mtdev-test.c.old 2020-01-26 14:00:32.000000000 +0000
++++ mtdev-1.1.6/test/mtdev-test.c 2020-01-30 02:17:49.009346559 +0000
+@@ -31,6 +31,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <stdint.h>
++#include <inttypes.h>
+
+ #ifndef input_event_sec
+ #define input_event_sec time.tv_sec
+@@ -56,7 +57,7 @@
+ mstime_t evtime = ev->input_event_usec / ms + ev->input_event_sec * ms;
+ if (ev->type == EV_ABS && ev->code == ABS_MT_SLOT)
+ slot = ev->value;
+- fprintf(stderr, "%012llx %02d %01d %04x %d\n",
++ fprintf(stderr, "%012"PRIx64" %02d %01d %04x %d\n",
+ evtime, slot, ev->type, ev->code, ev->value);
+ }
+
diff --git a/user/mtr/APKBUILD b/user/mtr/APKBUILD
index b2483b326..59fc8a203 100644
--- a/user/mtr/APKBUILD
+++ b/user/mtr/APKBUILD
@@ -41,15 +41,13 @@ build() {
}
package() {
- cd "$builddir"/curses
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C curses install
}
gtk() {
pkgdesc="Graphical traceroute tool"
depends=""
- cd "$builddir"/gtk
- make DESTDIR="$subpkgdir" install
+ make DESTDIR="$subpkgdir" -C "$builddir"/gtk install
install -D -m 644 "$srcdir"/mtr-gtk.desktop \
"$subpkgdir"/usr/share/applications/mtr-gtk.desktop
install -D -m 644 "$builddir"/img/mtr_icon.xpm \
diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD
index f088af0fa..7f3dd35c1 100644
--- a/user/muparser/APKBUILD
+++ b/user/muparser/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=muparser
pkgver=2.2.6.1
pkgrel=0
diff --git a/user/musl-obstack/APKBUILD b/user/musl-obstack/APKBUILD
index 47ca39a43..c0eb566a7 100644
--- a/user/musl-obstack/APKBUILD
+++ b/user/musl-obstack/APKBUILD
@@ -8,7 +8,7 @@ url=" "
arch="all"
license="GPL-2.0+"
depends=""
-makedepends=""
+makedepends="autoconf automake libtool"
subpackages="$pkgname-dev"
source="musl-obstack-$pkgver.tar.gz::https://github.com/pullmoll/musl-obstack/archive/v$pkgver.tar.gz"
diff --git a/user/mutt/APKBUILD b/user/mutt/APKBUILD
index dcc71891e..505d0c869 100644
--- a/user/mutt/APKBUILD
+++ b/user/mutt/APKBUILD
@@ -3,13 +3,14 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=mutt
-pkgver=1.12.2
+pkgver=1.13.2
pkgrel=0
pkgdesc="Small but very powerful text-mode email client"
url="http://www.mutt.org" # No HTTPS
arch="all"
options="suid !check" # No test suite.
license="GPL-2.0+ AND LGPL-2.0+ AND LGPL-2.1+ AND Public-Domain"
+depends=""
makedepends="cyrus-sasl-dev gdbm-dev gettext-tiny gpgme-dev
libidn-dev ncurses-dev openssl-dev perl"
subpackages="$pkgname-doc $pkgname-lang"
@@ -56,4 +57,4 @@ package() {
"$pkgdir"/etc/Muttrc.gpg.dist
}
-sha512sums="a824a056edef0c320b7633a39ab2421646442132190c2b2bf788ac39aaf7a0143d12847eb27290913d8ae793810bb6353803977610045b36235579001a1096bd mutt-1.12.2.tar.gz"
+sha512sums="af6eb8d2125dc49391392f350ec44203824a0cea2856ca194e7f8f534e598049185c813a56053491fda221042d1508a48cf46b2167e2ebf44af7b69938dcb829 mutt-1.13.2.tar.gz"
diff --git a/user/mythes/APKBUILD b/user/mythes/APKBUILD
index 6346e7cb9..5f171b76a 100644
--- a/user/mythes/APKBUILD
+++ b/user/mythes/APKBUILD
@@ -8,13 +8,13 @@ url="http://hunspell.github.io/"
arch="all"
options="!check" # No test suite.
license="Custom"
-subpackages="$pkgname-dev"
+depends=""
depends_dev="perl hunspell-dev"
makedepends="$depends_dev"
-source="http://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz"
+subpackages="$pkgname-dev"
+source="https://downloads.sourceforge.net/hunspell/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -30,7 +30,6 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
}
diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD
index 02a0d0fdc..84ceb64f2 100644
--- a/user/nano/APKBUILD
+++ b/user/nano/APKBUILD
@@ -1,19 +1,18 @@
# Contributor: Michael Mason <ms13sp@gmail.com>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=nano
-pkgver=4.5
+pkgver=4.7
pkgrel=0
pkgdesc="Enhanced clone of the Pico text editor"
url="https://www.nano-editor.org"
arch="all"
license="GPL-3.0+"
+depends=""
makedepends="file-dev ncurses-dev"
subpackages="$pkgname-doc $pkgname-lang"
-replaces="nano-syntax" # ??? why was this ever split
source="https://www.nano-editor.org/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,13 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" install
install -Dm644 doc/sample.nanorc \
"$pkgdir"/etc/nanorc
@@ -44,4 +40,4 @@ package() {
rm -rf "$pkgdir"/usr/lib/charset.alias
}
-sha512sums="1caee1f559cb11efa7535f4682e7ff6e22802d01ca21733a67031e4ba7c5d3ca13c60f22f71460bb99eadd8d001aeb3783a5e34d1433583e8822fc13d063e4d9 nano-4.5.tar.xz"
+sha512sums="53fc587554ca639f27cfdd81adc8108e38adddae4fda9d73c3ebff57e546feaa45be7a2851da43bcdafd442e4834a42cc1f9eec1a99051a32410a712142f48c3 nano-4.7.tar.xz"
diff --git a/user/nasm/APKBUILD b/user/nasm/APKBUILD
index 81aa6a996..4e73db97e 100644
--- a/user/nasm/APKBUILD
+++ b/user/nasm/APKBUILD
@@ -6,12 +6,13 @@ pkgdesc="80x86 assembler designed for portability and modularity"
url="https://www.nasm.us/"
arch="all"
license="BSD-2-Clause"
+depends=""
checkdepends="perl"
+makedepends=""
subpackages="$pkgname-doc"
source="https://www.nasm.us/pub/nasm/releasebuilds/$pkgver/$pkgname-$pkgver.tar.bz2"
build () {
- cd "$builddir"
export CFLAGS=
export CXXFLAGS=
./configure \
@@ -22,12 +23,10 @@ build () {
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/ncftp/APKBUILD b/user/ncftp/APKBUILD
index 1a9b5fce4..dd1a31d21 100644
--- a/user/ncftp/APKBUILD
+++ b/user/ncftp/APKBUILD
@@ -8,13 +8,12 @@ url="http://www.ncftp.com/"
arch="all"
options="!check" # No test suite.
license="ClArtistic"
+depends=""
makedepends="ncurses-dev"
-source="ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.gz"
subpackages="$pkgname-doc $pkgname-bookmarks"
+source="ftp://ftp.ncftp.com/ncftp/$pkgname-$pkgver-src.tar.gz"
-build () {
- cd "$builddir"
-
+build() {
LIBS="-ltinfo" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -22,22 +21,18 @@ build () {
--sysconfdir=/etc \
--mandir=/usr/share/man
- cd "$builddir"/libncftp
- make shared
- cd "$builddir"
+ make -C libncftp shared
make
}
package() {
- cd "$builddir"/libncftp
- make PREFIX="${pkgdir}"/usr soinstall
- cd "$builddir"
+ make PREFIX="${pkgdir}"/usr -C libncftp soinstall
make DESTDIR="$pkgdir" install
install -D doc/LICENSE.txt \
"$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
}
-bookmarks () {
+bookmarks() {
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/ncftpbookmarks \
"$subpkgdir"/usr/bin/
diff --git a/user/ncompress/APKBUILD b/user/ncompress/APKBUILD
index 0a34a72fe..2ed725ebf 100644
--- a/user/ncompress/APKBUILD
+++ b/user/ncompress/APKBUILD
@@ -8,6 +8,8 @@ url="https://github.com/vapier/ncompress"
arch="all"
options="!check" # No test suite.
license="Public-Domain"
+depends=""
+makedepends=""
subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/ncompress/ncompress-$pkgver.tar.gz
fix-9bit-compress.patch"
diff --git a/user/neon/APKBUILD b/user/neon/APKBUILD
index 8dda94d31..4b0c4349b 100644
--- a/user/neon/APKBUILD
+++ b/user/neon/APKBUILD
@@ -5,7 +5,7 @@ pkgrel=3
pkgdesc="HTTP and WebDAV client library with a C interface"
url=" "
arch="all"
-license="GPL LGPL"
+license="LGPL-2.0+"
depends="ca-certificates"
depends_dev="expat-dev openssl-dev zlib-dev"
makedepends="$depends_dev"
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.gz"
build () {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -30,12 +29,10 @@ build () {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
sha512sums="634caf87522e0bd2695c6fba39cae2465e403f9fbd8007eb10e4e035c765d24cb8da932c67bfa35c34aa51b90c7bc7037ebebaa1ec43259366d5d07233efc631 neon-0.30.2.tar.gz"
diff --git a/user/net-snmp/APKBUILD b/user/net-snmp/APKBUILD
index 9f083a732..3fc1bceb4 100644
--- a/user/net-snmp/APKBUILD
+++ b/user/net-snmp/APKBUILD
@@ -26,18 +26,13 @@ source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
"
prepare() {
- update_config_sub
default_prepare
- # Allow tmpfs volume size monitoring
- # Ref #932
+ update_config_sub
sed -e 's#"tmpfs",#/* "tmpfs", */#g' -i agent/mibgroup/host/hr_filesys.c
}
build() {
- cd "$builddir"
-
export lt_cv_sys_max_cmd_len=8192
-
LIBS="-ltinfow" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -64,7 +59,6 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
# remove things we dont want distribute
rm "$pkgdir"/usr/lib/libsnmp* \
diff --git a/user/netifrc/APKBUILD b/user/netifrc/APKBUILD
index da1ef7d28..6749f98c7 100644
--- a/user/netifrc/APKBUILD
+++ b/user/netifrc/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-doc $pkgname-openrc"
source="https://gitweb.gentoo.org/proj/$pkgname.git/snapshot/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
make UDEVDIR=/lib/udev LIBEXECDIR=/lib/$pkgname PF="$pkgname-$pkgver"
}
package() {
- cd "$builddir"
make UDEVDIR=/lib/udev LIBEXECDIR=/lib/$pkgname DESTDIR="$pkgdir" install
for doc in README CREDITS TODO; do
install -m 644 "$builddir"/$doc "$pkgdir"/usr/share/doc/$pkgname/
diff --git a/user/netqmail/APKBUILD b/user/netqmail/APKBUILD
index 173f4da66..551895f83 100644
--- a/user/netqmail/APKBUILD
+++ b/user/netqmail/APKBUILD
@@ -7,13 +7,13 @@ pkgdesc="The qmail mail transfer agent (community version)"
url="http://www.netqmail.org/"
arch="all"
license="Public-Domain"
-provides=sendmail
options="suid !check" # suid programs (qmail-queue); no test suite
depends="execline s6 s6-networking"
makedepends="utmps-dev"
subpackages="$pkgname-doc $pkgname-openrc"
-install="$pkgname.post-install $pkgname.pre-deinstall"
provider_priority=1
+provides="sendmail"
+install="$pkgname.post-install $pkgname.pre-deinstall"
source="http://www.netqmail.org/$pkgname-$pkgver.tar.gz
0001-DESTDIR.patch
0002-qbiffutmpx-20170820.patch
@@ -66,7 +66,6 @@ makeservicedir()
}
build() {
- cd "$builddir"
echo "$CC $CFLAGS" > conf-cc
echo "$CC $LDFLAGS -s -static" > conf-ld
echo "$CC $LDFLAGS" > conf-ldi # because fakeroot doesn't work with static programs
@@ -79,7 +78,6 @@ build() {
}
package() {
- cd "$builddir"
mkdir -p -m 0755 "$pkgdir"/var/qmail/services "$pkgdir"/var/log/qmail "$pkgdir"/usr/bin "$pkgdir"/usr/sbin "$pkgdir"/usr/share/doc "$pkgdir"/etc/qmail/services "$pkgdir"/etc/conf.d "$pkgdir"/etc/init.d
chown qmaill:qmaill "$pkgdir"/var/log/qmail
chmod 2700 "$pkgdir"/var/log/qmail
diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD
index e6f799627..0c9fc7e8b 100644
--- a/user/netsurf/APKBUILD
+++ b/user/netsurf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=netsurf
pkgver=3.9
pkgrel=0
diff --git a/user/networkmanager/APKBUILD b/user/networkmanager/APKBUILD
index 6023b2ba8..17e6eadab 100644
--- a/user/networkmanager/APKBUILD
+++ b/user/networkmanager/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=networkmanager
-pkgver=1.20.6
+pkgver=1.22.0
pkgrel=0
pkgdesc="Network management daemon"
url="https://wiki.gnome.org/Projects/NetworkManager"
@@ -9,12 +9,12 @@ arch="all"
options="!check" # Requires dbus-python and running DBus server.
license="GPL-2.0+ AND LGPL-2.1+"
depends="dhcpcd iputils ppp wpa_supplicant-dbus"
-makedepends="bluez-dev consolekit2-dev curl-dev dbus-dev dbus-glib-dev
+makedepends="bash bluez-dev consolekit2-dev curl-dev dbus-dev dbus-glib-dev
eudev-dev glib-dev gobject-introspection-dev intltool libedit-dev
libndp-dev libxslt modemmanager-dev ncurses-dev newt-dev nss-dev
perl polkit-dev ppp-dev py3-pygobject util-linux-dev vala-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-openrc"
-source="https://download.gnome.org/sources/NetworkManager/1.20/NetworkManager-$pkgver.tar.xz
+source="https://download.gnome.org/sources/NetworkManager/${pkgver%.*}/NetworkManager-$pkgver.tar.xz
editline.patch
errno.patch
musl.patch
@@ -31,7 +31,7 @@ builddir="$srcdir/NetworkManager-$pkgver"
build() {
# pppd plugin dir is a huge hack.
- ./configure \
+ bash ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -90,13 +90,13 @@ openrc() {
"$subpkgdir"/etc/NetworkManager/dispatcher.d/
}
-sha512sums="ecd5fe1f5941e9f15506ba572458ae421336524c674d1147a57e172899c8db29fc79fb8faa00a6789057f3c85f79171131e2581789f9d52ce46a81cfe5a507b9 NetworkManager-1.20.6.tar.xz
-a849f8172b88370f48217e04f2fafb4431db32415df52af7d4a388f604f7d03c4c21b6ad37afb57e52700a38a7e78365025da99991bc8d179c73dabb31e05256 editline.patch
-0006d9c538a72673746b6aede8c61e0b7a23b055f8276fa2dde6e70f8c00d60854cf49678c996764f83b40cf06c5c2cd24c8c382d900aaf97fc840342e29500f errno.patch
-313e57823ffa49bd7b76355f8cea6932737ae4b38cb00eb183b12093a8109e079dc7439b2b35fa6bf9b83f2937729cca847a2bf31857382e9c3ae0b945c2dd6b musl.patch
+sha512sums="f6a2f621b42f7788646c81cc61d17261aa6df6351e6acfbc70d3d1b034416476f1c14b2444565d6abac2ee1b9aa2680fdb513b523fe6cad1bc37102d4bee41d0 NetworkManager-1.22.0.tar.xz
+ecd9cb920a125e0e3c4b8c96048ca3ac24490fdd453f0525ecaccf688687692e7a5feaf87eeaf97a2dfb405b2e0db8743114510e30f00f7ae119dc9b9551e7d7 editline.patch
+b0b85294c19510893ba30cf3d0e1984430c451273d4eb545760de52c69866a5ed0385f9c14a9bc180da01daad7d1c0da221101e7a826bc5be53c2724c9990d95 errno.patch
+7b3cfbea8b80f832862d79fce9f89f604b457744324a8ae6b428cf3cb42ec2536d3c5784303d140d50c5a2cd8caf91d04f5096ef420a57a761e412bf2256bd5a musl.patch
5142bf14ac5574a3ae4bc8753055c534702892871ca45a1bc4d48d4d5c07d11bd54e52861458a673c328d129cdd6f1f749a9546eba1c16fea5173f92840506de qsort_r.patch
-f149b9bb7b16c6e79685ff6a8c0f6f20a692bb675f66f8dd5dffe2158850b15d7a4591be8e906adec5e16047b681d0501b3228c4af5d218152ec8f82068fd414 random.patch
-942986f22b1b522420afb885ca5c1d5dcaae10c193e001cb0604a78125b5efcc7f3e2b318f2b1f44b867369a243f7467bb00948617ac1d44271da7fd6e6b2ce6 tests.patch
+d81a962e32e696ca713dfcf1f8dbd9a146f94473c391f1977198ca67e11a6d427a265bacbe43197e42b442cfaa882e9fd2bba7548872586d53d3caca76263e79 random.patch
+602859c1c7b63984b3b9d9597772e4bff496b3838eb0131ad1d707ae9226c5bdd703080683e48bc93b9c1a6572505dad0332d63c57e6320e63c011931877233a tests.patch
22dfa5b071891ba16b9a8b90a1964d56e370cb640d78191934ae802e568f92c299b9d4d965f7081fb36a8c09378bfb0b33193b2332cbdc28c6799b152128c214 01-org.freedesktop.NetworkManager.rules
26f962cea0b6a75549d16c19a71e3559239b08b001927882702f5d9355a2cc95f7b13c581439f758a950d9a5bfb73b86ba61a5ffb22c9abe19f5b05fe5f5834a 10-openrc-status
f8c9331834cbc66ab0e4e6f4a120fde6a08a435d680a1e1087718fdbb2b9843a313e7ec30b7008822999dafd98e152aa7d2a96f87320ba9c91c3adb63e0b7c9a nm.confd
diff --git a/user/networkmanager/editline.patch b/user/networkmanager/editline.patch
index e727f374a..7508e9b9a 100644
--- a/user/networkmanager/editline.patch
+++ b/user/networkmanager/editline.patch
@@ -1,6 +1,6 @@
--- NetworkManager-1.18.1/clients/cli/agent.c.old 2019-04-18 09:19:11.000000000 +0000
+++ NetworkManager-1.18.1/clients/cli/agent.c 2019-05-10 06:15:55.614930112 +0000
-@@ -25,8 +25,7 @@
+@@ -9,8 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -12,7 +12,7 @@
#include "utils.h"
--- NetworkManager-1.18.1/clients/cli/common.c.old 2019-04-20 19:01:59.000000000 +0000
+++ NetworkManager-1.18.1/clients/cli/common.c 2019-05-10 07:07:34.506620687 +0000
-@@ -26,8 +26,7 @@
+@@ -10,8 +10,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/ioctl.h>
@@ -22,7 +22,7 @@
#include "nm-vpn-helpers.h"
#include "nm-client-utils.h"
-@@ -1008,7 +1007,7 @@
+@@ -992,7 +991,7 @@
* nmc_readline_echo:
*
* The same as nmc_readline() except it can disable echoing of input characters if @echo_on is %FALSE.
@@ -31,7 +31,7 @@
*/
char *
nmc_readline_echo (const NmcConfig *nmc_config,
-@@ -1019,8 +1018,7 @@
+@@ -1003,8 +1002,7 @@
va_list args;
gs_free char *prompt = NULL;
char *str;
@@ -41,7 +41,7 @@
va_start (args, prompt_fmt);
prompt = g_strdup_vprintf (prompt_fmt, args);
-@@ -1030,8 +1028,7 @@
+@@ -1014,8 +1012,7 @@
/* Hide the actual password */
if (!echo_on) {
@@ -51,7 +51,7 @@
rl_redisplay_function = nmc_secret_redisplay;
}
-@@ -1040,7 +1037,10 @@
+@@ -1024,7 +1021,10 @@
/* Restore the non-hiding behavior */
if (!echo_on) {
rl_redisplay_function = rl_redisplay;
@@ -65,7 +65,7 @@
return str;
--- NetworkManager-1.18.1/clients/cli/connections.c.old 2019-04-20 19:01:59.000000000 +0000
+++ NetworkManager-1.18.1/clients/cli/connections.c 2019-05-10 07:05:43.058781503 +0000
-@@ -26,8 +26,7 @@
+@@ -12,8 +12,7 @@
#include <unistd.h>
#include <signal.h>
#include <netinet/ether.h>
@@ -75,7 +75,7 @@
#include <fcntl.h>
#include "nm-client-utils.h"
-@@ -6050,9 +6049,6 @@
+@@ -6110,9 +6109,6 @@
return nmc_rl_gen_func_basic (text, state, avals);
}
@@ -85,7 +85,7 @@
/*
* Attempt to complete on the contents of TEXT. START and END show the
* region of TEXT that contains the word to complete. We can use the
-@@ -6079,9 +6075,6 @@
+@@ -6139,9 +6135,6 @@
/* Disable default filename completion */
rl_attempted_completion_over = 1;
@@ -95,7 +95,7 @@
/* Filter out possible ANSI color escape sequences */
prompt_tmp = nmc_filter_out_colors ((const char *) rl_prompt);
-@@ -9150,7 +9143,6 @@
+@@ -9243,7 +9236,6 @@
generator_func = _meta_abstract_generator;
} else if (g_strcmp0 (rl_prompt, PROMPT_IMPORT_FILE) == 0) {
rl_attempted_completion_over = 0;
@@ -105,7 +105,7 @@
}
--- NetworkManager-1.18.1/clients/cli/devices.c.old 2019-04-20 19:01:59.000000000 +0000
+++ NetworkManager-1.18.1/clients/cli/devices.c 2019-05-10 06:16:21.432108032 +0000
-@@ -23,7 +23,7 @@
+@@ -9,7 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
@@ -116,7 +116,7 @@
#include "nm-client-utils.h"
--- NetworkManager-1.18.1/clients/cli/nmcli.c.old 2019-04-20 19:01:59.000000000 +0000
+++ NetworkManager-1.18.1/clients/cli/nmcli.c 2019-05-10 06:16:29.211257692 +0000
-@@ -30,8 +30,7 @@
+@@ -15,8 +15,7 @@
#include <unistd.h>
#include <locale.h>
#include <glib-unix.h>
diff --git a/user/networkmanager/errno.patch b/user/networkmanager/errno.patch
index 825cc97a7..00c932586 100644
--- a/user/networkmanager/errno.patch
+++ b/user/networkmanager/errno.patch
@@ -1,6 +1,6 @@
--- NetworkManager-1.18.1/shared/nm-glib-aux/nm-errno.c.old 2019-04-19 09:31:51.000000000 +0000
+++ NetworkManager-1.18.1/shared/nm-glib-aux/nm-errno.c 2019-05-10 06:01:00.812741059 +0000
-@@ -121,7 +121,6 @@
+@@ -106,7 +106,6 @@
nm_assert (buf);
nm_assert (buf_size > 0);
@@ -8,7 +8,7 @@
/* XSI-compliant */
{
int errno_saved = errno;
-@@ -132,10 +131,6 @@
+@@ -117,10 +116,6 @@
}
buf2 = buf;
}
diff --git a/user/networkmanager/musl.patch b/user/networkmanager/musl.patch
index d8e9fdab2..ddf86390f 100644
--- a/user/networkmanager/musl.patch
+++ b/user/networkmanager/musl.patch
@@ -36,7 +36,7 @@ diff --git a/shared/systemd/src/basic/util.h b/shared/systemd/src/basic/util.h
index 25e6ab8..7967e8a 100644
--- a/shared/systemd/src/basic/util.h
+++ b/shared/systemd/src/basic/util.h
-@@ -46,6 +46,12 @@ static inline unsigned u64log2(uint64_t n) {
+@@ -30,6 +30,12 @@ static inline unsigned u64log2(uint64_t n) {
#endif
}
@@ -53,7 +53,7 @@ diff --git a/libnm-core/nm-utils.h b/libnm-core/nm-utils.h
index 2b5baba..976850c 100644
--- a/libnm-core/nm-utils.h
+++ b/libnm-core/nm-utils.h
-@@ -29,7 +29,11 @@
+@@ -15,7 +15,11 @@
#include <netinet/in.h>
/* For ETH_ALEN and INFINIBAND_ALEN */
@@ -85,7 +85,7 @@ diff --git a/src/platform/wifi/nm-wifi-utils.h b/src/platform/wifi/nm-wifi-utils
index 36148b5..d282eb2 100644
--- a/src/platform/wifi/nm-wifi-utils.h
+++ b/src/platform/wifi/nm-wifi-utils.h
-@@ -21,7 +21,11 @@
+@@ -7,7 +7,11 @@
#ifndef __WIFI_UTILS_H__
#define __WIFI_UTILS_H__
@@ -101,7 +101,7 @@ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 7514fa7..f041382 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
-@@ -31,7 +31,11 @@
+@@ -17,7 +17,11 @@
#include <arpa/inet.h>
#include <fcntl.h>
#include <linux/if_addr.h>
@@ -117,19 +117,19 @@ diff --git a/src/nm-manager.c b/src/nm-manager.c
index 0bf6a75..e392507 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
-@@ -25,6 +25,7 @@
- #include <stdlib.h>
- #include <fcntl.h>
- #include <unistd.h>
+@@ -15,6 +15,7 @@
+ #include <sys/stat.h>
+ #include <sys/sendfile.h>
+ #include <limits.h>
+#include <asm/types.h>
-
- #include "nm-utils/nm-c-list.h"
-
+
+ #include "nm-glib-aux/nm-c-list.h"
+
diff --git a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h
index 8c07c53..d043afc 100644
--- a/src/systemd/sd-adapt-core/nm-sd-adapt-core.h
+++ b/src/systemd/sd-adapt-core/nm-sd-adapt-core.h
-@@ -63,7 +63,7 @@
+@@ -50,7 +50,7 @@
# ifdef HAVE___SECURE_GETENV
# define secure_getenv __secure_getenv
# else
@@ -140,7 +140,7 @@ index 8c07c53..d043afc 100644
--- NetworkManager-1.18.1/src/platform/nm-linux-platform.c.old 2019-04-19 09:31:51.000000000 +0000
+++ NetworkManager-1.18.1/src/platform/nm-linux-platform.c 2019-05-10 07:21:32.665163629 +0000
-@@ -19,6 +19,7 @@
+@@ -6,6 +6,7 @@
#include "nm-default.h"
#include "nm-linux-platform.h"
@@ -148,7 +148,7 @@ index 8c07c53..d043afc 100644
#include <arpa/inet.h>
#include <dlfcn.h>
-@@ -27,7 +28,11 @@
+@@ -14,7 +15,11 @@
#include <libudev.h>
#include <linux/fib_rules.h>
#include <linux/ip.h>
@@ -160,7 +160,7 @@ index 8c07c53..d043afc 100644
#include <linux/if_bridge.h>
#include <linux/if_link.h>
#include <linux/if_tun.h>
-@@ -57,7 +62,6 @@
+@@ -44,7 +49,6 @@
#include "nm-platform-private.h"
#include "wifi/nm-wifi-utils.h"
#include "wifi/nm-wifi-utils-wext.h"
@@ -172,7 +172,7 @@ diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/
index b0afb5c..f72e346 100644
--- a/shared/systemd/src/basic/process-util.c
+++ b/shared/systemd/src/basic/process-util.c
-@@ -19,6 +19,9 @@
+@@ -17,6 +17,9 @@
#include <sys/wait.h>
#include <syslog.h>
#include <unistd.h>
@@ -182,7 +182,7 @@ index b0afb5c..f72e346 100644
#if 0 /* NM_IGNORED */
#if HAVE_VALGRIND_VALGRIND_H
#include <valgrind/valgrind.h>
-@@ -1105,11 +1108,13 @@ void reset_cached_pid(void) {
+@@ -1123,11 +1126,13 @@ void reset_cached_pid(void) {
cached_pid = CACHED_PID_UNSET;
}
@@ -196,7 +196,7 @@ index b0afb5c..f72e346 100644
pid_t getpid_cached(void) {
static bool installed = false;
-@@ -1138,7 +1143,12 @@ pid_t getpid_cached(void) {
+@@ -1156,7 +1161,12 @@ pid_t getpid_cached(void) {
* only half-documented (glibc doesn't document it but LSB does — though only superficially)
* we'll check for errors only in the most generic fashion possible. */
@@ -213,7 +213,7 @@ index b0afb5c..f72e346 100644
--- NetworkManager-1.20.0/src/systemd/src/libsystemd-network/sd-dhcp6-client.c.old 2019-08-06 10:22:09.000000000 +0000
+++ NetworkManager-1.20.0/src/systemd/src/libsystemd-network/sd-dhcp6-client.c 2019-08-09 05:17:18.249955730 +0000
-@@ -8,7 +8,7 @@
+@@ -7,7 +7,7 @@
#include <errno.h>
#include <string.h>
#include <sys/ioctl.h>
diff --git a/user/networkmanager/random.patch b/user/networkmanager/random.patch
index 30acd9c3b..1d3c21588 100644
--- a/user/networkmanager/random.patch
+++ b/user/networkmanager/random.patch
@@ -36,7 +36,7 @@ diff --git shared/n-dhcp4/src/n-dhcp4-private.h shared/n-dhcp4/src/n-dhcp4-priva
index c38ddbfc8..fb4880771 100644
--- a/shared/n-dhcp4/src/n-dhcp4-private.h
+++ b/shared/n-dhcp4/src/n-dhcp4-private.h
-@@ -259,7 +259,11 @@ struct NDhcp4ClientProbeConfig {
+@@ -267,7 +267,11 @@ struct NDhcp4ClientProbeConfig {
bool inform_only;
bool init_reboot;
struct in_addr requested_ip;
diff --git a/user/networkmanager/tests.patch b/user/networkmanager/tests.patch
index ec9719a89..d2691db3b 100644
--- a/user/networkmanager/tests.patch
+++ b/user/networkmanager/tests.patch
@@ -1,6 +1,6 @@
--- NetworkManager-1.18.1/src/devices/tests/test-lldp.c.old 2019-04-18 09:19:11.000000000 +0000
+++ NetworkManager-1.18.1/src/devices/tests/test-lldp.c 2019-05-10 07:23:58.979198831 +0000
-@@ -20,7 +20,6 @@
+@@ -6,7 +6,6 @@
#include "nm-default.h"
#include <fcntl.h>
@@ -8,7 +8,7 @@
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/types.h>
-@@ -31,6 +30,7 @@
+@@ -17,6 +16,7 @@
#include "platform/tests/test-common.h"
#include "nm-test-utils-core.h"
diff --git a/user/newt/APKBUILD b/user/newt/APKBUILD
index 361caa50b..f8aab64a2 100644
--- a/user/newt/APKBUILD
+++ b/user/newt/APKBUILD
@@ -10,7 +10,7 @@ arch="all"
options="!check" # No test suite.
license="LGPL-2.0-only"
depends=""
-makedepends="popt-dev slang-dev"
+makedepends="autoconf automake popt-dev slang-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pagure.io/newt/archive/r$_pkgver/newt-r$_pkgver.tar.gz"
builddir="$srcdir/newt-r$_pkgver"
diff --git a/user/nextcloud-client/APKBUILD b/user/nextcloud-client/APKBUILD
index 84f90982f..19b8959ae 100644
--- a/user/nextcloud-client/APKBUILD
+++ b/user/nextcloud-client/APKBUILD
@@ -25,7 +25,7 @@ build() {
-DNO_SHIBBOLETH=1 \
-DWITH_CRASHREPORTER=bool:OFF \
-DUNIT_TESTING=bool:ON \
- -DNO_SHIBBOLETH=bool:ON
+ -DNO_SHIBBOLETH=bool:ON .
make
}
diff --git a/user/nextcloud/APKBUILD b/user/nextcloud/APKBUILD
index b044b12af..6e948b1ff 100644
--- a/user/nextcloud/APKBUILD
+++ b/user/nextcloud/APKBUILD
@@ -104,10 +104,6 @@ done
# Directory for apps shipped with Nextcloud.
_appsdir="usr/share/webapps/$pkgname/apps"
-build() {
- cd "$builddir"
-}
-
package() {
local basedir="var/lib/$pkgname"
local datadir="$basedir/data"
diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD
index 8b1039750..c762afc58 100644
--- a/user/nfs-utils/APKBUILD
+++ b/user/nfs-utils/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=nfs-utils
-pkgver=2.4.1
-pkgrel=1
+pkgver=2.4.2
+pkgrel=0
pkgdesc="NFS file sharing client and server"
url="http://nfs.sourceforge.net/"
arch="all"
@@ -16,6 +16,8 @@ source="https://downloads.sourceforge.net/nfs/nfs-utils-$pkgver.tar.xz
nfs-utils-1.1.4-mtab-sym.patch
nfsdcld.patch
posixish.patch
+ ssize_t.patch
+ time64.patch
undef-def.patch
exports
@@ -59,11 +61,13 @@ package() {
done
}
-sha512sums="9aec8465be4bba300c5cd2e0d22f9f6db489a989bfbf01b10f62a7e628347dda06aa3079d18abc6ff5b0d5df54fdd9f27297e3e80b5f7fe525ab78df8fd88d8e nfs-utils-2.4.1.tar.xz
-1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 nfs-utils-1.1.4-mtab-sym.patch
-0275cacdaf399e9a9f132a79a6eab09aea176204181f2a1c1c7f062faeef5c4d979912aaf751bdfdfd3fc3d4dc166dca89ac1fabf2655d222379dd4e7ccab419 nfsdcld.patch
-db5927d533ff8c1bfd5f4948bc1ea6a375a779f3ab10f7520367556cf195245fbeaf28ff9974daeec319b47f1f0344c7f93a354e8ab28de5c4203f0d2b273a6b posixish.patch
-3436064c2aa8e8a645fdae11e87a1bc932cfe60883f1516a218fe3dc65d2abe962c9322dd1c59c2c117dd942e6b72d7311f51280d0d71fc69ed4ed543ac6d841 undef-def.patch
+sha512sums="60cd74294d0a68f481a962a0ece6ac6385b933d1f2b0e733ef098d6ce4d4177da81128884f9b1ae8299b5067dec717dfe9fee573d01629c1fffa226a3ba20c84 nfs-utils-2.4.2.tar.xz
+afa0b913a21880f91580a2953cbd9057310367d406d2fff9d9985ec24f20288191600d81bf58daf6e3de376866b02662e573e59478e859f455d94f225d884465 nfs-utils-1.1.4-mtab-sym.patch
+2f4c519cce81b2a29ffe2b7554cb5e524fde32db1338442f9ecbdf5d468552d1ad406918b3710340239bba741f5316742ee209fd5b76c5ccd10e466d7beaefa1 nfsdcld.patch
+10501b1956e81b3a3db0829fcfb6f25d734d33be1cbc9169ff45594d8db355a337f61f41ec59e51484e5c5bcb77b2f969527edd477528621f8866ae412ddf03f posixish.patch
+7cb1de79c2a420ff5121e19e5fdcbc97d367451ec59bc2fc39c2d60dde8d7136b227fc88e16996ede8365ed512004269d4b47ee19c62c8f8e0266430b0b85f06 ssize_t.patch
+128fb10ca703a4e0d3dbd5f94d233e10cf917df7a565b8d3112f195d24697b96d71663459f7e7c2a4290ebe327762bfdc65e22a507a68a645dca1c3f13b08319 time64.patch
+1fbe6f017ddde9a2edc5b8a8a2958c8c4f8ccc8764e15b8817da3cc315a5529519782c34df6154d76e146c83ee9f911fa8590aefd6902c0de1f6e6d9855b9b04 undef-def.patch
fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 exports
bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 nfs.confd
f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018 nfs.initd
diff --git a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
index c9e60afc7..0a7d70bc4 100644
--- a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
+++ b/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
@@ -23,7 +23,7 @@ ripped from Debian
void reset_mtab_info(void);
--- nfs-utils-1.1.4/utils/mount/mount.c
+++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
+@@ -204,6 +204,13 @@ create_mtab (void) {
int flags;
mntFILE *mfp;
diff --git a/user/nfs-utils/nfsdcld.patch b/user/nfs-utils/nfsdcld.patch
index e80956bb8..f5532e1d6 100644
--- a/user/nfs-utils/nfsdcld.patch
+++ b/user/nfs-utils/nfsdcld.patch
@@ -1,16 +1,6 @@
---- nfs-utils-2.4.1/utils/nfsdcld/legacy.c.old 2019-06-10 14:34:37.000000000 +0000
-+++ nfs-utils-2.4.1/utils/nfsdcld/legacy.c 2019-06-20 00:29:10.493973462 +0000
-@@ -24,6 +24,7 @@
- #include <errno.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <limits.h>
- #include "cld.h"
- #include "sqlite.h"
- #include "xlog.h"
--- nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c.old 2019-06-10 14:34:37.000000000 +0000
+++ nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c 2019-06-20 00:28:42.926915402 +0000
-@@ -645,7 +645,7 @@
+@@ -737,7 +737,7 @@
int
main(int argc, char **argv)
{
diff --git a/user/nfs-utils/posixish.patch b/user/nfs-utils/posixish.patch
index 9bc817ad0..d973bf9c7 100644
--- a/user/nfs-utils/posixish.patch
+++ b/user/nfs-utils/posixish.patch
@@ -1,6 +1,6 @@
--- nfs-utils-2.3.3/configure.old 2018-09-06 18:10:07.000000000 +0000
+++ nfs-utils-2.3.3/configure 2019-01-10 16:01:32.110000000 +0000
-@@ -20302,9 +20302,9 @@
+@@ -20594,9 +20594,9 @@
fi
fi
@@ -13,7 +13,7 @@
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -20318,27 +20318,27 @@
+@@ -20610,27 +20610,27 @@
#ifdef __cplusplus
extern "C"
#endif
diff --git a/user/nfs-utils/ssize_t.patch b/user/nfs-utils/ssize_t.patch
new file mode 100644
index 000000000..16313890a
--- /dev/null
+++ b/user/nfs-utils/ssize_t.patch
@@ -0,0 +1,84 @@
+--- nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c.old 2020-01-24 03:35:27.856939255 +0000
++++ nfs-utils-2.4.2/utils/nfsdcld/nfsdcld.c 2020-01-24 04:34:24.349432698 +0000
+@@ -378,7 +378,7 @@
+ bsize = cld_message_size(cmsg);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize)
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+
+ /* reopen pipe, just to be sure */
+@@ -409,7 +409,7 @@
+ xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+@@ -459,7 +459,7 @@
+ xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+@@ -498,7 +498,7 @@
+ cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+@@ -548,7 +548,7 @@
+ cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+@@ -607,7 +607,7 @@
+ xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+@@ -667,7 +667,7 @@
+ xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status);
+ wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize);
+ if (wsize != bsize) {
+- xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m",
++ xlog(L_ERROR, "%s: problem writing to cld pipe (%zd): %m",
+ __func__, wsize);
+ ret = cld_pipe_open(clnt);
+ if (ret) {
+--- nfs-utils-2.4.2/tools/locktest/testlk.c.old 2019-11-13 17:09:41.000000000 +0000
++++ nfs-utils-2.4.2/tools/locktest/testlk.c 2020-01-24 04:42:06.118844841 +0000
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
++#include <inttypes.h>
+ #ifdef linux
+ #include <getopt.h>
+ #endif
+@@ -81,7 +82,7 @@
+ if (fl.l_type == F_UNLCK) {
+ printf("%s: no conflicting lock\n", fname);
+ } else {
+- printf("%s: conflicting lock by %d on (%ld;%ld)\n",
++ printf("%s: conflicting lock by %d on (%"PRId64";%"PRId64")\n",
+ fname, fl.l_pid, fl.l_start, fl.l_len);
+ }
+ return 0;
diff --git a/user/nfs-utils/time64.patch b/user/nfs-utils/time64.patch
new file mode 100644
index 000000000..024402554
--- /dev/null
+++ b/user/nfs-utils/time64.patch
@@ -0,0 +1,123 @@
+--- nfs-utils-2.4.2/support/nfs/cacheio.c.old 2019-11-13 17:09:41.000000000 +0000
++++ nfs-utils-2.4.2/support/nfs/cacheio.c 2020-01-24 03:32:30.296395221 +0000
+@@ -26,6 +26,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <errno.h>
++#include <inttypes.h>
+
+ extern struct state_paths etab;
+
+@@ -234,7 +235,7 @@
+ stb.st_mtime > now)
+ stb.st_mtime = time(0);
+
+- sprintf(stime, "%ld\n", stb.st_mtime);
++ sprintf(stime, "%"PRId64"\n", stb.st_mtime);
+ for (c=0; cachelist[c]; c++) {
+ int fd;
+ sprintf(path, "/proc/net/rpc/%s/flush", cachelist[c]);
+--- nfs-utils-2.4.2/utils/idmapd/idmapd.c.old 2019-11-13 17:09:41.000000000 +0000
++++ nfs-utils-2.4.2/utils/idmapd/idmapd.c 2020-01-24 03:35:05.459393437 +0000
+@@ -65,6 +65,7 @@
+ #include <ctype.h>
+ #include <libgen.h>
+ #include <nfsidmap.h>
++#include <inttypes.h>
+
+ #include "xlog.h"
+ #include "conffile.h"
+@@ -172,7 +173,7 @@
+ int fd;
+ char stime[32];
+
+- sprintf(stime, "%ld\n", now);
++ sprintf(stime, "%"PRId64"\n", now);
+ fd = open(path, O_RDWR);
+ if (fd == -1)
+ return -1;
+@@ -625,7 +626,7 @@
+ /* Name */
+ addfield(&bp, &bsiz, im.im_name);
+ /* expiry */
+- snprintf(buf1, sizeof(buf1), "%lu",
++ snprintf(buf1, sizeof(buf1), "%"PRIu64,
+ time(NULL) + cache_entry_expiration);
+ addfield(&bp, &bsiz, buf1);
+ /* Note that we don't want to write the id if the mapping
+@@ -653,7 +654,7 @@
+ snprintf(buf1, sizeof(buf1), "%u", im.im_id);
+ addfield(&bp, &bsiz, buf1);
+ /* expiry */
+- snprintf(buf1, sizeof(buf1), "%lu",
++ snprintf(buf1, sizeof(buf1), "%"PRIu64,
+ time(NULL) + cache_entry_expiration);
+ addfield(&bp, &bsiz, buf1);
+ /* Note we're ignoring the status field in this case; we'll
+--- nfs-utils-2.4.2/utils/nfsdcld/sqlite.c.old 2019-11-13 17:09:41.000000000 +0000
++++ nfs-utils-2.4.2/utils/nfsdcld/sqlite.c 2020-01-24 04:35:02.235281405 +0000
+@@ -512,7 +512,7 @@
+ current_epoch = tcur;
+ recovery_epoch = trec;
+ ret = 0;
+- xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
++ xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64,
+ __func__, current_epoch, recovery_epoch);
+ out:
+ sqlite3_finalize(stmt);
+@@ -1223,7 +1223,7 @@
+
+ current_epoch = tcur;
+ recovery_epoch = trec;
+- xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
++ xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64,
+ __func__, current_epoch, recovery_epoch);
+
+ out:
+@@ -1282,7 +1282,7 @@
+ }
+
+ recovery_epoch = 0;
+- xlog(D_GENERAL, "%s: current_epoch=%lu recovery_epoch=%lu",
++ xlog(D_GENERAL, "%s: current_epoch=%"PRIu64" recovery_epoch=%"PRIu64,
+ __func__, current_epoch, recovery_epoch);
+
+ out:
+--- nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c.old 2019-11-13 17:09:41.000000000 +0000
++++ nfs-utils-2.4.2/utils/nfsdcltrack/nfsdcltrack.c 2020-01-24 04:40:06.871901242 +0000
+@@ -38,6 +38,7 @@
+ #include <sys/inotify.h>
+ #include <dirent.h>
+ #include <limits.h>
++#include <inttypes.h>
+ #ifdef HAVE_SYS_CAPABILITY_H
+ #include <sys/prctl.h>
+ #include <sys/capability.h>
+@@ -525,7 +526,7 @@
+ if (*tail)
+ return -EINVAL;
+
+- xlog(D_GENERAL, "%s: grace done. gracetime=%ld", __func__, gracetime);
++ xlog(D_GENERAL, "%s: grace done. gracetime=%"PRId64, __func__, gracetime);
+
+ ret = sqlite_remove_unreclaimed(gracetime);
+
+--- nfs-utils-2.4.2/utils/nfsdcltrack/sqlite.c.old 2019-11-13 17:09:41.000000000 +0000
++++ nfs-utils-2.4.2/utils/nfsdcltrack/sqlite.c 2020-01-24 04:40:31.519202517 +0000
+@@ -48,6 +48,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sqlite3.h>
++#include <inttypes.h>
+ #include <linux/limits.h>
+
+ #include "xlog.h"
+@@ -544,7 +545,7 @@
+ int ret;
+ char *err = NULL;
+
+- ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld",
++ ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %"PRId64,
+ grace_start);
+ if (ret < 0) {
+ return ret;
diff --git a/user/nfs-utils/undef-def.patch b/user/nfs-utils/undef-def.patch
index a8b03ac03..8c1899ab5 100644
--- a/user/nfs-utils/undef-def.patch
+++ b/user/nfs-utils/undef-def.patch
@@ -9,14 +9,3 @@
struct {
struct file_handle fh;
unsigned char handle[128];
---- nfs-utils-2.3.3/utils/mount/network.c.old 2018-09-06 18:09:08.000000000 +0000
-+++ nfs-utils-2.3.3/utils/mount/network.c 2019-01-10 16:28:46.840000000 +0000
-@@ -39,7 +39,7 @@
- #include <sys/socket.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
--#if defined(__GLIBC__) && (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)
-+#if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24))
- /* Cannot safely include linux/in6.h in old glibc, so hardcode the needed values */
- # define IPV6_PREFER_SRC_PUBLIC 2
- # define IPV6_ADDR_PREFERENCES 72
diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD
index 4f7aab226..41e356d37 100644
--- a/user/nftables/APKBUILD
+++ b/user/nftables/APKBUILD
@@ -4,19 +4,22 @@
# Contributor: Luis Ressel <aranea@aixah.de>
# Maintainer:
pkgname=nftables
-pkgver=0.9.2
+pkgver=0.9.3
pkgrel=0
pkgdesc="Netfilter tables userspace tools"
url="https://netfilter.org/projects/nftables"
-options="!check" # no test suite
arch="all"
+options="!check" # No test suite.
license="GPL-2.0+ AND GPL-2.0"
-makedepends="asciidoctor bison flex gmp-dev libmnl-dev libnftnl-dev"
+depends=""
+makedepends="asciidoctor bison flex gmp-dev libmnl-dev libnftnl-dev
+ autoconf automake libtool"
subpackages="$pkgname-doc $pkgname-openrc"
source="https://netfilter.org/projects/nftables/files/$pkgname-$pkgver.tar.bz2
asciidoctor.patch
nftables.confd
- nftables.initd"
+ nftables.initd
+ "
prepare() {
default_prepare
@@ -25,7 +28,7 @@ prepare() {
build() {
# TODO: Man pages are massively broken with asciidoctor
- A2X=asciidoctor ./configure \
+ A2X=asciidoctor bash ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -44,7 +47,7 @@ package() {
install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
}
-sha512sums="2d83b104af0d70f99a16c2e40afdb9bf89bd984323810e2895976c5e2e346bf09dd88850a391f295e335279adfdd39d34c13610cf8e6b801499dc0df2a5cecf6 nftables-0.9.2.tar.bz2
+sha512sums="d264f6fc75c95510e29fe7d5b82ae418d502f40437b098ba6117ffb1374d9989d70a7296e2e58c5fb25142145a987bb9c160902637899f892589809f9541db43 nftables-0.9.3.tar.bz2
f7b18945f0ab8be2a8725fa902cb2499de0a886076ae4cc337ebd845b3ae08f05a75b1680b428075d42558e7953014a227405e748741e6ebc3a7ac84bbf4beaa asciidoctor.patch
4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef nftables.confd
58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017 nftables.initd"
diff --git a/user/nghttp2/APKBUILD b/user/nghttp2/APKBUILD
index d44f8ccf7..41dd0bc58 100644
--- a/user/nghttp2/APKBUILD
+++ b/user/nghttp2/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="Experimental HTTP/2 client, server and proxy"
url="https://nghttp2.org/"
arch="all"
license="MIT"
+depends=""
makedepends="c-ares-dev libev-dev libxml2-dev openssl-dev zlib-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
source="https://github.com/tatsuhiro-t/$pkgname/releases/download/v$pkgver/nghttp2-$pkgver.tar.xz"
diff --git a/user/nmap/APKBUILD b/user/nmap/APKBUILD
index 3b256aaa3..304c94cae 100644
--- a/user/nmap/APKBUILD
+++ b/user/nmap/APKBUILD
@@ -7,7 +7,8 @@ url="https://nmap.org/"
arch="all"
license="GPL-2.0-only"
depends=""
-makedepends="linux-headers openssl-dev libpcap-dev pcre-dev zlib-dev libssh2-dev lua5.3-dev"
+makedepends="linux-headers openssl-dev libpcap-dev pcre-dev zlib-dev
+ libssh2-dev lua5.3-dev"
subpackages="
$pkgname-doc
$pkgname-scripts::noarch
@@ -33,7 +34,7 @@ build() {
export CFLAGS=-g3
export CPPFLAGS=-g3
export CXXFLAGS=-g3
- ./configure \
+ LDFLAGS="$LDFLAGS -L/usr/lib/lua5.3" ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -47,7 +48,7 @@ build() {
--with-libpcre=yes \
--with-libz=yes \
--with-libssh2=yes \
- --with-liblua=/usr/lua5.3
+ --with-liblua=yes
make
}
diff --git a/user/nml/APKBUILD b/user/nml/APKBUILD
index 6b7f9facb..e47718dd0 100644
--- a/user/nml/APKBUILD
+++ b/user/nml/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=nml
pkgver=0.4.5
-pkgrel=0
+pkgrel=1
pkgdesc="NewGRF Meta Language utilities for OpenTTD mods"
url="https://newgrf-specs.tt-wiki.net/wiki/NML:Main"
arch="all"
@@ -10,21 +10,21 @@ license="GPL-2.0+"
depends="python3 py3-pillow py3-ply"
makedepends="python3-dev"
subpackages=""
-source="http://bundles.openttdcoop.org/nml/releases/$pkgver/nml-$pkgver.tar.gz"
+source="http://bundles.openttdcoop.org/nml/releases/$pkgver/nml-$pkgver.tar.gz
+ pillow.patch
+ "
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
make -C regression
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952 nml-0.4.5.tar.gz"
+sha512sums="64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952 nml-0.4.5.tar.gz
+06ba794eca5a4af5b06b8c4a223bb2006567cfced1d3017d380ef4c0000e69124e1f67855a982eff7a68aeb24ee30b080e345fa8d3e251a3553ea4153ed84e98 pillow.patch"
diff --git a/user/nml/pillow.patch b/user/nml/pillow.patch
new file mode 100644
index 000000000..4fb1f1247
--- /dev/null
+++ b/user/nml/pillow.patch
@@ -0,0 +1,14 @@
+--- nml-0.4.5/nml/version_info.py.old 2018-06-30 09:10:30.000000000 +0000
++++ nml-0.4.5/nml/version_info.py 2020-01-11 00:14:30.683254313 +0000
+@@ -71,7 +71,10 @@
+ #PIL
+ try:
+ from PIL import Image
+- versions["PIL"] = Image.VERSION
++ if hasattr(Image, 'VERSION'):
++ versions["PIL"] = Image.VERSION
++ else:
++ versions["PIL"] = "1.1.7" # Pillow
+ except ImportError:
+ try:
+ import Image
diff --git a/user/node/APKBUILD b/user/node/APKBUILD
index ac9eaeb44..be64aaa46 100644
--- a/user/node/APKBUILD
+++ b/user/node/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=node
-pkgver=10.16.3
+pkgver=10.18.0
pkgrel=0
pkgdesc="JavaScript runtime"
url="https://nodejs.org/"
@@ -46,7 +46,6 @@ unpack() {
}
build() {
- cd "$builddir"
export PATH="$srcdir/python/bin:$PATH"
# We can't use --shared-openssl until 1.1 is available.
python ./configure.py \
@@ -63,18 +62,16 @@ build() {
}
check() {
- cd "$builddir"
export PATH="$srcdir/python/bin:$PATH"
make DESTDIR="$pkgdir" test-only
}
package() {
- cd "$builddir"
export PATH="$srcdir/python/bin:$PATH"
make DESTDIR="$pkgdir" install
}
-sha512sums="5d5457adaae87e41699cdf5bd62d32e9590248f7dadd583614cca9078a1749a4ee477433ebbe4278ec872fdfc377d99097c1e06073e0fd47c8c6597256ccdeb7 node-v10.16.3.tar.xz
+sha512sums="8fc9062e150af6f054f1ebebbdf67151b16f14bcca9cbb35338a4c7fcd7fa1c3f05c4a7ace12d4153180cec0007a195cbc94942c4d04c3895384dc18951d2c1c node-v10.18.0.tar.xz
27ea43eb45fc68f3d2469d5f07636e10801dee11635a430ec8ec922ed790bb426b072da94df885e4dfa1ea8b7a24f2f56dd92f9b0f51e162330f161216bd6de6 Python-2.7.15.tar.xz
8f64922d586bce9d82c83042a989739cc55ecc5e015778cdfbda21c257aa50527ddb18740985bcb2068e4a749b71eb8a135d9a8152b374d361589df7f33c9b60 libatomic.patch
6d37794c7c78ef92ebb845852af780e22dc8c14653b63a8609c21ab6860877b9dffc5cf856a8516b7978ec704f312c0627075c6440ace55d039f95bdc4c85add ppc32.patch
diff --git a/user/nsd/APKBUILD b/user/nsd/APKBUILD
index 230354c34..518fe3501 100644
--- a/user/nsd/APKBUILD
+++ b/user/nsd/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Luis Ressel <aranea@aixah.de>
# Maintainer: Alyx Wolcott <alyx@leuhta.com>
pkgname=nsd
-pkgver=4.2.2
-pkgrel=1
+pkgver=4.2.4
+pkgrel=0
pkgdesc="An authoritative only name server"
url="https://www.nlnetlabs.nl/projects/nsd/about/"
arch="all"
@@ -23,8 +23,6 @@ source="https://nlnetlabs.nl/downloads/$pkgname/$pkgname-$pkgver.tar.gz
# - CVE-2019-13207
build() {
- cd "$builddir"
-
# dnstap has yet unpackaged dependencies
./configure \
--build=$CBUILD \
@@ -44,7 +42,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -54,6 +51,6 @@ openrc() {
install -Dm644 "$srcdir/nsd.confd" "$subpkgdir/etc/conf.d/nsd"
}
-sha512sums="43e2ee980a11ed0ad521cc9d8be1e2d29fa8ab552bdda043ffa7e5bc71cf07ad49319629f71e93dcf1dabd315f93bcfb9fd8b5847f27b125cf151fb4f63779b2 nsd-4.2.2.tar.gz
+sha512sums="5d4f546a2a4484b182c65d3337d44596e935bca074c0eda2947b9d128a56db08a00240c6ec9ce22bc9a436e009c00c3283c4a5cbd1163ca4a429eaa92ec54208 nsd-4.2.4.tar.gz
f0ef1d3427e92650239d9d91402810c045fc9223e3f42ce86986422bf2039a0bcc02dffdfe1153d54de5c76c8f2bdc3e34fe341c65b41f2d333b02c00b5b0eae nsd.confd
139e52dec98792173f06d298574db0d0e6966a06af8a0a3069487beb01fd570c09d22322569b54bacdc43232dbfb99a8c497d4417d2bbfee88bcdd9d1b4d22f7 nsd.initd"
diff --git a/user/ntfs-3g/APKBUILD b/user/ntfs-3g/APKBUILD
index aaa5be24b..e5afed691 100644
--- a/user/ntfs-3g/APKBUILD
+++ b/user/ntfs-3g/APKBUILD
@@ -11,10 +11,12 @@ url="https://www.tuxera.com/community/open-source-ntfs-3g/"
arch="all"
options="!check" # No test suite.
license="LGPL-2.1-only AND BSD-2-Clause AND GPL-2.0+ AND GPL-3.0+"
+depends=""
makedepends="attr-dev util-linux-dev linux-headers fuse-dev"
subpackages="$pkgname-doc $pkgname-dev $pkgname-libs"
source="https://tuxera.com/opensource/$_pkgname-$pkgver.tgz
- CVE-2019-9755.patch"
+ CVE-2019-9755.patch
+ "
builddir="$srcdir/$_pkgname-$pkgver"
# secfixes:
@@ -22,7 +24,6 @@ builddir="$srcdir/$_pkgname-$pkgver"
# - CVE-2019-9755
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -36,7 +37,6 @@ build() {
}
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/lib
make -j1 DESTDIR="$pkgdir" LDCONFIG=: install
ln -s /bin/ntfs-3g "$pkgdir"/sbin/mount.ntfs
diff --git a/user/numactl/APKBUILD b/user/numactl/APKBUILD
index f0ff082be..98aa4a16d 100644
--- a/user/numactl/APKBUILD
+++ b/user/numactl/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Daniel Sabogal <dsabogalcc@gmail.com>
-# Maintainer: Dan Theisen <djt@hxx.in>
+# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=numactl
pkgver=2.0.13
pkgrel=0
@@ -8,10 +8,12 @@ url="https://github.com/numactl/numactl"
# ARM lacks the __NR_migrate_pages syscall
arch="all !armhf !armv7"
license="GPL-2.0+ AND LGPL-2.1"
+depends=""
makedepends="autoconf automake libtool linux-headers"
subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
source="$pkgname-$pkgver.tar.gz::https://github.com/numactl/$pkgname/archive/v$pkgver.tar.gz
- musl.patch"
+ musl.patch
+ "
prepare() {
default_prepare
diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD
index c1da38c31..08ad8f475 100644
--- a/user/obconf-qt/APKBUILD
+++ b/user/obconf-qt/APKBUILD
@@ -1,11 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=obconf-qt
pkgver=0.14.1
pkgrel=0
pkgdesc="Qt5-based Openbox configuration tool"
url="https://lxqt.org/"
arch="all"
+options="!check" # No test suite.
license="GPL-2.0+"
depends=""
makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 openbox-dev
@@ -13,11 +14,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 openbox-dev
source="https://github.com/lxqt/obconf-qt/releases/download/$pkgver/obconf-qt-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -25,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="7ae4feb8daa3853f768e9cb613fc99046f98744e03efc673ee9e5cb3d4ffa2861f2a9f762acd9c54ef2b9ca3f288d2901cdcce5c09db84689dd186006b8e26ed obconf-qt-0.14.1.tar.xz"
diff --git a/user/oclock/APKBUILD b/user/oclock/APKBUILD
index d75964c02..58369a584 100644
--- a/user/oclock/APKBUILD
+++ b/user/oclock/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/oclock-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/ode/APKBUILD b/user/ode/APKBUILD
index 24c1fcc74..9e1f520d1 100644
--- a/user/ode/APKBUILD
+++ b/user/ode/APKBUILD
@@ -13,11 +13,10 @@ makedepends="autoconf automake libtool"
subpackages="$pkgname-dev"
source="https://bitbucket.org/odedevs/ode/downloads/ode-$pkgver.tar.gz
fix-test-link.patch
+ stdint.patch
"
build() {
- cd "$builddir"
-
./bootstrap
CXXFLAGS="$CXXFLAGS -fpermissive" ./configure \
--build=$CBUILD \
@@ -35,14 +34,13 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
sha512sums="302e6f689851acb9ba0db23e13ab59ae0acbbd8dbdfa7e277b57d870c0d3435274e64da16134fb4b7053f951489c138e485165d79664d11764a88b3437d703d3 ode-0.16.tar.gz
-8630d5d059fd0f623db6af4000666868358002a42ba84817117b1fb5e01c776bb23cbf1c8c43181d7bf40a0d71b640f9d2f9785461d8a77877dcbdadd775792e fix-test-link.patch"
+8630d5d059fd0f623db6af4000666868358002a42ba84817117b1fb5e01c776bb23cbf1c8c43181d7bf40a0d71b640f9d2f9785461d8a77877dcbdadd775792e fix-test-link.patch
+0d618cec0afdab86279687275bf476594897d1dfd7b5619fe6bc05343f22f6292c9598a73ff6f2967d5f39e071abcf282fc673c0ffe33f7efd9bbe56ca674dae stdint.patch"
diff --git a/user/ode/stdint.patch b/user/ode/stdint.patch
new file mode 100644
index 000000000..f3674335e
--- /dev/null
+++ b/user/ode/stdint.patch
@@ -0,0 +1,44 @@
+--- ode-0.16/include/ode/odeconfig.h.old 2018-12-09 20:04:03.000000000 +0000
++++ ode-0.16/include/ode/odeconfig.h 2020-01-12 08:36:16.664428956 +0000
+@@ -32,6 +32,7 @@
+ #include <math.h>
+ #include <string.h>
+ #include <float.h>
++#include <stdint.h>
+
+
+ #include <ode/precision.h>
+@@ -128,20 +129,20 @@
+ typedef __int64 dint64;
+ typedef unsigned __int64 duint64;
+ #else
+- typedef long long dint64;
+- typedef unsigned long long duint64;
++ typedef int64_t dint64;
++ typedef uint64_t duint64;
+ #endif
+- typedef int dint32;
+- typedef unsigned int duint32;
+- typedef short dint16;
+- typedef unsigned short duint16;
+- typedef signed char dint8;
+- typedef unsigned char duint8;
+-
+- typedef dint32 dintptr;
+- typedef duint32 duintptr;
+- typedef dint32 ddiffint;
+- typedef duint32 dsizeint;
++ typedef int32_t dint32;
++ typedef uint32_t duint32;
++ typedef int16_t dint16;
++ typedef uint16_t duint16;
++ typedef int8_t dint8;
++ typedef uint8_t duint8;
++
++ typedef intptr_t dintptr;
++ typedef uintptr_t duintptr;
++ typedef ptrdiff_t ddiffint;
++ typedef size_t dsizeint;
+
+ #endif
+
diff --git a/user/okteta/APKBUILD b/user/okteta/APKBUILD
index 8eb2a7167..c96d22022 100644
--- a/user/okteta/APKBUILD
+++ b/user/okteta/APKBUILD
@@ -27,7 +27,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD
index 9ecf861e7..d26193140 100644
--- a/user/okular/APKBUILD
+++ b/user/okular/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=okular
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Universal document reader developed by KDE"
url="https://okular.kde.org/"
@@ -14,9 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kio-dev kjs-dev kparts-dev kwallet-dev kwindowsystem-dev khtml-dev
threadweaver-dev kactivities-dev poppler-qt5-dev tiff-dev qca-dev
libjpeg-turbo-dev kpty-dev kirigami2-dev djvulibre-dev libkexiv2-dev
- libspectre-dev ebook-tools-dev"
+ libspectre-dev ebook-tools-dev libzip-dev poppler-dev qt5-qtspeech-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz
+source="https://download.kde.org/stable/release-service/$pkgver/src/okular-$pkgver.tar.xz
es-doc-fix.patch
pt-doc-fix.patch
"
@@ -32,7 +32,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS -D_GNU_SOURCE" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -45,6 +45,6 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fbf6285e65f45b2d49596169216ded2da26a73abec1d2279bc510db5df0bb6dbf9794e864de06837c5b7bf1db19de1774c38c18eb78c4b0c2d3ac49cb35bb9f7 okular-19.08.2.tar.xz
-d82dd9de666a28ef605d8a81e74851f265be4ccaeaa39a1cdee9eb1db830fcd0d581d01d6e89a1d36b8ea5c9c8113f1016090dc0e9f17070d388166d9e967458 es-doc-fix.patch
-43daf92826a87b58fbafdaf282af4c2fddbf2a7d8c8c6491418ee962e4bccd6dcbbf8ff36b63f7b1ead181b957ba0f66e08e73c3e755397aafdbf99f3397da1e pt-doc-fix.patch"
+sha512sums="6da6f870cd7e3060ca108c630e082fe20e7ecb702ffe7da2892450ca8401d25cd135d1039e883303000ad46b1d98c9bd6707c5eae54e03a225fcdf3f706465ec okular-19.12.1.tar.xz
+de32eabda7ee84c4d894b02c56c7d66d8e2332688c726ad95e1b61c1e730035081ff7721275c7b7a9884aabc268ee0115d9ab8e5f52ae8838e1c09c471c81932 es-doc-fix.patch
+d87313d3ea4137d9b7149cd7598063a92fa148a8145a14be570da3ef3badcee7b3962eab4e0f5b1f1a345fa6c703cab6b00b7472a8614c5c1e4691555bc4b5d8 pt-doc-fix.patch"
diff --git a/user/okular/es-doc-fix.patch b/user/okular/es-doc-fix.patch
index 05967d736..b064c8910 100644
--- a/user/okular/es-doc-fix.patch
+++ b/user/okular/es-doc-fix.patch
@@ -1,6 +1,6 @@
--- okular-19.04.1/po/es/docs/okular/index.docbook.old 2019-05-07 00:14:57.000000000 +0000
+++ okular-19.04.1/po/es/docs/okular/index.docbook 2019-05-12 03:14:04.511177243 +0000
-@@ -1090,7 +1090,7 @@
+@@ -1228,7 +1228,7 @@
<para
>Para eliminar una anotación, pulse sobre ella con el &RMB; y seleccione <guimenuitem
>Borrar</guimenuitem
diff --git a/user/okular/pt-doc-fix.patch b/user/okular/pt-doc-fix.patch
index a761139f6..aa0638170 100644
--- a/user/okular/pt-doc-fix.patch
+++ b/user/okular/pt-doc-fix.patch
@@ -1,6 +1,6 @@
--- okular-19.08.0/po/pt_BR/docs/okular/index.docbook.old 2019-08-09 00:21:00.000000000 +0000
+++ okular-19.08.0/po/pt_BR/docs/okular/index.docbook 2019-08-15 14:29:06.782714494 +0000
-@@ -1194,7 +1194,7 @@
+@@ -1198,7 +1198,7 @@
<para
>Para remover uma anotação, basta clicar com o &RMB; e selecionar <guimenuitem
>Excluir</guimenuitem
diff --git a/user/oniguruma/APKBUILD b/user/oniguruma/APKBUILD
index 8c14250df..c4399f782 100644
--- a/user/oniguruma/APKBUILD
+++ b/user/oniguruma/APKBUILD
@@ -2,12 +2,14 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Samuel Holland <samuel@sholland.org>
pkgname=oniguruma
-pkgver=6.9.3
+pkgver=6.9.4
pkgrel=0
pkgdesc="A regular expression library"
url="https://github.com/kkos/oniguruma"
arch="all"
license="BSD-2-Clause"
+depends=""
+makedepends=""
subpackages="$pkgname-dev"
source="https://github.com/kkos/$pkgname/releases/download/v$pkgver/onig-$pkgver.tar.gz"
builddir="$srcdir/onig-$pkgver"
@@ -37,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6b038879cb9cbe8cc756159eb53125e1d4dc7365ca434d07b99a59f3602987e573da120506bbd88d0f51dcdde5866bfa48d45803f8869503726c4d9a47d62861 onig-6.9.3.tar.gz"
+sha512sums="ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b onig-6.9.4.tar.gz"
diff --git a/user/opal-utils/APKBUILD b/user/opal-utils/APKBUILD
index f65d278ca..7bdcc5597 100644
--- a/user/opal-utils/APKBUILD
+++ b/user/opal-utils/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=opal-utils
-pkgver=6.5
+pkgver=6.5.2
pkgrel=0
pkgdesc="Tools for IBM FSP and OpenPOWER systems"
url="https://lists.ozlabs.org/listinfo/skiboot"
@@ -39,6 +39,6 @@ package() {
done
}
-sha512sums="f756307403ec49f24e5dbc06dbe8fe52898da27f2a0fa761164b1d85efd33dae8a8f96de3859eb7b11f85f43a790c9c213f9ebf0c7f4a859b590dcfb35e38571 skiboot-6.5.tar.gz
+sha512sums="765e568ad60f5cd7df8868eb3faea841d37c75cb14f33ab30f9419550ea146aeec0d02d622752af1e09a36e744f93be3a56fe6cbc8ac91a94effba9754a24091 skiboot-6.5.2.tar.gz
e7480f16b6eb41fd65b40ea1f20031118030f24681b7b8afcfdebb8cde7625e45902683cfb5fe0af3259060fb1b92b9c2f5d62354de356e7706a7f08ad9f772e musl.patch
692206f60727041c070c7f75eb66325607d00261e8dd7f47111fd59c7495c744ac356b0c94c6139c76bacbe403f1e9e6819f8bce2d13ac10d1cacc6e351cc25e opal-prd.patch"
diff --git a/user/openal-soft/APKBUILD b/user/openal-soft/APKBUILD
index d5d32afe3..3f5f9c29d 100644
--- a/user/openal-soft/APKBUILD
+++ b/user/openal-soft/APKBUILD
@@ -6,6 +6,7 @@ pkgrel=0
pkgdesc="Software implementation of OpenAL API"
url="https://kcat.strangesoft.net/openal.html"
arch="all"
+options="!check" # No test suite.
license="LGPL-2.0+"
depends=""
depends_dev="alsa-lib-dev"
@@ -13,14 +14,8 @@ makedepends="$depends_dev cmake linux-headers pulseaudio-dev"
subpackages="$pkgname-dev"
source="https://kcat.strangesoft.net/openal-releases/${pkgname}-${pkgver}.tar.bz2"
-prepare() {
- default_prepare
- mkdir -p "$builddir"/build
-}
-
build() {
local _cpuext_neon=""
- cd "$builddir"/build
case "$CARCH" in
armhf) _cpuext_neon="-DALSOFT_CPUEXT_NEON=OFF" ;;
esac
@@ -28,18 +23,12 @@ build() {
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_INSTALL_LIBDIR="lib" \
$_cpuext_neon \
- "$builddir"
- make
-}
-
-check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4 openal-soft-1.19.1.tar.bz2"
diff --git a/user/openbox/APKBUILD b/user/openbox/APKBUILD
index a062a6d26..7f763fdb1 100644
--- a/user/openbox/APKBUILD
+++ b/user/openbox/APKBUILD
@@ -17,13 +17,11 @@ source="http://openbox.org/dist/openbox/openbox-$pkgver.tar.gz
http://icculus.org/openbox/tools/setlayout.c"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,12 +33,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
install "$builddir"/setlayout "$pkgdir"/usr/bin/setlayout
}
diff --git a/user/opencv/APKBUILD b/user/opencv/APKBUILD
index a8a38c149..b8739c3be 100644
--- a/user/opencv/APKBUILD
+++ b/user/opencv/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer:
pkgname=opencv
-pkgver=4.1.1
-pkgrel=1
+pkgver=4.2.0
+pkgrel=0
pkgdesc="Computer vision and machine learning software library"
url="https://opencv.org"
arch="all"
@@ -15,7 +15,6 @@ makedepends="cmake doxygen ffmpeg-dev gst-plugins-base-dev gtk+2.0-dev
subpackages="$pkgname-dev $pkgname-libs"
source="opencv-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.tar.gz
cmake-license.patch
- CVE-2019-16249.patch
"
# secfixes:
@@ -38,19 +37,20 @@ prepare() {
}
build() {
+ _sse=""
if [ "$CARCH" != "x86_64" ]; then
- local _sse="-DENABLE_SSE=OFF -DENABLE_SSE2=OFF"
+ _sse="-DENABLE_SSE=OFF -DENABLE_SSE2=OFF"
fi
if [ "$CARCH" = "ppc" ]; then
- LDFLAGS="-latomic"
+ export LDFLAGS="$LDFLAGS -latomic"
fi
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
- -DCMAKE_CXX_FLAGS="$CXXFLAGS -U_FORTIFY_SOURCE" \
- -DCMAKE_C_FLAGS="$CFLAGS -U_FORTIFY_SOURCE" \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
-DENABLE_PRECOMPILED_HEADERS=OFF \
-DWITH_OPENMP=ON \
-DWITH_OPENCL=ON \
@@ -65,6 +65,5 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="80fa48d992ca06a2a4ab6740df6d8c21f4926165486b393969da2c5bbe2f3a0b799fb76dee5e3654e90c743e49bbd2b5b02ad59a4766896bbf4cd5b4e3251e0f opencv-4.1.1.tar.gz
-ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch
-39f2f9abb1051220d6b842e9337c3636ee229781c7efcc92e987dae47ac82072dc95568e6a766e01329ee61c0a3be4efdd82aa3b56c011b44e175444d81c134d CVE-2019-16249.patch"
+sha512sums="2629d548384c81a786ab2620e089539b4b2f4ae5e1d837e5fe7f75ddadb909b65b65d0319226ae4726675f105ceb5adb88616ca6399c7660d3021ca4b9a06531 opencv-4.2.0.tar.gz
+ffa6930086051c545a44d28b8e428de7faaeecf961cdee6eef007b2b01db7e5897c6f184b1059df9763c1bcd90f88b9ead710dc13b51a608f21d683f55f39bd6 cmake-license.patch"
diff --git a/user/opencv/CVE-2019-16249.patch b/user/opencv/CVE-2019-16249.patch
deleted file mode 100644
index a7f0027ac..000000000
--- a/user/opencv/CVE-2019-16249.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From cd7fa04985b10db5e66de542725d0da57f0d10b6 Mon Sep 17 00:00:00 2001
-From: Vitaly Tuzov <terfendail@mediana.jetos.com>
-Date: Tue, 17 Sep 2019 15:53:18 +0300
-Subject: [PATCH] Fixed out of bound reading in DIS optical flow evaluation
- implementation
-
----
- modules/video/src/dis_flow.cpp | 18 +++++-------------
- 1 file changed, 5 insertions(+), 13 deletions(-)
-
-diff --git a/modules/video/src/dis_flow.cpp b/modules/video/src/dis_flow.cpp
-index 85400c71ca7..a260b8726bb 100644
---- a/modules/video/src/dis_flow.cpp
-+++ b/modules/video/src/dis_flow.cpp
-@@ -494,7 +494,6 @@ DISOpticalFlowImpl::PatchInverseSearch_ParBody::PatchInverseSearch_ParBody(DISOp
- v_float32x4 w10v = v_setall_f32(w10); \
- v_float32x4 w11v = v_setall_f32(w11); \
- \
-- v_uint8x16 I0_row_16, I1_row_16, I1_row_shifted_16, I1_row_next_16, I1_row_next_shifted_16; \
- v_uint16x8 I0_row_8, I1_row_8, I1_row_shifted_8, I1_row_next_8, I1_row_next_shifted_8, tmp; \
- v_uint32x4 I0_row_4_left, I1_row_4_left, I1_row_shifted_4_left, I1_row_next_4_left, I1_row_next_shifted_4_left; \
- v_uint32x4 I0_row_4_right, I1_row_4_right, I1_row_shifted_4_right, I1_row_next_4_right, \
-@@ -502,29 +501,22 @@ DISOpticalFlowImpl::PatchInverseSearch_ParBody::PatchInverseSearch_ParBody(DISOp
- v_float32x4 I_diff_left, I_diff_right; \
- \
- /* Preload and expand the first row of I1: */ \
-- I1_row_16 = v_load(I1_ptr); \
-- I1_row_shifted_16 = v_extract<1>(I1_row_16, I1_row_16); \
-- v_expand(I1_row_16, I1_row_8, tmp); \
-- v_expand(I1_row_shifted_16, I1_row_shifted_8, tmp); \
-+ I1_row_8 = v_load_expand(I1_ptr); \
-+ I1_row_shifted_8 = v_load_expand(I1_ptr + 1); \
- v_expand(I1_row_8, I1_row_4_left, I1_row_4_right); \
- v_expand(I1_row_shifted_8, I1_row_shifted_4_left, I1_row_shifted_4_right); \
- I1_ptr += I1_stride;
-
- #define HAL_PROCESS_BILINEAR_8x8_PATCH_EXTRACTION \
- /* Load the next row of I1: */ \
-- I1_row_next_16 = v_load(I1_ptr); \
-- /* Circular shift left by 1 element: */ \
-- I1_row_next_shifted_16 = v_extract<1>(I1_row_next_16, I1_row_next_16); \
-- /* Expand to 8 ushorts (we only need the first 8 values): */ \
-- v_expand(I1_row_next_16, I1_row_next_8, tmp); \
-- v_expand(I1_row_next_shifted_16, I1_row_next_shifted_8, tmp); \
-+ I1_row_next_8 = v_load_expand(I1_ptr); \
-+ I1_row_next_shifted_8 = v_load_expand(I1_ptr + 1); \
- /* Separate the left and right halves: */ \
- v_expand(I1_row_next_8, I1_row_next_4_left, I1_row_next_4_right); \
- v_expand(I1_row_next_shifted_8, I1_row_next_shifted_4_left, I1_row_next_shifted_4_right); \
- \
- /* Load current row of I0: */ \
-- I0_row_16 = v_load(I0_ptr); \
-- v_expand(I0_row_16, I0_row_8, tmp); \
-+ I0_row_8 = v_load_expand(I0_ptr); \
- v_expand(I0_row_8, I0_row_4_left, I0_row_4_right); \
- \
- /* Compute diffs between I0 and bilinearly interpolated I1: */ \
diff --git a/user/opengfx/APKBUILD b/user/opengfx/APKBUILD
index e3f0dbaaf..6393b9717 100644
--- a/user/opengfx/APKBUILD
+++ b/user/opengfx/APKBUILD
@@ -17,13 +17,10 @@ source="https://binaries.openttd.org/extra/opengfx/$pkgver/$pkgname-$pkgver-sour
builddir="$srcdir/$pkgname-$pkgver-source"
build() {
- cd "$builddir"
make GIMP="" _V="" bundle_tar
}
package() {
- cd "$builddir"
- local _file
for _file in *.grf opengfx.obg; do
install -D -m644 -g games $_file \
"$pkgdir"/usr/share/games/openttd/data/$_file
diff --git a/user/openjdk8/APKBUILD b/user/openjdk8/APKBUILD
index 4861c4f9b..4ad8f07a0 100644
--- a/user/openjdk8/APKBUILD
+++ b/user/openjdk8/APKBUILD
@@ -8,9 +8,9 @@ pkgrel=0
pkgdesc="Libre Java development kit for Java 8"
url="https://icedtea.classpath.org/"
arch="all"
+options="sover-namecheck"
license="GPL-2.0-only"
depends="$pkgname-jre java-cacerts"
-options="sover-namecheck"
makedepends="bash findutils libarchive-tools zip file util-linux libxslt
autoconf automake linux-headers sed xz coreutils
openjdk7 ca-certificates libjpeg-turbo-dev cmd:which
@@ -102,17 +102,15 @@ unpack() {
}
prepare() {
- cd "$builddir"
-
- local ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)"
- local ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)"
+ ver_u="$(sed -En 's/^\s*JDK_UPDATE_VERSION\s*=\s*(\S+).*/\1/p' acinclude.m4)"
+ ver_b="$(sed -En 's/^\s*BUILD_VERSION\s*=\s*b(\S+).*/\1/p' acinclude.m4)"
[ "${pkgver#*.}" = "$ver_u.$ver_b" ] \
|| die "Version mismatch, source is 8.$ver_u.$ver_b, but abuild defines $pkgver!"
# Busybox sha256 does not support longopts.
sed -e "s/--check/-c/g" -i Makefile.am
- local patch; for patch in $source; do
+ for patch in $source; do
case $patch in
icedtea-*.patch)
cp ../$patch patches
@@ -136,7 +134,7 @@ build() {
fi
DISTRIBUTION_PATCHES=""
- local patch; for patch in $source; do
+ for patch in $source; do
case $patch in
icedtea-*.patch)
DISTRIBUTION_PATCHES="$DISTRIBUTION_PATCHES patches/$patch"
@@ -146,7 +144,6 @@ build() {
export DISTRIBUTION_PATCHES
echo "icedtea patches: $DISTRIBUTION_PATCHES"
- cd "$builddir"
bash ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -183,8 +180,6 @@ check() {
}
package() {
- cd "$builddir"
-
mkdir -p "$pkgdir"/$_java_home
cp -a openjdk.build/images/j2sdk-image/* "$pkgdir"/$_java_home/
@@ -195,9 +190,6 @@ package() {
# running `java -Xshare:dump`.
rm -f "$pkgdir"/$_jrelib/server/classes.jsa
- # pax mark again (due to fakeroot xattr handling bug)
- ./pax-mark-vm "$pkgdir"/$_java_home true
-
# symlink to shared java cacerts store
rm -f "$pkgdir"/$_java_home/jre/lib/security/cacerts
ln -sf /etc/ssl/certs/java/cacerts \
@@ -208,7 +200,6 @@ jrelib() {
pkgdesc="OpenJDK 8 Java Runtime (class libraries)"
depends=""
- local file dir
for file in jre/lib/images \
jre/lib/*.jar \
jre/lib/security \
@@ -226,7 +217,6 @@ jrelib() {
jre() {
pkgdesc="OpenJDK 8 Java Runtime"
- local file dir
mkdir -p "$subpkgdir"
for file in jre/bin/policytool \
@@ -242,9 +232,6 @@ jre() {
mkdir -p "$subpkgdir"/$_java_home/$dir
mv "$pkgdir"/$_java_home/$file "$subpkgdir"/$_java_home/$dir
done
-
- # Pax mark again (due to fakeroot xattr handling bug).
- "$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true
}
jrebase() {
@@ -257,16 +244,13 @@ jrebase() {
mv "$pkgdir"/$_java_home/lib/$_jarch/jli \
"$subpkgdir"/$_java_home/lib/$_jarch/
- local file; for file in java orbd rmid servertool unpack200 keytool \
+ for file in java orbd rmid servertool unpack200 keytool \
pack200 rmiregistry tnameserv; do
mv "$pkgdir"/$_java_home/bin/$file "$subpkgdir"/$_java_home/bin/
done
# Rest of the jre subdir (which were not taken by -jre subpkg).
mv "$pkgdir"/$_java_home/jre "$subpkgdir"/$_java_home/
-
- # Pax mark again (due to fakeroot xattr handling bug).
- "$builddir"/pax-mark-vm "$subpkgdir"/$_java_home true
}
doc() {
diff --git a/user/openmsx/APKBUILD b/user/openmsx/APKBUILD
index e3afba25d..04782e944 100644
--- a/user/openmsx/APKBUILD
+++ b/user/openmsx/APKBUILD
@@ -18,13 +18,11 @@ source="https://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-$pkgver-source.
builddir="$srcdir/$pkgname-$pkgver-source"
build() {
- cd "$builddir"
make _V="" bundle
}
package() {
cd "$builddir"/$pkgname-$pkgver
- local _file
for _file in *.mid openmsx.obm; do
install -D -m644 -g games $_file \
"$pkgdir"/usr/share/games/openttd/gm/$_file
diff --git a/user/opensfx/APKBUILD b/user/opensfx/APKBUILD
index 00093833d..130747b3b 100644
--- a/user/opensfx/APKBUILD
+++ b/user/opensfx/APKBUILD
@@ -14,20 +14,17 @@ source="https://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-$pkgver-source.
builddir="$srcdir/$pkgname-$pkgver-source"
build() {
- cd "$builddir"
make
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
- install -D -m644 -g games opensfx.cat \
+ install -D -m644 -g games "$builddir"/opensfx.cat \
"$pkgdir"/usr/share/games/openttd/data/opensfx.cat
- install -D -m644 -g games opensfx.obs \
+ install -D -m644 -g games "$builddir"/opensfx.obs \
"$pkgdir"/usr/share/games/openttd/data/opensfx.obs
}
diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD
index 23fd01d01..76b5b5c68 100644
--- a/user/openvpn/APKBUILD
+++ b/user/openvpn/APKBUILD
@@ -2,15 +2,15 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Lee Starnes <lee@canned-death.us>
pkgname=openvpn
-pkgver=2.4.7
+pkgver=2.4.8
pkgrel=0
pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
url="https://openvpn.net/"
arch="all"
license="GPL-2.0-only WITH openvpn-openssl-exception"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-auth-pam:pam $pkgname-openrc"
depends="iproute2"
makedepends="openssl-dev lzo-dev linux-pam-dev linux-headers"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-auth-pam:pam $pkgname-openrc"
install="$pkgname.pre-install"
source="https://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz
openvpn.initd
@@ -59,7 +59,7 @@ pam() {
"$subpkgdir"/usr/lib/openvpn/plugins/
}
-sha512sums="c96359ceffe7e47dd0881d4b37dfef45a9ef4450fcfcd9b95de70c73fb0b5756463f3e0dd3e4087643e00b0aeb72b99c5ce9c6f38edbbb491d0fd5a426f65972 openvpn-2.4.7.tar.gz
+sha512sums="fd559b6fe2323624fce5511f142a005cf62b15cb6c98d29e1aac3785cede6aad53ae9ded46ae1757da79b17820263906d7f7fbc00ea159301c122dd8baabdfad openvpn-2.4.8.tar.gz
3594937d4cc9d7b87ac6a3af433f651ed9695f41586994f9d9789554fbe3f87f054b997b89486eda4ae0b852d816aac9007222168d585910aa9f255073324bd9 openvpn.initd
6b2353aca9df7f43044e4e37990491b4ba077e259ebe13b8f2eb43e35ca7a617c1a65c5bfb8ab05e87cf12c4444184ae064f01f9abbb3c023dbbc07ff3f9c84e openvpn.confd
cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760 openvpn.up
diff --git a/user/oprofile/APKBUILD b/user/oprofile/APKBUILD
index 90641b0e3..07a844c14 100644
--- a/user/oprofile/APKBUILD
+++ b/user/oprofile/APKBUILD
@@ -16,7 +16,6 @@ source="https://prdownloads.sourceforge.net/oprofile/oprofile-$pkgver.tar.gz
"
build() {
- cd "$builddir"
CXXFLAGS="$CXXFLAGS" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/optipng/APKBUILD b/user/optipng/APKBUILD
index fcdef5b01..7ad5fbe5f 100644
--- a/user/optipng/APKBUILD
+++ b/user/optipng/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/optipng/optipng-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
-prefix=/usr \
-mandir=/usr/share/man \
@@ -22,12 +21,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/opusfile/APKBUILD b/user/opusfile/APKBUILD
index fa68d8249..c0208b12d 100644
--- a/user/opusfile/APKBUILD
+++ b/user/opusfile/APKBUILD
@@ -12,8 +12,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://downloads.xiph.org/releases/opus/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/orage/APKBUILD b/user/orage/APKBUILD
index c64f3c18b..9681a20ae 100644
--- a/user/orage/APKBUILD
+++ b/user/orage/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=orage
pkgver=4.12.1
pkgrel=2
@@ -7,6 +7,7 @@ pkgdesc="Calendaring software for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+ AND BSD-3-Clause AND (LGPL-2.1-only OR MPL-1.0) AND (GPL-2.0+ OR Artistic-2.0) AND MPL-1.0 AND BSD-2-Clause AND LGPL-2.0+"
+depends=""
makedepends="intltool gtk+2.0-dev dbus-glib-dev libnotify-dev popt-dev
xfce4-panel-dev"
subpackages="$pkgname-doc $pkgname-lang"
diff --git a/user/otf-culmus/APKBUILD b/user/otf-culmus/APKBUILD
index b67bd4347..ffbf36df1 100644
--- a/user/otf-culmus/APKBUILD
+++ b/user/otf-culmus/APKBUILD
@@ -1,14 +1,15 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-culmus
pkgver=0.133
pkgrel=0
pkgdesc="Culmus collections of Hebrew font families"
url="http://culmus.sourceforge.net/"
arch="noarch"
-options="!check" # No tests
+options="!check" # No test suite.
license="MIT AND GPL-2.0-only WITH font-exception"
depends="fontconfig"
+makedepends=""
source="https://downloads.sourceforge.net/culmus/culmus-$pkgver.tar.gz"
builddir="$srcdir"/${pkgname#*-}-$pkgver
diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD
index 939ae229a..c7ee2436a 100644
--- a/user/otf-exo/APKBUILD
+++ b/user/otf-exo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-exo
pkgver=2
pkgrel=0
@@ -11,12 +11,10 @@ license="OFL-1.1"
depends="fontconfig"
makedepends=""
source="http://ndiscovered.com/archives/exo-$pkgver.zip"
-builddir="$srcdir"
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
- for i in *.otf; do
+ for i in "$srcdir"/*.otf; do
install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
done
}
diff --git a/user/otf-office-code-pro/APKBUILD b/user/otf-office-code-pro/APKBUILD
index 0f34cac2a..0f1ad30b2 100644
--- a/user/otf-office-code-pro/APKBUILD
+++ b/user/otf-office-code-pro/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-office-code-pro
pkgver=1.004
pkgrel=0
pkgdesc="Monospaced font family for programming and console users"
url="https://github.com/nathco/Office-Code-Pro"
arch="noarch"
-options="!check" # No tests
+options="!check" # No test suite.
license="OFL-1.1"
depends="fontconfig"
makedepends=""
diff --git a/user/otf-proggy-vector/APKBUILD b/user/otf-proggy-vector/APKBUILD
index 3af3cc125..985c7f18e 100644
--- a/user/otf-proggy-vector/APKBUILD
+++ b/user/otf-proggy-vector/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-proggy-vector
pkgver=1.1.5
pkgrel=0
pkgdesc="Monospaced font family for programming"
url="https://github.com/bluescan/proggyfonts"
arch="noarch"
-options="!check" # No tests
+options="!check" # No test suite.
license="MIT AND Custom"
depends="fontconfig"
makedepends=""
diff --git a/user/otf-source-code-pro/APKBUILD b/user/otf-source-code-pro/APKBUILD
index 78e144b82..5e96c1717 100644
--- a/user/otf-source-code-pro/APKBUILD
+++ b/user/otf-source-code-pro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-source-code-pro
pkgver=2.030
_pkgver=1.050
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Monospaced font family for user interfaces and programming"
url="https://adobe-fonts.github.io/source-code-pro/"
arch="noarch"
-options="!check" # No tests
+options="!check" # No test suite.
license="OFL-1.1"
depends="fontconfig"
makedepends=""
diff --git a/user/otf-source-sans-pro/APKBUILD b/user/otf-source-sans-pro/APKBUILD
index 04581e14c..1457b6ede 100644
--- a/user/otf-source-sans-pro/APKBUILD
+++ b/user/otf-source-sans-pro/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-source-sans-pro
pkgver=3.006
pkgrel=0
pkgdesc="Sans serif font family for user interfaces"
url="https://adobe-fonts.github.io/source-sans-pro"
arch="noarch"
-options="!check" # No tests
+options="!check" # No test suite.
license="OFL-1.1"
depends="fontconfig"
makedepends=""
diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD
index d4c567d1c..e90f45cbd 100644
--- a/user/otf-source-serif-pro/APKBUILD
+++ b/user/otf-source-serif-pro/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-source-serif-pro
pkgver=3.001
pkgrel=0
pkgdesc="Serif font family for typesetting"
url="https://adobe-fonts.github.io/source-serif-pro/"
arch="noarch"
-options="!check" # No tests
+options="!check" # No test suite.
license="OFL-1.1"
depends="fontconfig"
makedepends=""
diff --git a/user/oxygen-fonts/APKBUILD b/user/oxygen-fonts/APKBUILD
index 152a0aae4..bf4202efb 100644
--- a/user/oxygen-fonts/APKBUILD
+++ b/user/oxygen-fonts/APKBUILD
@@ -10,10 +10,9 @@ license="OFL-1.1"
depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev fontforge-dev"
subpackages=""
-source="http://download.kde.org/stable/plasma/$pkgver/oxygen-fonts-$pkgver.tar.xz"
+source="https://download.kde.org/stable/plasma/$pkgver/oxygen-fonts-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -24,17 +23,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/oxygen-icons5/APKBUILD b/user/oxygen-icons5/APKBUILD
index 8aa283f4d..3cc937510 100644
--- a/user/oxygen-icons5/APKBUILD
+++ b/user/oxygen-icons5/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=oxygen-icons5
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="The KDE Oxygen icon set"
url="https://www.kde.org/"
@@ -36,4 +36,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="856e7ff7508988a424d1a381ff97e80d17891f67f68604fd7b1b88c79062712d96bbc60795561b2b3505a65ea7f6bcf9abba23b9216178ba0fd2b17e7ecb3119 oxygen-icons5-5.65.0.tar.xz"
+sha512sums="7d55bc6ae80ec1a703a6f6ac0d81b2999a96c4e2adc7272a7861f5dbd3d5b006249dc929dda82ff262dc00a4656136cffb38646b644dc5578e3382968b22e899 oxygen-icons5-5.66.0.tar.xz"
diff --git a/user/oxygen/APKBUILD b/user/oxygen/APKBUILD
index e94059d0b..4b5ce7f2b 100644
--- a/user/oxygen/APKBUILD
+++ b/user/oxygen/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=oxygen
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="'Oxygen' theme for KDE"
url="https://www.kde.org/"
@@ -12,8 +12,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev
frameworkintegration-dev kcmutils-dev kcompletion-dev kconfig-dev
kdecoration-dev kguiaddons-dev ki18n-dev kservice-dev
kwidgetsaddons-dev kwindowsystem-dev"
-subpackages="$pkgname-dev $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/oxygen-$pkgver.tar.xz"
+subpackages="$pkgname-lang"
+source="https://download.kde.org/unstable/plasma/$pkgver/oxygen-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -26,7 +26,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="d6d60c295eab7e1d8eb453c3150ad50fa387dc6ad8f2950ed53df320ccd2499397b35561dafcf7c3f4faef84039a9c1f54ad19b69a42c100d453ad87420982b3 oxygen-5.12.8.tar.xz"
+sha512sums="0003051d9e84b41b6f40d6c802d4e16d62591afde2797cddcab404a993806e847e8ff0177c15a9c0a3a7af260f49f980775e90413ce641db80f5210a992c85f3 oxygen-5.17.90.tar.xz"
diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD
index 49597e2f5..48ec9f55f 100644
--- a/user/palapeli/APKBUILD
+++ b/user/palapeli/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=palapeli
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Jigsaw puzzle game by KDE"
url="https://www.kde.org/applications/games/palapeli/"
@@ -14,10 +14,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev
knotifications-dev kservice-dev kwidgetsaddons-dev kxmlgui-dev
libkdegames-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/palapeli-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/palapeli-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="717107fb7ee402c74257377d6e3a026463fd7ef87fcde5ecc55a334bbc583345c1d44a91d3fa5d10ff9f1f2d7ff5d74768e51614cdbbd942165a0215cc9c2646 palapeli-19.08.2.tar.xz"
+sha512sums="9c5c035c6e8c86f78289b4196cacdb84717bc282e01d5bf44a96e5c5c307a9f0fa1478c97ecd28aeed96db770681c1ba3f234bd17bdce676d76ae58928385d74 palapeli-19.12.1.tar.xz"
diff --git a/user/pangomm/APKBUILD b/user/pangomm/APKBUILD
index 5b2ddd058..20787b69f 100644
--- a/user/pangomm/APKBUILD
+++ b/user/pangomm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pangomm
pkgver=2.42.0
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/pangomm/${pkgver%.*}/pangomm-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/papirus-icons/APKBUILD b/user/papirus-icons/APKBUILD
index 2bbaaa664..849057fe8 100644
--- a/user/papirus-icons/APKBUILD
+++ b/user/papirus-icons/APKBUILD
@@ -6,8 +6,8 @@ pkgrel=0
pkgdesc="Material, flat style icon theme"
url="https://store.kde.org/p/1166289/"
arch="noarch"
-license="LGPL-3.0"
options="!check" # Icon set.
+license="LGPL-3.0"
depends=""
makedepends=""
subpackages="$pkgname-light $pkgname-dark e$pkgname:epapirus"
diff --git a/user/parole/APKBUILD b/user/parole/APKBUILD
index 2ffd296e3..cf55cd657 100644
--- a/user/parole/APKBUILD
+++ b/user/parole/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=parole
pkgver=1.0.5
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="GStreamer-based media player for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+ AND LGPL-2.1+"
+depends=""
makedepends="intltool gtk+3.0-dev dbus-glib-dev libxfce4ui-dev gstreamer-dev
gst-plugins-base-dev libnotify-dev libice-dev"
subpackages="$pkgname-dev $pkgname-lang"
diff --git a/user/partitionmanager/APKBUILD b/user/partitionmanager/APKBUILD
index 5e67e25af..830611586 100644
--- a/user/partitionmanager/APKBUILD
+++ b/user/partitionmanager/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=partitionmanager
-pkgver=3.3.1
+pkgver=4.0.0
pkgrel=0
pkgdesc="Qt-based partition manager"
url="https://www.kde.org/applications/system/partitionmanager"
@@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://download.kde.org/stable/partitionmanager/$pkgver/src/partitionmanager-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -27,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="9189004c27a118510ddf7f148d2a245a7e17d0d0c038ea7486fc50638f2897f947ef2a2a92f0196c277b14e8dafb2f1e2f20978cce5927c04299232ecf8260b0 partitionmanager-3.3.1.tar.xz"
+sha512sums="dbdae666b29996a7ef463159cd96469cf5081ca9027d1d59556e21556e2488485c0d4bee1e9005a446a47b13e3c1e4b71014f58c7bfa830adfd7c39364f4581a partitionmanager-4.0.0.tar.xz"
diff --git a/user/password-store/APKBUILD b/user/password-store/APKBUILD
index f8830a2ef..972bdb26a 100644
--- a/user/password-store/APKBUILD
+++ b/user/password-store/APKBUILD
@@ -10,8 +10,7 @@ arch="noarch"
options="!check" # this is a shell script and has no tests
license="GPL-2.0+"
depends="bash gnupg libqrencode tree xclip"
-depends_dev=""
-makedepends="$depends_dev"
+makedepends=""
subpackages="$pkgname-doc
$pkgname-contrib
$pkgname-bash-completion:bashcomp
@@ -20,7 +19,6 @@ subpackages="$pkgname-doc
source="https://git.zx2c4.com/password-store/snapshot/$pkgname-$pkgver.tar.xz"
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" \
WITH_ALLCOMP=yes install
}
diff --git a/user/patchutils/APKBUILD b/user/patchutils/APKBUILD
index ac1322e2e..eabb82788 100644
--- a/user/patchutils/APKBUILD
+++ b/user/patchutils/APKBUILD
@@ -11,10 +11,8 @@ depends="diffutils"
makedepends="xmlto"
subpackages="$pkgname-doc"
source="http://cyberelk.net/tim/data/patchutils/stable/patchutils-$pkgver.tar.xz"
-builddir="$srcdir/patchutils-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make -j1 check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD
index 3cbcd2c30..e8254c58e 100644
--- a/user/pavucontrol-qt/APKBUILD
+++ b/user/pavucontrol-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pavucontrol-qt
pkgver=0.14.1
pkgrel=0
@@ -14,11 +14,9 @@ makedepends="cmake pulseaudio-dev qt5-qtbase-dev liblxqt-dev qt5-qttools-dev
source="https://github.com/lxqt/pavucontrol-qt/releases/download/$pkgver/pavucontrol-qt-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,13 +24,12 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="55a8bceb31e07ceac7ab1fbb5f20101dfb087e58578039a238677e77f858e0564dca46efee2d5513a247c0be474f24d31e3afa9cf3cea0734feb0e56c33d5494 pavucontrol-qt-0.14.1.tar.xz"
diff --git a/user/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD
index dd02568a7..5c98d4f57 100644
--- a/user/pavucontrol/APKBUILD
+++ b/user/pavucontrol/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pavucontrol
pkgver=4.0
pkgrel=0
@@ -10,10 +10,9 @@ license="GPL-2.0+"
depends=""
makedepends="gtkmm+3.0-dev intltool libcanberra-dev lynx pulseaudio-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-$pkgver.tar.xz"
+source="https://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD
index 75b042e40..a48274c4f 100644
--- a/user/pcmanfm-qt/APKBUILD
+++ b/user/pcmanfm-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pcmanfm-qt
pkgver=0.14.1
pkgrel=0
@@ -16,11 +16,9 @@ subpackages="$pkgname-doc"
source="https://github.com/lxqt/pcmanfm-qt/releases/download/$pkgver/pcmanfm-qt-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -28,18 +26,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="f3d170ab8344332f740a3245cc549ea0c3bddc97a45472dcd46208d59413dd42d3571821f309184417a34a627d2cb093fcaa335f782cf6e526eef3fcad212b3e pcmanfm-qt-0.14.1.tar.xz"
diff --git a/user/pcmanfm/APKBUILD b/user/pcmanfm/APKBUILD
index 8ecf6ba0a..806d8b65d 100644
--- a/user/pcmanfm/APKBUILD
+++ b/user/pcmanfm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pcmanfm
pkgver=1.3.1
pkgrel=0
@@ -7,12 +7,12 @@ pkgdesc="GTK-based file manager"
url="https://sourceforge.net/projects/pcmanfm/"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool gtk+2.0-dev libfm-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://downloads.sourceforge.net/pcmanfm/pcmanfm-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/pcmciautils/APKBUILD b/user/pcmciautils/APKBUILD
index f94d49086..1189b7d04 100644
--- a/user/pcmciautils/APKBUILD
+++ b/user/pcmciautils/APKBUILD
@@ -16,12 +16,10 @@ source="https://mirrors.kernel.org/pub/linux/utils/kernel/pcmcia/$pkgname-$pkgve
"
build() {
- cd "$builddir"
make -j1 LEX=flex
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir"/ install
ln -sf pccardctl "$pkgdir"/sbin/lspcmcia
}
diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD
index ff8a667a9..d4e0355a6 100644
--- a/user/pcsc-lite/APKBUILD
+++ b/user/pcsc-lite/APKBUILD
@@ -17,7 +17,6 @@ source="https://pcsclite.apdu.fr/files/pcsc-lite-$pkgver.tar.bz2
pcscd.initd"
build() {
- cd "$builddir"
./configure --prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
@@ -36,12 +35,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -D -m755 "$srcdir"/pcscd.initd \
"$pkgdir"/etc/init.d/pcscd
diff --git a/user/perl-algorithm-diff/APKBUILD b/user/perl-algorithm-diff/APKBUILD
index 9c95c3cef..a2a4c455b 100644
--- a/user/perl-algorithm-diff/APKBUILD
+++ b/user/perl-algorithm-diff/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
makedepends="perl-dev"
-install=""
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-any-moose/APKBUILD b/user/perl-any-moose/APKBUILD
index 75b200d44..1963a75a7 100644
--- a/user/perl-any-moose/APKBUILD
+++ b/user/perl-any-moose/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl perl-mouse"
makedepends="perl-dev"
-install=""
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-apache-logformat-compiler/APKBUILD b/user/perl-apache-logformat-compiler/APKBUILD
index ed8af30aa..7929095c0 100644
--- a/user/perl-apache-logformat-compiler/APKBUILD
+++ b/user/perl-apache-logformat-compiler/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Compile a log format string to Perl code"
url="https://metacpan.org/release/Apache-LogFormat-Compiler"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-posix-strftime-compiler perl-try-tiny"
+depends="perl perl-posix-strftime-compiler perl-try-tiny"
checkdepends="perl-http-message perl-test-mocktime"
makedepends="perl-dev perl-module-build-tiny"
subpackages="$pkgname-doc"
diff --git a/user/perl-app-licensecheck/APKBUILD b/user/perl-app-licensecheck/APKBUILD
index fb01bc146..a25097f1e 100644
--- a/user/perl-app-licensecheck/APKBUILD
+++ b/user/perl-app-licensecheck/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-app-licensecheck
_pkgreal=App-Licensecheck
@@ -17,7 +17,7 @@ depends="perl perl-getopt-long-descriptive perl-moo perl-namespace-clean
perl-sort-key perl-strictures perl-string-copyright perl-string-escape
perl-test-requires perl-test-script perl-try-tiny
perl-universal-require"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-v$pkgver"
diff --git a/user/perl-b-hooks-endofscope/APKBUILD b/user/perl-b-hooks-endofscope/APKBUILD
index 63493ead5..1934140e9 100644
--- a/user/perl-b-hooks-endofscope/APKBUILD
+++ b/user/perl-b-hooks-endofscope/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/B-Hooks-EndOfScope"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl-module-implementation perl-sub-exporter-progressive perl-sub-name
- perl-variable-magic"
+ perl-variable-magic perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-b-hooks-op-check/APKBUILD b/user/perl-b-hooks-op-check/APKBUILD
index 9bababe6c..b5dae3817 100644
--- a/user/perl-b-hooks-op-check/APKBUILD
+++ b/user/perl-b-hooks-op-check/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-b-hooks-op-check
_pkgreal=B-Hooks-OP-Check
diff --git a/user/perl-bareword-filehandles/APKBUILD b/user/perl-bareword-filehandles/APKBUILD
index cf17b46b1..7b67d3047 100644
--- a/user/perl-bareword-filehandles/APKBUILD
+++ b/user/perl-bareword-filehandles/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-bareword-filehandles
_pkgreal=bareword-filehandles
@@ -11,7 +11,7 @@ pkgdesc="Perl module for disabling support for bareword filehandles"
url="https://metacpan.org/pod/bareword::filehandles"
arch="all"
license="Artistic-1.0-Perl"
-depends="perl-b-hooks-op-check"
+depends="perl perl-b-hooks-op-check"
makedepends="perl-dev perl-extutils-depends"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-cgi/APKBUILD b/user/perl-cgi/APKBUILD
index 61838b4a8..b67b2f6ea 100644
--- a/user/perl-cgi/APKBUILD
+++ b/user/perl-cgi/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/CGI"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl-html-parser"
-makedepends="perl-dev"
checkdepends="perl-test-deep perl-test-nowarnings perl-test-warn"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-chart/APKBUILD b/user/perl-chart/APKBUILD
index 9f0d2bca5..7914d8849 100644
--- a/user/perl-chart/APKBUILD
+++ b/user/perl-chart/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Series of charting modules for Perl"
url="https://metacpan.org/release/Chart"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-gd"
+depends="perl perl-gd"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-class-accessor/APKBUILD b/user/perl-class-accessor/APKBUILD
index e898f3938..b3b076eb6 100644
--- a/user/perl-class-accessor/APKBUILD
+++ b/user/perl-class-accessor/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Perl class accessor generator"
url="https://metacpan.org/release/Class-Accessor"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-sub-name"
+depends="perl perl-sub-name"
makedepends="perl-dev perl-module-install"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-class-load-xs/APKBUILD b/user/perl-class-load-xs/APKBUILD
index 3f1678655..641a41853 100644
--- a/user/perl-class-load-xs/APKBUILD
+++ b/user/perl-class-load-xs/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Class-Load-XS"
arch="all"
license="Artistic-2.0"
depends="perl-class-load"
-makedepends="perl-dev"
checkdepends="perl-test-fatal perl-test-needs"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-class-load/APKBUILD b/user/perl-class-load/APKBUILD
index e40e1e671..7b59b4b71 100644
--- a/user/perl-class-load/APKBUILD
+++ b/user/perl-class-load/APKBUILD
@@ -13,8 +13,8 @@ arch="noarch"
license="Artistic-1.0-Perl"
depends="perl-data-optlist perl-module-implementation perl-module-runtime
perl-package-stash perl-try-tiny"
-makedepends="perl-dev"
checkdepends="perl-test-fatal perl-test-needs"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-class-method-modifiers/APKBUILD b/user/perl-class-method-modifiers/APKBUILD
index 5fe47284a..2eb8f618e 100644
--- a/user/perl-class-method-modifiers/APKBUILD
+++ b/user/perl-class-method-modifiers/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Class::Method::Modifiers"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends="perl-dev"
checkdepends="perl-test-fatal perl-test-needs perl-test-requires"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-class-singleton/APKBUILD b/user/perl-class-singleton/APKBUILD
index 3cae4b475..c59f0fc4c 100644
--- a/user/perl-class-singleton/APKBUILD
+++ b/user/perl-class-singleton/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Perl implementation of a Singleton class pattern"
url="https://metacpan.org/release/Class-Singleton"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends=""
+depends="perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-code-tidyall/APKBUILD b/user/perl-code-tidyall/APKBUILD
index 54a677e4f..c62037f75 100644
--- a/user/perl-code-tidyall/APKBUILD
+++ b/user/perl-code-tidyall/APKBUILD
@@ -5,7 +5,7 @@ _pkgreal=Code-TidyAll
_author=DROLSKY
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
-pkgver=0.74
+pkgver=0.75
pkgrel=0
pkgdesc="Your all-in-one Perl code tidier and validator"
url="https://metacpan.org/release/Code-TidyAll"
@@ -17,9 +17,9 @@ depends="perl-capture-tiny perl-config-ini perl-file-pushd perl-file-which
perl-path-tiny perl-scope-guard perl-specio
perl-specio-library-path-tiny perl-text-diff perl-timedate
perl-time-duration-parse perl-try-tiny"
-makedepends="perl-dev"
checkdepends="perl-lib-relative perl-test-class-most perl-test-differences
perl-test-fatal perl-test-warnings"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -38,4 +38,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="0b306814cfc87b27a3dc34ccb855b65f7cc072ace6f9862596a94c5a9cb89978d38645c74382bd8c41ba21c8134d830f552daa5cb1453593940458bba019f3b1 Code-TidyAll-0.74.tar.gz"
+sha512sums="d58846fc13d64a7a7334979d42d65056760d57963ecc6a73d07052310e4850ce378db2c8f5793f653dcdb618f0450e5b33c6a6bc38eb4c8bd75b1580b16658c1 Code-TidyAll-0.75.tar.gz"
diff --git a/user/perl-common-sense/APKBUILD b/user/perl-common-sense/APKBUILD
index 9e586481d..43a250151 100644
--- a/user/perl-common-sense/APKBUILD
+++ b/user/perl-common-sense/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
makedepends="perl-dev"
-install=""
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-cookie-baker/APKBUILD b/user/perl-cookie-baker/APKBUILD
index 43093f0bc..30085dd68 100644
--- a/user/perl-cookie-baker/APKBUILD
+++ b/user/perl-cookie-baker/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Cookie string generator and parser for Perl"
url="https://metacpan.org/release/Cookie-Baker"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-uri"
+depends="perl perl-uri"
checkdepends="perl-test-time"
makedepends="perl-dev perl-module-build-tiny"
subpackages="$pkgname-doc"
diff --git a/user/perl-cpan-changes/APKBUILD b/user/perl-cpan-changes/APKBUILD
index 2f959c106..0a1f4ddd4 100644
--- a/user/perl-cpan-changes/APKBUILD
+++ b/user/perl-cpan-changes/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-cpan-changes
_pkgreal=CPAN-Changes
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/CPAN-Changes"
arch="noarch"
license="GPL-2.0+ OR Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-cpan-meta-check/APKBUILD b/user/perl-cpan-meta-check/APKBUILD
index 4c03d00bb..e264a92a0 100644
--- a/user/perl-cpan-meta-check/APKBUILD
+++ b/user/perl-cpan-meta-check/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/CPAN-Meta-Check"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends="perl-dev"
checkdepends="perl-test-deep"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-crypt-rijndael/APKBUILD b/user/perl-crypt-rijndael/APKBUILD
index 6f5678cc2..8f7c3cf1c 100644
--- a/user/perl-crypt-rijndael/APKBUILD
+++ b/user/perl-crypt-rijndael/APKBUILD
@@ -10,7 +10,7 @@ pkgdesc="Crypt::CBC compliant Rijndael encryption module"
url="https://metacpan.org/release/Crypt-Rijndael"
arch="all"
license="LGPL-3.0+"
-depends="perl-test-manifest"
+depends="perl perl-test-manifest"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://search.cpan.org/CPAN/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz
diff --git a/user/perl-cwd-guard/APKBUILD b/user/perl-cwd-guard/APKBUILD
index fea81f7a8..c04973dd8 100644
--- a/user/perl-cwd-guard/APKBUILD
+++ b/user/perl-cwd-guard/APKBUILD
@@ -12,9 +12,8 @@ url="https://metacpan.org/pod/Cwd::Guard"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends="perl-dev perl-module-build"
checkdepends="perl-test-requires"
-install=""
+makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-data-dump/APKBUILD b/user/perl-data-dump/APKBUILD
index 72f987266..1ee807e32 100644
--- a/user/perl-data-dump/APKBUILD
+++ b/user/perl-data-dump/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-data-dump
_pkgreal=Data-Dump
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Data::Dump"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0+"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-data-optlist/APKBUILD b/user/perl-data-optlist/APKBUILD
index a870222dc..050ac92d8 100644
--- a/user/perl-data-optlist/APKBUILD
+++ b/user/perl-data-optlist/APKBUILD
@@ -1,4 +1,3 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-data-optlist
_pkgreal=Data-OptList
diff --git a/user/perl-data-section/APKBUILD b/user/perl-data-section/APKBUILD
index 2160b02bc..48e7a8759 100644
--- a/user/perl-data-section/APKBUILD
+++ b/user/perl-data-section/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-data-section
_pkgreal=Data-Section
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Data::Section"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl perl-mro-compat perl-sub-exporter perl-test-failwarnings"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-datetime-locale/APKBUILD b/user/perl-datetime-locale/APKBUILD
index 557e75f8a..06bef0c08 100644
--- a/user/perl-datetime-locale/APKBUILD
+++ b/user/perl-datetime-locale/APKBUILD
@@ -13,7 +13,7 @@ arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl-dist-checkconflicts perl-file-sharedir perl-file-sharedir-install
perl-ipc-system-simple perl-namespace-autoclean
- perl-params-validationcompiler"
+ perl-params-validationcompiler perl"
checkdepends="perl-specio perl-test-fatal perl-test-file-sharedir
perl-test-requires perl-test-warnings"
makedepends="perl-dev perl-cpan-meta-check perl-dist-checkconflicts"
diff --git a/user/perl-datetime-timezone/APKBUILD b/user/perl-datetime-timezone/APKBUILD
index e1248780c..6e14ed90e 100644
--- a/user/perl-datetime-timezone/APKBUILD
+++ b/user/perl-datetime-timezone/APKBUILD
@@ -12,9 +12,9 @@ url="https://metacpan.org/release/DateTime-TimeZone"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl-class-singleton perl-module-runtime perl-namespace-autoclean
- perl-params-validationcompiler perl-specio perl-try-tiny"
+ perl-params-validationcompiler perl-specio perl-try-tiny perl"
checkdepends="perl-test-fatal perl-test-requires"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-datetime/APKBUILD b/user/perl-datetime/APKBUILD
index 7ca5bb0ee..c1157189e 100644
--- a/user/perl-datetime/APKBUILD
+++ b/user/perl-datetime/APKBUILD
@@ -13,7 +13,7 @@ arch="all"
license="Artistic-2.0"
depends="perl-datetime-locale perl-datetime-timezone perl-dist-checkconflicts
perl-namespace-autoclean perl-params-validationcompiler perl-specio
- perl-try-tiny"
+ perl-try-tiny perl"
checkdepends="perl-test-fatal perl-test-warnings"
makedepends="perl-dev perl-cpan-meta-check"
subpackages="$pkgname-doc"
diff --git a/user/perl-dbd-pg/APKBUILD b/user/perl-dbd-pg/APKBUILD
index d4e6d7207..40a12303e 100644
--- a/user/perl-dbd-pg/APKBUILD
+++ b/user/perl-dbd-pg/APKBUILD
@@ -12,9 +12,9 @@ url="https://metacpan.org/release/DBD-Pg"
arch="all"
options="!check" # https://github.com/bucardo/dbdpg/issues/56
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-dbi"
-makedepends="perl-dev postgresql-dev"
+depends="perl perl-dbi"
checkdepends="cmd:locale postgresql"
+makedepends="perl-dev postgresql-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz
fix-tests.patch
diff --git a/user/perl-devel-checkcompiler/APKBUILD b/user/perl-devel-checkcompiler/APKBUILD
index 11dd443f6..f621b64b9 100644
--- a/user/perl-devel-checkcompiler/APKBUILD
+++ b/user/perl-devel-checkcompiler/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
makedepends="perl-dev perl-module-build-tiny"
-install=""
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-devel-globaldestruction/APKBUILD b/user/perl-devel-globaldestruction/APKBUILD
index c426cfcb5..944d7c083 100644
--- a/user/perl-devel-globaldestruction/APKBUILD
+++ b/user/perl-devel-globaldestruction/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl perl-sub-exporter-progressive"
makedepends="perl-dev"
-install=""
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-devel-hide/APKBUILD b/user/perl-devel-hide/APKBUILD
index 7be49e5e2..be26079fd 100644
--- a/user/perl-devel-hide/APKBUILD
+++ b/user/perl-devel-hide/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-devel-hide
_pkgreal=Devel-Hide
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Devel::Hide"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-devel-nytprof/APKBUILD b/user/perl-devel-nytprof/APKBUILD
index 71fd0ad60..5488f7527 100644
--- a/user/perl-devel-nytprof/APKBUILD
+++ b/user/perl-devel-nytprof/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Devel-NYTProf"
arch="all"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl perl-file-which perl-json-maybexs"
-makedepends="perl-dev"
checkdepends="perl-test-differences"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-devel-overloadinfo/APKBUILD b/user/perl-devel-overloadinfo/APKBUILD
index 2d2a9bd82..7c397a253 100644
--- a/user/perl-devel-overloadinfo/APKBUILD
+++ b/user/perl-devel-overloadinfo/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Introspect overloaded Perl operators"
url="https://metacpan.org/release/Devel-OverloadInfo"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-mro-compat perl-package-stash perl-sub-identify"
-makedepends="perl-dev"
+depends="perl perl-mro-compat perl-package-stash perl-sub-identify"
checkdepends="perl-test-fatal"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-devel-stacktrace-ashtml/APKBUILD b/user/perl-devel-stacktrace-ashtml/APKBUILD
index f9f1e45c3..9204d236b 100644
--- a/user/perl-devel-stacktrace-ashtml/APKBUILD
+++ b/user/perl-devel-stacktrace-ashtml/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Display Perl stack traces in HTML"
url="https://metacpan.org/release/Devel-StackTrace-AsHTML"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-devel-stacktrace"
+depends="perl perl-devel-stacktrace"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-devel-symdump/APKBUILD b/user/perl-devel-symdump/APKBUILD
index 05b24d680..f290739d6 100644
--- a/user/perl-devel-symdump/APKBUILD
+++ b/user/perl-devel-symdump/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
makedepends="perl-dev"
-install=""
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-dist-checkconflicts/APKBUILD b/user/perl-dist-checkconflicts/APKBUILD
index 75b3916d5..369e56e99 100644
--- a/user/perl-dist-checkconflicts/APKBUILD
+++ b/user/perl-dist-checkconflicts/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Declare version conflicts for Perl distributions"
url="https://metacpan.org/release/Dist-CheckConflicts"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-module-runtime"
-makedepends="perl-dev"
+depends="perl perl-module-runtime"
checkdepends="perl-test-fatal"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-email-abstract/APKBUILD b/user/perl-email-abstract/APKBUILD
index 2bc865650..1c50d6402 100644
--- a/user/perl-email-abstract/APKBUILD
+++ b/user/perl-email-abstract/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Unified interface to email representations in Perl"
url="https://metacpan.org/release/Email-Abstract"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-email-simple perl-mro-compat perl-module-pluggable"
+depends="perl perl-email-simple perl-mro-compat perl-module-pluggable"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-email-mime-encodings/APKBUILD b/user/perl-email-mime-encodings/APKBUILD
index da7b6b3a2..239633dff 100644
--- a/user/perl-email-mime-encodings/APKBUILD
+++ b/user/perl-email-mime-encodings/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Unified interface to MIME codecs for Perl"
url="https://metacpan.org/release/Email-MIME-Encodings"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-capture-tiny"
+depends="perl perl-capture-tiny"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-email-mime/APKBUILD b/user/perl-email-mime/APKBUILD
index ab6eabe56..f4549e334 100644
--- a/user/perl-email-mime/APKBUILD
+++ b/user/perl-email-mime/APKBUILD
@@ -13,7 +13,7 @@ arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl-email-address-xs perl-email-messageid perl-email-mime-contenttype
perl-email-mime-encodings perl-email-simple perl-mime-types
- perl-module-runtime"
+ perl-module-runtime perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-email-reply/APKBUILD b/user/perl-email-reply/APKBUILD
index cd8cb1dfe..b5e83eac3 100644
--- a/user/perl-email-reply/APKBUILD
+++ b/user/perl-email-reply/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Reply to email from Perl"
url="https://metacpan.org/release/Email-Reply"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-email-abstract perl-email-address perl-email-mime"
+depends="perl perl-email-abstract perl-email-address perl-email-mime"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-email-sender/APKBUILD b/user/perl-email-sender/APKBUILD
index 2248087cb..1194e9b5d 100644
--- a/user/perl-email-sender/APKBUILD
+++ b/user/perl-email-sender/APKBUILD
@@ -5,7 +5,7 @@ _pkgreal=Email-Sender
_author=RJBS
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
-pkgver=1.300031
+pkgver=1.300034
pkgrel=0
pkgdesc="Library for sending email"
url="https://metacpan.org/release/Email-Sender"
@@ -14,7 +14,7 @@ license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl-capture-tiny perl-email-abstract perl-email-address
perl-email-simple perl-module-runtime perl-moo
perl-moox-types-mooselike perl-sub-exporter perl-throwable
- perl-try-tiny"
+ perl-try-tiny perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
@@ -34,4 +34,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="72aa65d21df9b0a1fa52ba99c9c1c4a660142819ed9658eb2c2b74f1ab70257911af1f071524ecbb3917a7be1464b7a157792b5e03921788ce9f23a86e7874f1 Email-Sender-1.300031.tar.gz"
+sha512sums="cd19fc1df95b1c651b8612512f3baf860d00a74121e03e3408dffb15dba19ab77fc7522a4f6c832b8a0e59a0c57752689a36e1e2a48eb2988a5ee96e7f997021 Email-Sender-1.300034.tar.gz"
diff --git a/user/perl-email-simple/APKBUILD b/user/perl-email-simple/APKBUILD
index bdc30f311..50f8835f4 100644
--- a/user/perl-email-simple/APKBUILD
+++ b/user/perl-email-simple/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Simple parsing of RFC 2822 email messages and headers for Perl"
url="https://metacpan.org/release/Email-Simple"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-email-date-format"
+depends="perl perl-email-date-format"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-eval-closure/APKBUILD b/user/perl-eval-closure/APKBUILD
index 42c766666..51ed39484 100644
--- a/user/perl-eval-closure/APKBUILD
+++ b/user/perl-eval-closure/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Eval-Closure"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends="perl-dev"
checkdepends="perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-exception-class/APKBUILD b/user/perl-exception-class/APKBUILD
index b57e8d329..b5cac436a 100644
--- a/user/perl-exception-class/APKBUILD
+++ b/user/perl-exception-class/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Perl module for declaring 'real' exception classes"
url="https://metacpan.org/release/Exception-Class"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-class-data-inheritable perl-devel-stacktrace"
+depends="perl perl-class-data-inheritable perl-devel-stacktrace"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-extutils-depends/APKBUILD b/user/perl-extutils-depends/APKBUILD
index 557b64b73..e88fa2f7e 100644
--- a/user/perl-extutils-depends/APKBUILD
+++ b/user/perl-extutils-depends/APKBUILD
@@ -13,7 +13,6 @@ arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
makedepends="perl-dev"
-install=""
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-file-basedir/APKBUILD b/user/perl-file-basedir/APKBUILD
index d143a204c..2080e32cd 100644
--- a/user/perl-file-basedir/APKBUILD
+++ b/user/perl-file-basedir/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Base directory specification support for Perl"
url="https://metacpan.org/release/File-BaseDir"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-ipc-system-simple xdg-user-dirs"
+depends="perl perl-ipc-system-simple xdg-user-dirs"
checkdepends="perl-file-which"
makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
diff --git a/user/perl-file-copy-recursive-reduced/APKBUILD b/user/perl-file-copy-recursive-reduced/APKBUILD
index e54ec4d2f..54eec9674 100644
--- a/user/perl-file-copy-recursive-reduced/APKBUILD
+++ b/user/perl-file-copy-recursive-reduced/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/File::Copy::Recursive::Reduced"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends="perl-dev"
checkdepends="perl-capture-tiny perl-path-tiny"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-file-copy-recursive/APKBUILD b/user/perl-file-copy-recursive/APKBUILD
index 1b94cc2fc..393832558 100644
--- a/user/perl-file-copy-recursive/APKBUILD
+++ b/user/perl-file-copy-recursive/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/File::Copy::Recursive"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends="perl-dev"
checkdepends="perl-test-fatal perl-test-warnings perl-path-tiny perl-test-deep perl-test-file"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-file-desktopentry/APKBUILD b/user/perl-file-desktopentry/APKBUILD
index 3cf54a4c5..04094a3c9 100644
--- a/user/perl-file-desktopentry/APKBUILD
+++ b/user/perl-file-desktopentry/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Handle .desktop files from Perl"
url="https://metacpan.org/release/File-DesktopEntry"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-file-basedir perl-uri-escape"
+depends="perl perl-file-basedir perl-uri-escape"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-file-find-object-rule/APKBUILD b/user/perl-file-find-object-rule/APKBUILD
index be981dbf7..ffd9f176e 100644
--- a/user/perl-file-find-object-rule/APKBUILD
+++ b/user/perl-file-find-object-rule/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Alternative Perl interface to File::Find::Object"
url="https://metacpan.org/release/File-Find-Object-Rule"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-class-xsaccessor perl-file-find-object perl-number-compare
+depends="perl perl-class-xsaccessor perl-file-find-object perl-number-compare
perl-text-glob"
makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
diff --git a/user/perl-file-find-object/APKBUILD b/user/perl-file-find-object/APKBUILD
index 56377f8b2..3f982a220 100644
--- a/user/perl-file-find-object/APKBUILD
+++ b/user/perl-file-find-object/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Object-oriented File::Find replacement for Perl"
url="https://metacpan.org/release/File-Find-Object"
arch="noarch"
license="Artistic-2.0"
-depends="perl-class-xsaccessor"
+depends="perl perl-class-xsaccessor"
makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-file-finder/APKBUILD b/user/perl-file-finder/APKBUILD
index c82f6bb63..1dbfe614e 100644
--- a/user/perl-file-finder/APKBUILD
+++ b/user/perl-file-finder/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Wrap Perl File::Find"
url="https://metacpan.org/release/File-Finder"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-text-glob"
+depends="perl perl-text-glob"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz
diff --git a/user/perl-file-mimeinfo/APKBUILD b/user/perl-file-mimeinfo/APKBUILD
index 48602e04c..ad6a0f9ff 100644
--- a/user/perl-file-mimeinfo/APKBUILD
+++ b/user/perl-file-mimeinfo/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Determine file types from Perl"
url="https://metacpan.org/release/File-MimeInfo"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-file-basedir perl-file-desktopentry perl-path-tiny
+depends="perl perl-file-basedir perl-file-desktopentry perl-path-tiny
shared-mime-info"
makedepends="perl-dev"
subpackages="$pkgname-doc"
diff --git a/user/perl-file-sharedir/APKBUILD b/user/perl-file-sharedir/APKBUILD
index b0eb865b0..c0f2fa9a2 100644
--- a/user/perl-file-sharedir/APKBUILD
+++ b/user/perl-file-sharedir/APKBUILD
@@ -11,7 +11,8 @@ pkgdesc="Locate files shared by Perl modules"
url="https://metacpan.org/release/File-ShareDir"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-class-inspector perl-file-sharedir-install perl-list-moreutils perl-params-util"
+depends="perl perl-class-inspector perl-file-sharedir-install
+ perl-list-moreutils perl-params-util"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-file-slurp/APKBUILD b/user/perl-file-slurp/APKBUILD
index ca846f49e..46f78e1d9 100644
--- a/user/perl-file-slurp/APKBUILD
+++ b/user/perl-file-slurp/APKBUILD
@@ -5,7 +5,7 @@ _pkgreal=File-Slurp
_author=CAPOEIRAB
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
-pkgver=9999.28
+pkgver=9999.29
pkgrel=0
pkgdesc="Simple and efficient file manipulation in Perl"
url="https://metacpan.org/release/File-Slurp"
@@ -31,4 +31,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="4e4f6ee3f1563eff230a4d3db8e71647e41f58be523c60d023763c94b41a850c24873ac2b0f27e192a47afc77cc20e2e09d7b83ffef34b465601ef64ec9cd4ef File-Slurp-9999.28.tar.gz"
+sha512sums="f98f83ceb17eef1e79ba9a9222106b0cc00bffe671b91046bcabda8aeb85a3d4f3ee7d64048a916c9486602326819ebfb4ede274e39435aacbda4e35d30cdd5c File-Slurp-9999.29.tar.gz"
diff --git a/user/perl-games-solitaire-verify/APKBUILD b/user/perl-games-solitaire-verify/APKBUILD
index b72c57592..0e9e66150 100644
--- a/user/perl-games-solitaire-verify/APKBUILD
+++ b/user/perl-games-solitaire-verify/APKBUILD
@@ -13,8 +13,8 @@ arch="noarch"
license="MIT"
depends="perl-class-xsaccessor perl-dir-manifest perl-exception-class
perl-list-moreutils"
-makedepends="perl-dev perl-module-build"
checkdepends="perl-test-differences perl-path-tiny"
+makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-gd/APKBUILD b/user/perl-gd/APKBUILD
index 16c87aa10..a859346c6 100644
--- a/user/perl-gd/APKBUILD
+++ b/user/perl-gd/APKBUILD
@@ -1,4 +1,3 @@
-# Automatically generated by apkbuild-cpan, template 1
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-gd
@@ -12,7 +11,7 @@ pkgdesc="Perl module for GD graphics library"
url="https://metacpan.org/release/GD"
arch="all"
license="GPL-2.0-only OR Artistic-1.0-Perl"
-depends=""
+depends="perl"
makedepends="perl-dev perl-extutils-pkgconfig freetype-dev libgd-dev libjpeg-turbo-dev
libpng-dev libwebp-dev zlib-dev"
subpackages="$pkgname-doc"
diff --git a/user/perl-gdgraph/APKBUILD b/user/perl-gdgraph/APKBUILD
index 394b95fbe..db2b2f67e 100644
--- a/user/perl-gdgraph/APKBUILD
+++ b/user/perl-gdgraph/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Produce charts from Perl using GD"
url="https://metacpan.org/release/GDGraph"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-gd perl-gdtextutil"
+depends="perl perl-gd perl-gdtextutil"
checkdepends="perl-capture-tiny perl-test-exception"
makedepends="perl-dev"
subpackages="$pkgname-doc"
diff --git a/user/perl-gdtextutil/APKBUILD b/user/perl-gdtextutil/APKBUILD
index 49dad183a..446a4c47e 100644
--- a/user/perl-gdtextutil/APKBUILD
+++ b/user/perl-gdtextutil/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Text utilities for use with GD's Perl interface"
url="https://metacpan.org/release/GDTextUtil"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-gd"
+depends="perl perl-gd"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-getopt-long-descriptive/APKBUILD b/user/perl-getopt-long-descriptive/APKBUILD
index e0bffefdf..b5492009c 100644
--- a/user/perl-getopt-long-descriptive/APKBUILD
+++ b/user/perl-getopt-long-descriptive/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Simpler Perl implementation of Getopt::Long"
url="https://metacpan.org/release/Getopt-Long-Descriptive"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-params-validate perl-sub-exporter"
-makedepends="perl-dev"
+depends="perl perl-params-validate perl-sub-exporter"
checkdepends="perl-cpan-meta-check perl-test-fatal perl-test-warnings"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-hash-multivalue/APKBUILD b/user/perl-hash-multivalue/APKBUILD
index f034200c1..3be9274d3 100644
--- a/user/perl-hash-multivalue/APKBUILD
+++ b/user/perl-hash-multivalue/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Hash-MultiValue"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-html-formatter/APKBUILD b/user/perl-html-formatter/APKBUILD
index 9fc2e5fcd..1d8127cf2 100644
--- a/user/perl-html-formatter/APKBUILD
+++ b/user/perl-html-formatter/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="HTML formatters for Perl"
url="https://metacpan.org/release/HTML-Formatter"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-file-slurper perl-font-afm perl-html-tree"
+depends="perl perl-file-slurper perl-font-afm perl-html-tree"
checkdepends="perl-test-warnings"
makedepends="perl-dev"
subpackages="$pkgname-doc"
@@ -19,18 +19,15 @@ source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver
builddir="$srcdir/$_pkgreal-$pkgver"
build() {
- cd "$builddir"
PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
make
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
diff --git a/user/perl-html-formattext-withlinks/APKBUILD b/user/perl-html-formattext-withlinks/APKBUILD
index 656a4cf5b..8e9c9878f 100644
--- a/user/perl-html-formattext-withlinks/APKBUILD
+++ b/user/perl-html-formattext-withlinks/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Perl-based HTML-to-text converter with links as footnotes"
url="https://metacpan.org/release/HTML-FormatText-WithLinks"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-html-formatter perl-html-tree perl-uri"
+depends="perl perl-html-formatter perl-html-tree perl-uri"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-html-scrubber/APKBUILD b/user/perl-html-scrubber/APKBUILD
index 179574648..762f8367b 100644
--- a/user/perl-html-scrubber/APKBUILD
+++ b/user/perl-html-scrubber/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/HTML-Scrubber"
arch="noarch"
options="!check" # insane amount of test pods that no other module uses
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-html-parser"
+depends="perl perl-html-parser"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-html-tree/APKBUILD b/user/perl-html-tree/APKBUILD
index c6009558c..4239e8fa8 100644
--- a/user/perl-html-tree/APKBUILD
+++ b/user/perl-html-tree/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="DOM tree structure parser for Perl"
url="https://metacpan.org/release/HTML-Tree"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-html-parser"
+depends="perl perl-html-parser"
checkdepends="perl-test-fatal"
makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
diff --git a/user/perl-http-entity-parser/APKBUILD b/user/perl-http-entity-parser/APKBUILD
index 0301785dc..ea37b802a 100644
--- a/user/perl-http-entity-parser/APKBUILD
+++ b/user/perl-http-entity-parser/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="PSGI compliant HTTP entity parser for Perl"
url="https://metacpan.org/release/HTTP-Entity-Parser"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-hash-multivalue perl-http-multipartparser perl-json-maybexs
+depends="perl perl-hash-multivalue perl-http-multipartparser perl-json-maybexs
perl-stream-buffered perl-www-form-urlencoded"
checkdepends="perl-http-message"
makedepends="perl-dev perl-module-build-tiny"
diff --git a/user/perl-http-headers-fast/APKBUILD b/user/perl-http-headers-fast/APKBUILD
index f6709826f..83192f746 100644
--- a/user/perl-http-headers-fast/APKBUILD
+++ b/user/perl-http-headers-fast/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Fast HTTP header parsing for Perl"
url="https://metacpan.org/release/HTTP-Headers-Fast"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-http-date"
+depends="perl perl-http-date"
checkdepends="perl-test-requires perl-uri"
makedepends="perl-dev perl-module-build-tiny"
subpackages="$pkgname-doc"
diff --git a/user/perl-importer/APKBUILD b/user/perl-importer/APKBUILD
index 08a28e060..3aeb91912 100644
--- a/user/perl-importer/APKBUILD
+++ b/user/perl-importer/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-importer
_pkgreal=Importer
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Importer"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-indirect/APKBUILD b/user/perl-indirect/APKBUILD
index 39027a11d..d9fe7b5fa 100644
--- a/user/perl-indirect/APKBUILD
+++ b/user/perl-indirect/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-indirect
_pkgreal=indirect
diff --git a/user/perl-inline-c/APKBUILD b/user/perl-inline-c/APKBUILD
index b6fb45555..ed895b5ae 100644
--- a/user/perl-inline-c/APKBUILD
+++ b/user/perl-inline-c/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Inline::C"
arch="noarch"
license="GPL-1.0+ OR Artistic-1.0-Perl"
depends="perl perl-inline perl-pegex perl-parse-recdescent"
-makedepends="perl-dev perl-file-sharedir-install"
checkdepends="perl-test-warn perl-yaml-libyaml perl-file-copy-recursive"
+makedepends="perl-dev perl-file-sharedir-install"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-inline/APKBUILD b/user/perl-inline/APKBUILD
index 35da3125f..b599f9b80 100644
--- a/user/perl-inline/APKBUILD
+++ b/user/perl-inline/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Inline"
arch="noarch"
license="GPL-1.0+ OR Artistic-1.0-Perl"
depends="perl"
-makedepends="perl-dev"
checkdepends="perl-test-warn"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-io-stringy/APKBUILD b/user/perl-io-stringy/APKBUILD
index af975f67b..e961c3086 100644
--- a/user/perl-io-stringy/APKBUILD
+++ b/user/perl-io-stringy/APKBUILD
@@ -1,10 +1,10 @@
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-io-stringy
-_pkgreal=IO-stringy
-_author=DSKOLL
+_pkgreal=IO-Stringy
+_author=CAPOEIRAB
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
-pkgver=2.111
+pkgver=2.112
pkgrel=0
pkgdesc="I/O on in-core objects like strings and arrays"
url="https://metacpan.org/release/IO-stringy"
@@ -16,7 +16,7 @@ subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
-prepare() {
+build() {
export CFLAGS=`perl -MConfig -E 'say $Config{ccflags}'`
PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
make
@@ -31,4 +31,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="9da8fb03945bc4a59cea3b3b2e22b15d56b133470e581d1cb03920bda2b4953e3c9e4a25d095ed8a384efb5a4c58db437c92cca6a81d583791191f1a37691a4a IO-stringy-2.111.tar.gz"
+sha512sums="49ca81f4c96dcac9f1eda0a226b84cc70964f8a917e41980d4faa611d42716c509fa24ff282ca731f9aa42285bff9195b7b9ba8fd732f2aac7761282c61f2601 IO-Stringy-2.112.tar.gz"
diff --git a/user/perl-io-tty/APKBUILD b/user/perl-io-tty/APKBUILD
index 972526fed..e20ad7dce 100644
--- a/user/perl-io-tty/APKBUILD
+++ b/user/perl-io-tty/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Low-level allocate a pseudo-tty"
url="https://metacpan.org/pod/IO::Tty"
arch="all"
license="Artistic-1.0-Perl"
-depends=""
+depends="perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-json-rpc/APKBUILD b/user/perl-json-rpc/APKBUILD
index 6f0aac32e..74126858d 100644
--- a/user/perl-json-rpc/APKBUILD
+++ b/user/perl-json-rpc/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Perl JSON RPC 2.0 server implementation"
url="https://metacpan.org/release/JSON-RPC"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-cgi perl-class-accessor-lite perl-json perl-libwww perl-plack
- perl-router-simple"
+depends="perl perl-cgi perl-class-accessor-lite perl-json perl-libwww
+ perl-plack perl-router-simple"
makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-list-moreutils-xs/APKBUILD b/user/perl-list-moreutils-xs/APKBUILD
index c1cb2c2e2..786d7c9e6 100644
--- a/user/perl-list-moreutils-xs/APKBUILD
+++ b/user/perl-list-moreutils-xs/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Provide the stuff missing in List::Util in XS"
url="https://metacpan.org/release/List-MoreUtils-XS"
arch="all"
license="Apache-2.0"
-depends=""
+depends="perl"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-list-moreutils/APKBUILD b/user/perl-list-moreutils/APKBUILD
index 044cc6a63..13253c8e8 100644
--- a/user/perl-list-moreutils/APKBUILD
+++ b/user/perl-list-moreutils/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Provide the stuff missing in List::Util"
url="https://metacpan.org/release/List-MoreUtils"
arch="noarch"
license="Apache-2.0"
-depends="perl-exporter-tiny"
+depends="perl perl-exporter-tiny"
makedepends="perl-dev perl-list-moreutils-xs"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-list-someutils-xs/APKBUILD b/user/perl-list-someutils-xs/APKBUILD
index 57eb8b154..98eb4db65 100644
--- a/user/perl-list-someutils-xs/APKBUILD
+++ b/user/perl-list-someutils-xs/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/List-SomeUtils-XS"
arch="all"
license="Artistic-2.0"
depends=""
-makedepends="perl-dev"
checkdepends="perl-test-leaktrace perl-test-warnings"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-list-someutils/APKBUILD b/user/perl-list-someutils/APKBUILD
index 160554431..90759cf3d 100644
--- a/user/perl-list-someutils/APKBUILD
+++ b/user/perl-list-someutils/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/List-SomeUtils"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl-list-someutils-xs perl-module-implementation"
-makedepends="perl-dev"
checkdepends="perl-test-leaktrace"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-lwp-protocol-https/APKBUILD b/user/perl-lwp-protocol-https/APKBUILD
index 840e93e64..6512088a6 100644
--- a/user/perl-lwp-protocol-https/APKBUILD
+++ b/user/perl-lwp-protocol-https/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="HTTPS support for Perl LWP"
url="https://metacpan.org/release/LWP-Protocol-https"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-io-socket-ssl perl-libwww perl-mozilla-ca perl-net-http"
+depends="perl perl-io-socket-ssl perl-libwww perl-mozilla-ca perl-net-http"
checkdepends="perl-test-requiresinternet"
makedepends="perl-dev"
subpackages="$pkgname-doc"
diff --git a/user/perl-module-build-xsutil/APKBUILD b/user/perl-module-build-xsutil/APKBUILD
index ffcc9fbd6..108843fe2 100644
--- a/user/perl-module-build-xsutil/APKBUILD
+++ b/user/perl-module-build-xsutil/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Module::Build::XSUtil"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl perl-module-build perl-devel-checkcompiler"
-makedepends="perl-dev"
checkdepends="perl-capture-tiny perl-cwd-guard perl-file-copy-recursive-reduced"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-module-implementation/APKBUILD b/user/perl-module-implementation/APKBUILD
index 9605051f1..ce019078c 100644
--- a/user/perl-module-implementation/APKBUILD
+++ b/user/perl-module-implementation/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Loads an underlying implementation of a Perl module"
url="https://metacpan.org/release/Module-Implementation"
arch="noarch"
license="Artistic-2.0"
-depends="perl-module-runtime perl-try-tiny"
-makedepends="perl-dev"
+depends="perl perl-module-runtime perl-try-tiny"
checkdepends="perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-module-runtime/APKBUILD b/user/perl-module-runtime/APKBUILD
index fc79c7f95..11a19b383 100644
--- a/user/perl-module-runtime/APKBUILD
+++ b/user/perl-module-runtime/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Module::Runtime"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends="perl-dev"
checkdepends="perl-test-pod perl-test-pod-coverage"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-moo/APKBUILD b/user/perl-moo/APKBUILD
index 06a6c1c9d..400733dec 100644
--- a/user/perl-moo/APKBUILD
+++ b/user/perl-moo/APKBUILD
@@ -13,8 +13,8 @@ arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl perl-module-runtime perl-devel-globaldestruction perl-class-method-modifiers
perl-sub-quote perl-role-tiny"
-makedepends="perl-dev"
checkdepends="perl-test-fatal"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-moose/APKBUILD b/user/perl-moose/APKBUILD
index 86b7e557d..b716f58fc 100644
--- a/user/perl-moose/APKBUILD
+++ b/user/perl-moose/APKBUILD
@@ -5,7 +5,7 @@ _pkgreal=Moose
_author=ETHER
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
-pkgver=2.2011
+pkgver=2.2012
pkgrel=0
pkgdesc="A postmodern object system for Perl 5"
url="https://metacpan.org/release/Moose"
@@ -17,9 +17,9 @@ depends="perl-class-load perl-class-load-xs perl-data-optlist
perl-module-runtime-conflicts perl-mro-compat
perl-package-deprecationmanager perl-params-util perl-sub-exporter
perl-sub-identify perl-sub-name perl-try-tiny"
-makedepends="perl-dev"
-checkdepends="perl-cpan-meta-check perl-dist-checkconflicts
+checkdepends="perl-cpan-meta-check perl-dist-checkconflicts perl-test-output
perl-test-cleannamespaces perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -38,4 +38,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="f94ed23c45a860b9afa8defe7f5067a65fdd9d457d94a85e4ea192640d09ad73bc336a2e54c4c663643ec0efa32872f4b2aa69083e99093e420cecf5430f34a3 Moose-2.2011.tar.gz"
+sha512sums="195079c32ce0110ae5d76bc1753b9e5c9aa8b3132049912d85600b7d29470b3426e10ccac50a24acbadbb8e00b68c99a98ca975a001b12096b02f2fa1c1264f3 Moose-2.2012.tar.gz"
diff --git a/user/perl-moosex-getopt/APKBUILD b/user/perl-moosex-getopt/APKBUILD
index ca0caabf3..d1a835f95 100644
--- a/user/perl-moosex-getopt/APKBUILD
+++ b/user/perl-moosex-getopt/APKBUILD
@@ -12,10 +12,10 @@ url="https://metacpan.org/release/MooseX-Getopt"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl-getopt-long-descriptive perl-moose perl-moosex-role-parameterised
- perl-namespace-autoclean perl-try-tiny"
-makedepends="perl-dev perl-module-build-tiny"
+ perl-namespace-autoclean perl-try-tiny perl"
checkdepends="perl-moosex-strictconstructor perl-path-tiny perl-test-deep
perl-test-fatal perl-test-needs perl-test-trap perl-test-warnings"
+makedepends="perl-dev perl-module-build-tiny"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-moosex-role-parameterised/APKBUILD b/user/perl-moosex-role-parameterised/APKBUILD
index 1589d37bb..26946518e 100644
--- a/user/perl-moosex-role-parameterised/APKBUILD
+++ b/user/perl-moosex-role-parameterised/APKBUILD
@@ -11,9 +11,11 @@ pkgdesc="Perl Moose roles with composition parameters"
url="https://metacpan.org/release/MooseX-Role-Parameterized"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-module-runtime perl-moose perl-namespace-autoclean perl-namespace-clean"
+depends="perl perl-module-runtime perl-moose perl-namespace-autoclean
+ perl-namespace-clean"
+checkdepends="perl-cpan-meta-check perl-dist-checkconflicts perl-test-fatal
+ perl-test-requires"
makedepends="perl-dev perl-module-build-tiny"
-checkdepends="perl-cpan-meta-check perl-dist-checkconflicts perl-test-fatal perl-test-requires"
provides="perl-moosex-role-parameterized=$pkgver-r$pkgrel"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-moosex-strictconstructor/APKBUILD b/user/perl-moosex-strictconstructor/APKBUILD
index c0778ec92..4aa583aef 100644
--- a/user/perl-moosex-strictconstructor/APKBUILD
+++ b/user/perl-moosex-strictconstructor/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Ensure unknown attributes passed to Perl Moose ctors are errors"
url="https://metacpan.org/release/MooseX-StrictConstructor"
arch="noarch"
license="Artistic-2.0"
-depends="perl-moose perl-namespace-autoclean"
-makedepends="perl-dev"
+depends="perl perl-moose perl-namespace-autoclean"
checkdepends="perl-moo perl-test-fatal perl-test-needs"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-moox-late/APKBUILD b/user/perl-moox-late/APKBUILD
index 7238eacfc..5bae5212a 100644
--- a/user/perl-moox-late/APKBUILD
+++ b/user/perl-moox-late/APKBUILD
@@ -5,15 +5,15 @@ _pkgreal=MooX-late
_author=TOBYINK
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
-pkgver=0.015
+pkgver=0.016
pkgrel=0
pkgdesc="Translate Moose code into Moo"
url="https://metacpan.org/release/MooX-late"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl-moo perl-type-tiny"
-makedepends="perl-dev"
checkdepends="perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -32,4 +32,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="4d685f4e68abe10487a98def8f0e7b0bafbd9928af27e61a5ac410bcafa9833a4aebdc8cd5bdbebd1a6ee53b4b0d5ae9bfa3864cae428b21c926730365fefb6d MooX-late-0.015.tar.gz"
+sha512sums="d2d53ad531a87e711c78a08e94852b80492cb62120c513ff0a80fb5cffcf8f5eacec227a3dececd03fe47612c3829ff44918c09b7561143c172ef8eff2d49346 MooX-late-0.016.tar.gz"
diff --git a/user/perl-moox-types-mooselike/APKBUILD b/user/perl-moox-types-mooselike/APKBUILD
index 5200b3397..b9e4db2f0 100644
--- a/user/perl-moox-types-mooselike/APKBUILD
+++ b/user/perl-moox-types-mooselike/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Moose-like types for Perl Moo"
url="https://metacpan.org/release/MooX-Types-MooseLike"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-module-runtime perl-moo"
+depends="perl perl-module-runtime perl-moo"
checkdepends="perl-test-fatal"
makedepends="perl-dev"
subpackages="$pkgname-doc"
diff --git a/user/perl-moox/APKBUILD b/user/perl-moox/APKBUILD
index 33605c480..eacc40aba 100644
--- a/user/perl-moox/APKBUILD
+++ b/user/perl-moox/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Perl module for using Moo and MooX:: lazily"
url="https://metacpan.org/release/MooX"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-data-optlist perl-import-into perl-module-runtime perl-moo"
+depends="perl perl-data-optlist perl-import-into perl-module-runtime perl-moo"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-mouse/APKBUILD b/user/perl-mouse/APKBUILD
index 8aea1d200..638aea5bf 100644
--- a/user/perl-mouse/APKBUILD
+++ b/user/perl-mouse/APKBUILD
@@ -12,8 +12,9 @@ url="https://metacpan.org/pod/Mouse"
arch="all"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
+checkdepends="perl-test-exception perl-test-fatal perl-test-leaktrace
+ perl-test-output perl-test-requires perl-try-tiny"
makedepends="perl-dev perl-module-build-xsutil"
-checkdepends="perl-test-exception perl-test-fatal perl-test-leaktrace perl-test-output perl-test-requires perl-try-tiny"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-v$pkgver"
diff --git a/user/perl-multidimensional/APKBUILD b/user/perl-multidimensional/APKBUILD
index 97aa29a51..4d7e17f53 100644
--- a/user/perl-multidimensional/APKBUILD
+++ b/user/perl-multidimensional/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-multidimensional
_pkgreal=multidimensional
@@ -11,7 +11,7 @@ pkgdesc="Perl module for disabling multidimensional array emulation"
url="https://metacpan.org/pod/multidimensional"
arch="all"
license="Artistic-1.0-Perl"
-depends=""
+depends="perl"
makedepends="perl-b-hooks-op-check perl-dev perl-extutils-depends"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-namespace-autoclean/APKBUILD b/user/perl-namespace-autoclean/APKBUILD
index ecb87e181..2ef2b5600 100644
--- a/user/perl-namespace-autoclean/APKBUILD
+++ b/user/perl-namespace-autoclean/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Keep imports out of your Perl namespace"
url="https://metacpan.org/release/namespace-autoclean"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-b-hooks-endofscope perl-namespace-clean perl-sub-identify"
-makedepends="perl-dev"
+depends="perl perl-b-hooks-endofscope perl-namespace-clean perl-sub-identify"
checkdepends="perl-moo perl-moose perl-mouse perl-test-requires perl-test-needs"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-namespace-clean/APKBUILD b/user/perl-namespace-clean/APKBUILD
index 822d22d81..f7a4677cf 100644
--- a/user/perl-namespace-clean/APKBUILD
+++ b/user/perl-namespace-clean/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Keep imports and functions out of your Perl namespace"
url="https://metacpan.org/release/namespace-clean"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-b-hooks-endofscope perl-package-stash"
+depends="perl perl-b-hooks-endofscope perl-package-stash"
makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-net-dbus/APKBUILD b/user/perl-net-dbus/APKBUILD
index 7e37848b4..effaf9716 100644
--- a/user/perl-net-dbus/APKBUILD
+++ b/user/perl-net-dbus/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-net-dbus
_pkgreal=Net-DBus
@@ -11,9 +11,9 @@ pkgdesc="Perl interface for dbus"
url="https://metacpan.org/release/Net-DBus"
arch="all"
license="GPL-2.0+ OR Artistic-1.0-Perl"
-depends="perl-xml-twig"
-makedepends="dbus-dev perl-extutils-pkgconfig"
+depends="perl perl-xml-twig"
checkdepends="perl-cpan-changes perl-test-pod perl-test-pod-coverage"
+makedepends="dbus-dev perl-dev perl-extutils-pkgconfig"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-net-snmp/APKBUILD b/user/perl-net-snmp/APKBUILD
index 1fe4d5df9..57a2e894d 100644
--- a/user/perl-net-snmp/APKBUILD
+++ b/user/perl-net-snmp/APKBUILD
@@ -1,5 +1,4 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-net-snmp
_pkgreal=Net-SNMP
@@ -12,7 +11,7 @@ pkgdesc="Object oriented interface to SNMP"
url="https://metacpan.org/release/Net-SNMP"
arch="noarch"
license="GPL-2.0-only OR Artistic-1.0-Perl"
-depends="perl-crypt-des perl-crypt-rijndael perl-digest-hmac perl-digest-sha1"
+depends="perl perl-crypt-des perl-crypt-rijndael perl-digest-hmac perl-digest-sha1"
makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://search.cpan.org/CPAN/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz"
diff --git a/user/perl-number-compare/APKBUILD b/user/perl-number-compare/APKBUILD
index b56b735dc..9ff48e4fa 100644
--- a/user/perl-number-compare/APKBUILD
+++ b/user/perl-number-compare/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Number-Compare"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-number-range/APKBUILD b/user/perl-number-range/APKBUILD
index c81342876..dd99a6970 100644
--- a/user/perl-number-range/APKBUILD
+++ b/user/perl-number-range/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-number-range
_pkgreal=Number-Range
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Number::Range"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-package-deprecationmanager/APKBUILD b/user/perl-package-deprecationmanager/APKBUILD
index 74676a255..bb8a8f8b6 100644
--- a/user/perl-package-deprecationmanager/APKBUILD
+++ b/user/perl-package-deprecationmanager/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Manage deprecation warnings for your Perl distribution"
url="https://metacpan.org/release/Package-DeprecationManager"
arch="noarch"
license="Artistic-2.0"
-depends="perl-package-stash perl-params-util perl-sub-install perl-sub-name"
-makedepends=""
+depends="perl perl-package-stash perl-params-util perl-sub-install perl-sub-name"
checkdepends="perl-test-fatal perl-test-warnings"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-package-stash-xs/APKBUILD b/user/perl-package-stash-xs/APKBUILD
index 2555e5739..f0f96a947 100644
--- a/user/perl-package-stash-xs/APKBUILD
+++ b/user/perl-package-stash-xs/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Faster and more correct implementation of Package::Stash"
url="https://metacpan.org/release/Package-Stash-XS"
arch="all"
license="Artistic-1.0-Perl"
-depends=""
-makedepends="perl-dev"
+depends="perl"
checkdepends="perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-package-stash/APKBUILD b/user/perl-package-stash/APKBUILD
index ab8a0b910..fe596936a 100644
--- a/user/perl-package-stash/APKBUILD
+++ b/user/perl-package-stash/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Package-Stash"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl-module-implementation perl-package-stash-xs"
-makedepends="perl-dev"
checkdepends="perl-dist-checkconflicts perl-test-fatal perl-test-requires"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-parallel-forkmanager/APKBUILD b/user/perl-parallel-forkmanager/APKBUILD
index 8e194b501..fea0b4e57 100644
--- a/user/perl-parallel-forkmanager/APKBUILD
+++ b/user/perl-parallel-forkmanager/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-parallel-forkmanager
_pkgreal=Parallel-ForkManager
@@ -13,7 +13,7 @@ arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl perl-moo"
checkdepends="perl-test-warn"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-params-util/APKBUILD b/user/perl-params-util/APKBUILD
index 17fb32693..55899e69d 100644
--- a/user/perl-params-util/APKBUILD
+++ b/user/perl-params-util/APKBUILD
@@ -1,4 +1,3 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-params-util
_pkgreal=Params-Util
diff --git a/user/perl-params-validate/APKBUILD b/user/perl-params-validate/APKBUILD
index 0cecdda67..902196fd4 100644
--- a/user/perl-params-validate/APKBUILD
+++ b/user/perl-params-validate/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Validate Perl method/function parameters"
url="https://metacpan.org/release/Params-Validate"
arch="all"
license="Artistic-2.0"
-depends="perl-module-implementation"
-makedepends="perl-dev perl-module-build"
+depends="perl perl-module-implementation"
checkdepends="perl-test-fatal perl-test-requires"
+makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-params-validationcompiler/APKBUILD b/user/perl-params-validationcompiler/APKBUILD
index 9b2a8e462..7ec16a1fe 100644
--- a/user/perl-params-validationcompiler/APKBUILD
+++ b/user/perl-params-validationcompiler/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Params-ValidationCompiler"
arch="noarch"
options="!check" # many, many, many unpackaged test deps
license="Artistic-2.0"
-depends="perl-class-xsaccessor perl-eval-closure perl-exception-class"
+depends="perl perl-class-xsaccessor perl-eval-closure perl-exception-class"
checkdepends="perl-specio"
makedepends="perl-dev"
subpackages="$pkgname-doc"
diff --git a/user/perl-parse-recdescent/APKBUILD b/user/perl-parse-recdescent/APKBUILD
index 62beda77e..04b1037c1 100644
--- a/user/perl-parse-recdescent/APKBUILD
+++ b/user/perl-parse-recdescent/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Parse::RecDescent"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends="perl-dev"
checkdepends="perl-test-warn perl-test-pod"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-patchreader/APKBUILD b/user/perl-patchreader/APKBUILD
index ae6e4e42b..360477487 100644
--- a/user/perl-patchreader/APKBUILD
+++ b/user/perl-patchreader/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/PatchReader"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-path-iterator-rule/APKBUILD b/user/perl-path-iterator-rule/APKBUILD
index edc9d6b0a..785d2ee3c 100644
--- a/user/perl-path-iterator-rule/APKBUILD
+++ b/user/perl-path-iterator-rule/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-path-iterator-rule
_pkgreal=Path-Iterator-Rule
@@ -11,9 +11,9 @@ pkgdesc="Perl module for terative, recursive file-finding"
url="https://metacpan.org/pod/Path::Iterator::Rule"
arch="noarch"
license="Apache-2.0"
-depends="perl-file-pushd perl-number-compare perl-path-tiny perl-test-deep
+depends="perl perl-file-pushd perl-number-compare perl-path-tiny perl-test-deep
perl-test-filename perl-text-glob perl-try-tiny"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-path-tiny/APKBUILD b/user/perl-path-tiny/APKBUILD
index 6a88deb6c..e0985051a 100644
--- a/user/perl-path-tiny/APKBUILD
+++ b/user/perl-path-tiny/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Path::Tiny"
arch="noarch"
license="Apache-2.0"
depends="perl"
-makedepends=""
checkdepends="perl-test-mockrandom"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-pegex/APKBUILD b/user/perl-pegex/APKBUILD
index 9bd8df39d..e8d845a1c 100644
--- a/user/perl-pegex/APKBUILD
+++ b/user/perl-pegex/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Pegex"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends="perl-file-sharedir-install"
checkdepends="perl-yaml-libyaml"
+makedepends="perl-file-sharedir-install"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-perl-tidy/APKBUILD b/user/perl-perl-tidy/APKBUILD
index 8c9693b05..50fa1b800 100644
--- a/user/perl-perl-tidy/APKBUILD
+++ b/user/perl-perl-tidy/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Perl-Tidy"
arch="noarch"
license="GPL-2.0-only"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-perlio-utf8_strict/APKBUILD b/user/perl-perlio-utf8_strict/APKBUILD
index 32b32758d..90a01a560 100644
--- a/user/perl-perlio-utf8_strict/APKBUILD
+++ b/user/perl-perlio-utf8_strict/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/PerlIO-utf8_strict"
arch="all"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends="perl-dev"
checkdepends="perl-test-exception"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-plack/APKBUILD b/user/perl-plack/APKBUILD
index fcac54b8f..6cea46688 100644
--- a/user/perl-plack/APKBUILD
+++ b/user/perl-plack/APKBUILD
@@ -16,9 +16,9 @@ depends="perl-apache-logformat-compiler perl-cookie-baker perl-devel-stacktrace
perl-file-sharedir-install perl-filesys-notify-simple
perl-hash-multivalue perl-http-entity-parser perl-http-headers-fast
perl-http-message perl-stream-buffered perl-try-tiny perl-uri
- perl-www-form-urlencoded"
+ perl-www-form-urlencoded perl"
checkdepends="perl-test-requires perl-test-tcp"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-pod-constants/APKBUILD b/user/perl-pod-constants/APKBUILD
index 4715fffbe..69a0129eb 100644
--- a/user/perl-pod-constants/APKBUILD
+++ b/user/perl-pod-constants/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-pod-constants
_pkgreal=Pod-Constants
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Pod::Constants"
arch="noarch"
license="Artistic-2.0"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-pod-coverage/APKBUILD b/user/perl-pod-coverage/APKBUILD
index 7bd736aaa..23b7afc41 100644
--- a/user/perl-pod-coverage/APKBUILD
+++ b/user/perl-pod-coverage/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Checks if the documentation of a module is comprehensive"
url="https://metacpan.org/pod/Pod::Coverage"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
-depends="perl-devel-symdump"
-makedepends=""
+depends="perl perl-devel-symdump"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-posix-strftime-compiler/APKBUILD b/user/perl-posix-strftime-compiler/APKBUILD
index 8cc92189b..5d5e4181b 100644
--- a/user/perl-posix-strftime-compiler/APKBUILD
+++ b/user/perl-posix-strftime-compiler/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/POSIX-strftime-Compiler"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl"
-makedepends="perl-module-build"
+makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-probe-perl/APKBUILD b/user/perl-probe-perl/APKBUILD
index 51ea21c2a..c495e0b8e 100644
--- a/user/perl-probe-perl/APKBUILD
+++ b/user/perl-probe-perl/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-probe-perl
_pkgreal=Probe-Perl
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Probe::Perl"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-regexp-common/APKBUILD b/user/perl-regexp-common/APKBUILD
index 4adb207f6..114d16c3c 100644
--- a/user/perl-regexp-common/APKBUILD
+++ b/user/perl-regexp-common/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-regexp-common
_pkgreal=Regexp-Common
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Regexp::Common"
arch="noarch"
license="Artistic-1.0-Perl OR Artistic-2.0 OR BSD-3-Clause OR MIT"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-regexp-pattern-license/APKBUILD b/user/perl-regexp-pattern-license/APKBUILD
index 1b47b7406..3db2da978 100644
--- a/user/perl-regexp-pattern-license/APKBUILD
+++ b/user/perl-regexp-pattern-license/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-regexp-pattern-license
_pkgreal=Regexp-Pattern-License
@@ -11,8 +11,8 @@ pkgdesc="Perl module for regex-matching legal licenses"
url="https://metacpan.org/pod/Regexp::Pattern::License"
arch="noarch"
license="GPL-3.0+"
-depends="perl-regexp-pattern perl-strictures perl-try-tiny"
-makedepends=""
+depends="perl perl-regexp-pattern perl-strictures perl-try-tiny"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-v$pkgver"
diff --git a/user/perl-regexp-pattern/APKBUILD b/user/perl-regexp-pattern/APKBUILD
index 55c780f00..aa4983483 100644
--- a/user/perl-regexp-pattern/APKBUILD
+++ b/user/perl-regexp-pattern/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-regexp-pattern
_pkgreal=Regexp-Pattern
@@ -11,8 +11,8 @@ pkgdesc="Perl framework for regex collection standardization"
url="https://metacpan.org/pod/Regexp::Pattern"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-test-exception"
-makedepends=""
+depends="perl perl-test-exception"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-role-tiny/APKBUILD b/user/perl-role-tiny/APKBUILD
index c4eb90987..e61fa15b1 100644
--- a/user/perl-role-tiny/APKBUILD
+++ b/user/perl-role-tiny/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Role::Tiny"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-router-simple/APKBUILD b/user/perl-router-simple/APKBUILD
index dbcfe7c27..2b4d2202a 100644
--- a/user/perl-router-simple/APKBUILD
+++ b/user/perl-router-simple/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Simple HTTP router for Perl"
url="https://metacpan.org/release/Router-Simple"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-class-accessor-lite"
-makedepends="perl-module-build"
+depends="perl perl-class-accessor-lite"
+makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-scope-guard/APKBUILD b/user/perl-scope-guard/APKBUILD
index a7c047af1..884d96003 100644
--- a/user/perl-scope-guard/APKBUILD
+++ b/user/perl-scope-guard/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Scope-Guard"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -27,7 +27,6 @@ check() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
diff --git a/user/perl-soap-lite/APKBUILD b/user/perl-soap-lite/APKBUILD
index 464b72f21..b14da2660 100644
--- a/user/perl-soap-lite/APKBUILD
+++ b/user/perl-soap-lite/APKBUILD
@@ -13,9 +13,9 @@ arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl-class-inspector perl-io-sessiondata perl-io-socket-ssl
perl-libwww perl-lwp-protocol-https perl-task-weaken perl-uri
- perl-xml-parser perl-xml-parser-lite"
+ perl-xml-parser perl-xml-parser-lite perl"
checkdepends="perl-test-warn"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-software-license/APKBUILD b/user/perl-software-license/APKBUILD
index a462cd961..0e28bc4a4 100644
--- a/user/perl-software-license/APKBUILD
+++ b/user/perl-software-license/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-software-license
_pkgreal=Software-License
@@ -11,8 +11,8 @@ pkgdesc="Perl module for generating prefilled license text"
url="https://metacpan.org/pod/Software::License"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-data-section perl-text-template perl-try-tiny"
-makedepends=""
+depends="perl perl-data-section perl-text-template perl-try-tiny"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-sort-key/APKBUILD b/user/perl-sort-key/APKBUILD
index bd2860b5e..c79e65b6c 100644
--- a/user/perl-sort-key/APKBUILD
+++ b/user/perl-sort-key/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sort-key
_pkgreal=Sort-Key
diff --git a/user/perl-specio-library-path-tiny/APKBUILD b/user/perl-specio-library-path-tiny/APKBUILD
index e8710d952..793639532 100644
--- a/user/perl-specio-library-path-tiny/APKBUILD
+++ b/user/perl-specio-library-path-tiny/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Path::Tiny types and coercions for Specio"
url="https://metacpan.org/release/Specio-Library-Path-Tiny"
arch="noarch"
license="Apache-2.0"
-depends="perl-file-pushd perl-path-tiny perl-specio"
-makedepends=""
+depends="perl perl-file-pushd perl-path-tiny perl-specio"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-specio/APKBUILD b/user/perl-specio/APKBUILD
index 00eabaa23..e4b98e930 100644
--- a/user/perl-specio/APKBUILD
+++ b/user/perl-specio/APKBUILD
@@ -5,7 +5,7 @@ _pkgreal=Specio
_author=DROLSKY
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
-pkgver=0.44
+pkgver=0.45
pkgrel=0
pkgdesc="Type constraints and coercions for Perl"
url="https://metacpan.org/release/Specio"
@@ -14,8 +14,8 @@ license="Artistic-2.0"
depends="perl-devel-stacktrace perl-eval-closure perl-mro-compat
perl-module-runtime perl-role-tiny perl-sub-quote perl-test-fatal
perl-try-tiny"
-makedepends=""
checkdepends="perl-test-needs"
+makedepends=""
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -34,4 +34,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="5292927383ff3eef3c32a81188a108c009367644117af23b31665550cc4b51d47f0bc0c6791dce3caebb27cd7a92307370f41afe62b65682205cd91b7e99cd43 Specio-0.44.tar.gz"
+sha512sums="28c32b155ddd1537e2ed2e634b667c4010903a4c68e4684f07f4bb74414eeaf5f5ef05f4ed898c830751abfacc51280b00970250db1b2e1219acc23e834994d7 Specio-0.45.tar.gz"
diff --git a/user/perl-stream-buffered/APKBUILD b/user/perl-stream-buffered/APKBUILD
index 5490b6459..7f0f33e91 100644
--- a/user/perl-stream-buffered/APKBUILD
+++ b/user/perl-stream-buffered/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Stream-Buffered"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-strictures/APKBUILD b/user/perl-strictures/APKBUILD
index ee70baec6..4593d1b79 100644
--- a/user/perl-strictures/APKBUILD
+++ b/user/perl-strictures/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-strictures
_pkgreal=strictures
@@ -11,8 +11,8 @@ pkgdesc="Perl module for using strict and fatal warnings"
url="https://metacpan.org/pod/strictures"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-bareword-filehandles perl-indirect perl-multidimensional"
-makedepends=""
+depends="perl perl-bareword-filehandles perl-indirect perl-multidimensional"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-string-copyright/APKBUILD b/user/perl-string-copyright/APKBUILD
index 1f9e7ba12..ce456a524 100644
--- a/user/perl-string-copyright/APKBUILD
+++ b/user/perl-string-copyright/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-string-copyright
_pkgreal=String-Copyright
@@ -11,8 +11,8 @@ pkgdesc="Perl module for normalizing copyright text"
url="https://metacpan.org/pod/String::Copyright"
arch="noarch"
license="GPL-3.0+"
-depends="perl-exporter-tiny perl-number-range"
-makedepends=""
+depends="perl perl-exporter-tiny perl-number-range"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-string-escape/APKBUILD b/user/perl-string-escape/APKBUILD
index dcaddac1a..ce9e32862 100644
--- a/user/perl-string-escape/APKBUILD
+++ b/user/perl-string-escape/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-string-escape
_pkgreal=String-Escape
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/String::Escape"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-string-shellquote/APKBUILD b/user/perl-string-shellquote/APKBUILD
index 306ec6e07..927ad5427 100644
--- a/user/perl-string-shellquote/APKBUILD
+++ b/user/perl-string-shellquote/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/String-ShellQuote"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-sub-exporter-progressive/APKBUILD b/user/perl-sub-exporter-progressive/APKBUILD
index 6a7d681f6..c8ad23970 100644
--- a/user/perl-sub-exporter-progressive/APKBUILD
+++ b/user/perl-sub-exporter-progressive/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Only use Sub::Exporter if you need it"
url="https://metacpan.org/pod/Sub::Exporter::Progressive"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
-depends="perl-sub-exporter"
-makedepends=""
+depends="perl perl-sub-exporter"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-sub-exporter/APKBUILD b/user/perl-sub-exporter/APKBUILD
index 7416bb22e..2af5726b6 100644
--- a/user/perl-sub-exporter/APKBUILD
+++ b/user/perl-sub-exporter/APKBUILD
@@ -1,5 +1,3 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sub-exporter
_pkgreal=Sub-Exporter
@@ -13,7 +11,7 @@ url="https://metacpan.org/release/Sub-Exporter"
arch="noarch"
license="GPL-1.0+ OR Artistic-1.0-Perl"
depends="perl-data-optlist perl-sub-install perl-params-util"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-sub-info/APKBUILD b/user/perl-sub-info/APKBUILD
index ba2ccfe70..ad01d3757 100644
--- a/user/perl-sub-info/APKBUILD
+++ b/user/perl-sub-info/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sub-info
_pkgreal=Sub-Info
@@ -11,8 +11,8 @@ pkgdesc="Perl module for introspecting subroutines"
url="https://metacpan.org/pod/Sub::Info"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-importer"
-makedepends=""
+depends="perl perl-importer"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-sub-install/APKBUILD b/user/perl-sub-install/APKBUILD
index 543c17783..bb6eac5d7 100644
--- a/user/perl-sub-install/APKBUILD
+++ b/user/perl-sub-install/APKBUILD
@@ -1,4 +1,3 @@
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sub-install
_pkgreal=Sub-Install
diff --git a/user/perl-sub-quote/APKBUILD b/user/perl-sub-quote/APKBUILD
index 25fcc7845..427d8b410 100644
--- a/user/perl-sub-quote/APKBUILD
+++ b/user/perl-sub-quote/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Sub-Quote"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends=""
checkdepends="perl-test-fatal"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-task-freecellsolver-testing/APKBUILD b/user/perl-task-freecellsolver-testing/APKBUILD
index 6b9a60751..2e2641814 100644
--- a/user/perl-task-freecellsolver-testing/APKBUILD
+++ b/user/perl-task-freecellsolver-testing/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Perl module for testing the Freecell Solver package"
url="https://metacpan.org/release/Task-FreecellSolver-Testing"
arch="noarch"
license="MIT"
-depends="perl-code-tidyall perl-env-path perl-file-which
+depends="perl perl-code-tidyall perl-env-path perl-file-which
perl-games-solitaire-verify perl-inline perl-inline-c
perl-list-moreutils perl-moo perl-moox perl-moox-late perl-path-tiny
perl-string-shellquote perl-task-test-run-allplugins
diff --git a/user/perl-task-test-run-allplugins/APKBUILD b/user/perl-task-test-run-allplugins/APKBUILD
index 34a6dfa3a..6d584013c 100644
--- a/user/perl-task-test-run-allplugins/APKBUILD
+++ b/user/perl-task-test-run-allplugins/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="Install all the Test::Run plugins"
url="https://metacpan.org/release/Task-Test-Run-AllPlugins"
arch="noarch"
license="MIT"
-depends="perl-test-run perl-test-run-cmdline
+depends="perl perl-test-run perl-test-run-cmdline
perl-test-run-plugin-alternateinterpreters
perl-test-run-plugin-breakonfailure
perl-test-run-plugin-colourfileverdicts
diff --git a/user/perl-task-weaken/APKBUILD b/user/perl-task-weaken/APKBUILD
index 8dfccee17..db595447b 100644
--- a/user/perl-task-weaken/APKBUILD
+++ b/user/perl-task-weaken/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Ensure Perl platform has weaken support"
url="https://metacpan.org/release/Task-Weaken"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-sub-name"
-makedepends=""
+depends="perl perl-sub-name"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-template-gd/APKBUILD b/user/perl-template-gd/APKBUILD
index 0807ba40e..967e24f89 100644
--- a/user/perl-template-gd/APKBUILD
+++ b/user/perl-template-gd/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Use GD from Perl's Template Toolkit"
url="https://metacpan.org/release/Template-GD"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-gd perl-template-toolkit"
-makedepends=""
+depends="perl perl-gd perl-template-toolkit"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-template-toolkit/APKBUILD b/user/perl-template-toolkit/APKBUILD
index bcc8d0c5e..40c898c4a 100644
--- a/user/perl-template-toolkit/APKBUILD
+++ b/user/perl-template-toolkit/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/release/Template-Toolkit"
arch="all"
license="Artistic-1.0-Perl"
depends="perl-appconfig"
-makedepends="perl-dev"
checkdepends="perl-cgi perl-test-leaktrace"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-term-size-any/APKBUILD b/user/perl-term-size-any/APKBUILD
index 6cbe47d52..2cc51c4d1 100644
--- a/user/perl-term-size-any/APKBUILD
+++ b/user/perl-term-size-any/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-term-size-any
_pkgreal=Term-Size-Any
@@ -11,8 +11,8 @@ pkgdesc="Perl module for retrieving terminal sizing"
url="https://metacpan.org/pod/Term::Size::Any"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-devel-hide perl-term-size-perl"
-makedepends=""
+depends="perl perl-devel-hide perl-term-size-perl"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-term-size-perl/APKBUILD b/user/perl-term-size-perl/APKBUILD
index 64f392b32..599757534 100644
--- a/user/perl-term-size-perl/APKBUILD
+++ b/user/perl-term-size-perl/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-term-size-perl
_pkgreal=Term-Size-Perl
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Term::Size::Perl"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-term-table/APKBUILD b/user/perl-term-table/APKBUILD
index 7dedbbcea..9faf22bf0 100644
--- a/user/perl-term-table/APKBUILD
+++ b/user/perl-term-table/APKBUILD
@@ -1,19 +1,19 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-term-table
_pkgreal=Term-Table
_author=EXODIST
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
-pkgver=0.014
+pkgver=0.015
pkgrel=0
pkgdesc="Perl module for producing pretty tables for terminal applications"
url="https://metacpan.org/pod/Term::Table"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-importer"
-makedepends=""
+depends="perl perl-importer"
checkdepends="perl-test-simple"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -32,4 +32,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="4dfa3ef2a9e360ded05c36585df948dd3718bb0252b37546d0abc4adacf2cea24527c9c78d5bc1563cf96949f9137a4c4e5dbd6db580dbd205cf8cc71ffea000 Term-Table-0.014.tar.gz"
+sha512sums="2f5cbc28d0d0f76a6269892055871c103a65d9fd9836d3a0b7c7320cf1439d27cba596453f1d94bd324bd4d4dffdd0eb672801aa23f9a8609310a28eca15dd87 Term-Table-0.015.tar.gz"
diff --git a/user/perl-test-class-most/APKBUILD b/user/perl-test-class-most/APKBUILD
index f9e407693..9ddeb7543 100644
--- a/user/perl-test-class-most/APKBUILD
+++ b/user/perl-test-class-most/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Test Perl classes the easy way"
url="https://metacpan.org/release/Test-Class-Most"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-test-class perl-test-most"
-makedepends=""
+depends="perl perl-test-class perl-test-most"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-class/APKBUILD b/user/perl-test-class/APKBUILD
index fd784beb2..ed59d1bc3 100644
--- a/user/perl-test-class/APKBUILD
+++ b/user/perl-test-class/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Create Perl test classes in xUnit/JUnit style"
url="https://metacpan.org/release/Test-Class"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-module-runtime perl-mro-compat perl-try-tiny"
-makedepends=""
+depends="perl perl-module-runtime perl-mro-compat perl-try-tiny"
checkdepends="perl-test-exception"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-cleannamespaces/APKBUILD b/user/perl-test-cleannamespaces/APKBUILD
index afcf5a7fd..c4b260329 100644
--- a/user/perl-test-cleannamespaces/APKBUILD
+++ b/user/perl-test-cleannamespaces/APKBUILD
@@ -11,11 +11,11 @@ pkgdesc="Check Perl code for uncleaned imports"
url="https://metacpan.org/release/Test-CleanNamespaces"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-file-pushd perl-module-runtime perl-namespace-clean
+depends="perl perl-file-pushd perl-module-runtime perl-namespace-clean
perl-package-stash perl-sub-identify"
-makedepends=""
checkdepends="perl-moo perl-mouse perl-sub-exporter perl-test-deep
perl-test-needs perl-test-warnings"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-command/APKBUILD b/user/perl-test-command/APKBUILD
index 4c364a153..a1027ddd4 100644
--- a/user/perl-test-command/APKBUILD
+++ b/user/perl-test-command/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-command
_pkgreal=Test-Command
@@ -14,7 +14,7 @@ url="https://metacpan.org/release/Test-Command"
arch="noarch"
license="GPL-2.0-only OR Artistic-1.0-Perl"
depends="perl"
-makedepends="perl-module-build"
+makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-data-split/APKBUILD b/user/perl-test-data-split/APKBUILD
index 93e7e0c54..7d55b1116 100644
--- a/user/perl-test-data-split/APKBUILD
+++ b/user/perl-test-data-split/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Split data-driven Perl tests into several test scripts"
url="https://metacpan.org/release/Test-Data-Split"
arch="noarch"
license="MIT"
-depends="perl-io-all perl-list-moreutils perl-moox perl-moox-late"
-makedepends="perl-module-build"
+depends="perl perl-io-all perl-list-moreutils perl-moox perl-moox-late"
checkdepends="perl-test-differences"
+makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-deep/APKBUILD b/user/perl-test-deep/APKBUILD
index bba7fbd1d..b41b1e20a 100644
--- a/user/perl-test-deep/APKBUILD
+++ b/user/perl-test-deep/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::Deep"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-differences/APKBUILD b/user/perl-test-differences/APKBUILD
index 0db0fa3b6..cc77d3c06 100644
--- a/user/perl-test-differences/APKBUILD
+++ b/user/perl-test-differences/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Test strings and data structures and show differences if not ok"
url="https://metacpan.org/pod/Test::Differences"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-1.0"
-depends="perl-text-diff perl-capture-tiny perl-test-pod-coverage perl-test-pod"
-makedepends=""
+depends="perl perl-text-diff perl-capture-tiny perl-test-pod-coverage perl-test-pod"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-failwarnings/APKBUILD b/user/perl-test-failwarnings/APKBUILD
index 6573c3a00..1067e2e07 100644
--- a/user/perl-test-failwarnings/APKBUILD
+++ b/user/perl-test-failwarnings/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-failwarnings
_pkgreal=Test-FailWarnings
@@ -11,8 +11,8 @@ pkgdesc="Perl module for failing tests on caught warnings"
url="https://metacpan.org/pod/Test::FailWarnings"
arch="noarch"
license="Apache-2.0"
-depends="perl-capture-tiny"
-makedepends=""
+depends="perl perl-capture-tiny"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-file-sharedir/APKBUILD b/user/perl-test-file-sharedir/APKBUILD
index e52199be9..a6961c1f3 100644
--- a/user/perl-test-file-sharedir/APKBUILD
+++ b/user/perl-test-file-sharedir/APKBUILD
@@ -11,10 +11,10 @@ pkgdesc="Module testing support for Perl"
url="https://metacpan.org/release/Test-File-ShareDir"
arch="noarch"
license="Artistic-1.0-Perl or GPL-2.0-only"
-depends="perl-class-tiny perl-file-copy-recursive perl-file-sharedir
+depends="perl perl-class-tiny perl-file-copy-recursive perl-file-sharedir
perl-path-tiny perl-scope-guard"
checkdepends="perl-test-fatal"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-file/APKBUILD b/user/perl-test-file/APKBUILD
index 8fb30801f..5306421c2 100644
--- a/user/perl-test-file/APKBUILD
+++ b/user/perl-test-file/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Test::File"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends=""
checkdepends="perl-test-pod perl-test-pod-coverage perl-test-utf8"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-filename/APKBUILD b/user/perl-test-filename/APKBUILD
index 5307ae2ff..2bb1a9fb6 100644
--- a/user/perl-test-filename/APKBUILD
+++ b/user/perl-test-filename/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-filename
_pkgreal=Test-Filename
@@ -11,8 +11,8 @@ pkgdesc="Perl module for portable filename comparison"
url="https://metacpan.org/pod/Test::Filename"
arch="noarch"
license="Apache-2.0"
-depends="perl-path-tiny perl-try-tiny"
-makedepends=""
+depends="perl perl-path-tiny perl-try-tiny"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-manifest/APKBUILD b/user/perl-test-manifest/APKBUILD
index 30e610f1d..a329fa2f2 100644
--- a/user/perl-test-manifest/APKBUILD
+++ b/user/perl-test-manifest/APKBUILD
@@ -1,5 +1,3 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-manifest
_pkgreal=Test-Manifest
@@ -13,7 +11,7 @@ url="https://metacpan.org/release/Test-Manifest"
arch="noarch"
license="Artistic-2.0"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https:///cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-mockrandom/APKBUILD b/user/perl-test-mockrandom/APKBUILD
index f7d1b201f..8711be987 100644
--- a/user/perl-test-mockrandom/APKBUILD
+++ b/user/perl-test-mockrandom/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::MockRandom"
arch="noarch"
license="Apache-2.0"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-mocktime/APKBUILD b/user/perl-test-mocktime/APKBUILD
index b75d9c0d3..030dd3e46 100644
--- a/user/perl-test-mocktime/APKBUILD
+++ b/user/perl-test-mocktime/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Test-MockTime"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-more-utf8/APKBUILD b/user/perl-test-more-utf8/APKBUILD
index aaaddc298..330107c88 100644
--- a/user/perl-test-more-utf8/APKBUILD
+++ b/user/perl-test-more-utf8/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-more-utf8
_pkgreal=Test-More-UTF8
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::More::UTF8"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-most/APKBUILD b/user/perl-test-most/APKBUILD
index deffa4376..7d6895596 100644
--- a/user/perl-test-most/APKBUILD
+++ b/user/perl-test-most/APKBUILD
@@ -11,8 +11,9 @@ pkgdesc="Most commonly needed Perl test functions and features"
url="https://metacpan.org/release/Test-Most"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-exception-class perl-test-deep perl-test-differences perl-test-exception perl-test-warn"
-makedepends=""
+depends="perl perl-exception-class perl-test-deep perl-test-differences
+ perl-test-exception perl-test-warn"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-output/APKBUILD b/user/perl-test-output/APKBUILD
index 241c8b29c..130871fd0 100644
--- a/user/perl-test-output/APKBUILD
+++ b/user/perl-test-output/APKBUILD
@@ -1,5 +1,3 @@
-# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-output
_pkgreal=Test-Output
@@ -12,9 +10,9 @@ pkgdesc="Utilities to test STDOUT and STDERR messages"
url="https://metacpan.org/release/Test-Output"
arch="noarch"
license="Artistic-2.0"
-depends="perl-capture-tiny perl-sub-exporter perl-test-simple"
-makedepends=""
+depends="perl perl-capture-tiny perl-sub-exporter perl-test-simple"
checkdepends="perl-test-pod"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-perltidy/APKBUILD b/user/perl-test-perltidy/APKBUILD
index d631c4fa1..29d325646 100644
--- a/user/perl-test-perltidy/APKBUILD
+++ b/user/perl-test-perltidy/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Check all your Perl files for tidiness"
url="https://metacpan.org/release/Test-PerlTidy"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-file-finder perl-file-slurp perl-perl-tidy perl-text-diff"
+depends="perl perl-file-finder perl-file-slurp perl-perl-tidy perl-text-diff"
checkdepends="perl-path-tiny"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-pod-coverage/APKBUILD b/user/perl-test-pod-coverage/APKBUILD
index 9992a6bda..35e3e6096 100644
--- a/user/perl-test-pod-coverage/APKBUILD
+++ b/user/perl-test-pod-coverage/APKBUILD
@@ -12,8 +12,8 @@ url="https://metacpan.org/pod/Test::Pod::Coverage"
arch="noarch"
license="Artistic-2.0"
depends="perl perl-pod-coverage"
-makedepends=""
checkdepends="perl-test-pod"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-run-cmdline/APKBUILD b/user/perl-test-run-cmdline/APKBUILD
index e1c32a2af..aa806f921 100644
--- a/user/perl-test-run-cmdline/APKBUILD
+++ b/user/perl-test-run-cmdline/APKBUILD
@@ -11,10 +11,10 @@ pkgdesc="Analyse tests from the command line using Perl Test::Run"
url="https://metacpan.org/release/Test-Run-CmdLine"
arch="noarch"
license="MIT"
-depends="perl-moose perl-moosex-getopt perl-test-run perl-universal-require
- perl-yaml-libyaml"
-makedepends=""
+depends="perl perl-moose perl-moosex-getopt perl-test-run
+ perl-universal-require perl-yaml-libyaml"
checkdepends="perl-test-trap"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-run-plugin-ai/APKBUILD b/user/perl-test-run-plugin-ai/APKBUILD
index a48610aa8..4fc3b2de7 100644
--- a/user/perl-test-run-plugin-ai/APKBUILD
+++ b/user/perl-test-run-plugin-ai/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Define different interpreters for test scripts with Perl Test::Run"
url="https://metacpan.org/release/Test-Run-Plugin-AlternateInterpreters"
arch="noarch"
license="MIT"
-depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
-makedepends=""
+depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-run-plugin-bof/APKBUILD b/user/perl-test-run-plugin-bof/APKBUILD
index b0e224125..d1bd6da75 100644
--- a/user/perl-test-run-plugin-bof/APKBUILD
+++ b/user/perl-test-run-plugin-bof/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Stop processing entire Test::Run suite on single failure"
url="https://metacpan.org/release/Test-Run-Plugin-BreakOnFailure"
arch="noarch"
license="MIT"
-depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
-makedepends=""
+depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-v$pkgver"
diff --git a/user/perl-test-run-plugin-cfv/APKBUILD b/user/perl-test-run-plugin-cfv/APKBUILD
index a6b38f143..8c8f9438b 100644
--- a/user/perl-test-run-plugin-cfv/APKBUILD
+++ b/user/perl-test-run-plugin-cfv/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Make Perl Test::Run file verdicts (ok, not ok) colourful"
url="https://metacpan.org/release/Test-Run-Plugin-ColorFileVerdicts"
arch="noarch"
license="MIT"
-depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
-makedepends=""
+depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
provides="perl-test-run-plugin-colorfileverdicts=$pkgver-r$pkgrel"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-test-run-plugin-cs/APKBUILD b/user/perl-test-run-plugin-cs/APKBUILD
index e0e828863..5814e7d28 100644
--- a/user/perl-test-run-plugin-cs/APKBUILD
+++ b/user/perl-test-run-plugin-cs/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Perl Test::Run plugin that colours test summary"
url="https://metacpan.org/release/Test-Run-Plugin-ColorSummary"
arch="noarch"
license="MIT"
-depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
-makedepends=""
+depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
provides="perl-test-run-plugin-colorsummary=$pkgver-r$pkgrel"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
diff --git a/user/perl-test-run-plugin-tdf/APKBUILD b/user/perl-test-run-plugin-tdf/APKBUILD
index 9a5367aff..3121ebba3 100644
--- a/user/perl-test-run-plugin-tdf/APKBUILD
+++ b/user/perl-test-run-plugin-tdf/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Handle excessively long filenames in Perl Test::Run suites"
url="https://metacpan.org/release/Test-Run-Plugin-TrimDisplayedFilenames"
arch="noarch"
license="MIT"
-depends="perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
-makedepends=""
+depends="perl perl-moose perl-mro-compat perl-test-run perl-test-run-cmdline"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-run/APKBUILD b/user/perl-test-run/APKBUILD
index de126e631..e35eebd21 100644
--- a/user/perl-test-run/APKBUILD
+++ b/user/perl-test-run/APKBUILD
@@ -11,10 +11,10 @@ pkgdesc="Perl classes to run standard TAP scripts"
url="https://metacpan.org/release/Test-Run"
arch="noarch"
license="MIT"
-depends="perl-ipc-system-simple perl-list-moreutils perl-moose
+depends="perl perl-ipc-system-simple perl-list-moreutils perl-moose
perl-moosex-strictconstructor perl-test-trap perl-text-sprintf-named
perl-universal-require"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-runvalgrind/APKBUILD b/user/perl-test-runvalgrind/APKBUILD
index 9f7d5b9d5..e6f13fde5 100644
--- a/user/perl-test-runvalgrind/APKBUILD
+++ b/user/perl-test-runvalgrind/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Tests an external program is 'valgrind clean' from Perl"
url="https://metacpan.org/release/Test-RunValgrind"
arch="noarch"
license="MIT"
-depends="perl-path-tiny perl-test-trap"
-makedepends="perl-module-build"
+depends="perl perl-path-tiny perl-test-trap valgrind"
+makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz
portable-memory-assumptions.patch
diff --git a/user/perl-test-script/APKBUILD b/user/perl-test-script/APKBUILD
index 8c01b8f73..75ce72031 100644
--- a/user/perl-test-script/APKBUILD
+++ b/user/perl-test-script/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-script
_pkgreal=Test-Script
@@ -11,8 +11,8 @@ pkgdesc="Perl module for cross-platform script testing"
url="https://metacpan.org/pod/Test::Script"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-capture-tiny perl-probe-perl perl-test2-suite"
-makedepends=""
+depends="perl perl-capture-tiny perl-probe-perl perl-test2-suite"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-sharedfork/APKBUILD b/user/perl-test-sharedfork/APKBUILD
index a866b24a9..d1dcce3d4 100644
--- a/user/perl-test-sharedfork/APKBUILD
+++ b/user/perl-test-sharedfork/APKBUILD
@@ -13,7 +13,7 @@ arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl"
checkdepends="perl-test-requires"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-tcp/APKBUILD b/user/perl-test-tcp/APKBUILD
index ade11be97..22ca298d3 100644
--- a/user/perl-test-tcp/APKBUILD
+++ b/user/perl-test-tcp/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Testing library for Perl code using TCP"
url="https://metacpan.org/release/Test-TCP"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-test-sharedfork"
-makedepends=""
+depends="perl perl-test-sharedfork"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-time/APKBUILD b/user/perl-test-time/APKBUILD
index 51c9ec1e2..0e30b1874 100644
--- a/user/perl-test-time/APKBUILD
+++ b/user/perl-test-time/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Test-Time"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-trailingspace/APKBUILD b/user/perl-test-trailingspace/APKBUILD
index e84ca6bc1..3da940f14 100644
--- a/user/perl-test-trailingspace/APKBUILD
+++ b/user/perl-test-trailingspace/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Test for trailing spaces in Perl source files"
url="https://metacpan.org/release/Test-TrailingSpace"
arch="noarch"
license="MIT"
-depends="perl-file-find-object-rule"
-makedepends="perl-module-build"
+depends="perl perl-file-find-object-rule"
+makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-trap/APKBUILD b/user/perl-test-trap/APKBUILD
index fa119c353..fa4764ce1 100644
--- a/user/perl-test-trap/APKBUILD
+++ b/user/perl-test-trap/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Trap Perl exit codes, exceptions, and output"
url="https://metacpan.org/release/Test-Trap"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-data-dump"
-makedepends=""
+depends="perl perl-data-dump"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-v$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-v$pkgver"
diff --git a/user/perl-test-utf8/APKBUILD b/user/perl-test-utf8/APKBUILD
index 909e0fa45..408a847be 100644
--- a/user/perl-test-utf8/APKBUILD
+++ b/user/perl-test-utf8/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/pod/Test::utf8"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends="perl-module-install"
+makedepends="perl-dev perl-module-install"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-test-warnings/APKBUILD b/user/perl-test-warnings/APKBUILD
index 00af77820..978cdc674 100644
--- a/user/perl-test-warnings/APKBUILD
+++ b/user/perl-test-warnings/APKBUILD
@@ -5,14 +5,14 @@ _pkgreal=Test-Warnings
_author=ETHER
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
-pkgver=0.027
+pkgver=0.028
pkgrel=0
pkgdesc="Test for warnings and the lack of them"
url="https://metacpan.org/pod/Test::Warnings"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -31,4 +31,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="d8e5d2bbddd7119e0b5a45cb23451f664936e120ecb8c579ee5cdeada0aa20592d4f8aaeefce99c4e85052520edd75ccf095580a5a02979a33910ccf4ec57da9 Test-Warnings-0.027.tar.gz"
+sha512sums="6e8c1012eeebd3260d36ef0bf731a6351ce704a400e24709009bc72b07a4411d6725ea612e19ad55edca6d985e0ea8d9da3a51713b4c655e5783f3d9e6e39ab0 Test-Warnings-0.028.tar.gz"
diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD
index 1d5a2db4f..68d8b1555 100644
--- a/user/perl-test2-suite/APKBUILD
+++ b/user/perl-test2-suite/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test2-suite
_pkgreal=Test2-Suite
@@ -11,12 +11,12 @@ pkgdesc="Collection of Perl modules in the Test2 namespace"
url="https://metacpan.org/pod/Test2::Suite"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-importer perl-module-pluggable perl-scope-guard
+depends="perl perl-importer perl-module-pluggable perl-scope-guard
perl-sub-info perl-term-table perl-test-simple
perl-sub-name perl-term-readkey perl-term-size-any
perl-unicode-linebreak"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-text-diff/APKBUILD b/user/perl-text-diff/APKBUILD
index 394263c58..17b4f16d4 100644
--- a/user/perl-text-diff/APKBUILD
+++ b/user/perl-text-diff/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Perform diffs on files and record sets"
url="https://metacpan.org/pod/Text::Diff"
arch="noarch"
license="GPL-2.0+ OR Artistic-1.0-Perl"
-depends="perl-algorithm-diff"
-makedepends=""
+depends="perl perl-algorithm-diff"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-text-glob/APKBUILD b/user/perl-text-glob/APKBUILD
index 310656f6c..ca186c590 100644
--- a/user/perl-text-glob/APKBUILD
+++ b/user/perl-text-glob/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Text-Glob"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-text-sprintf-named/APKBUILD b/user/perl-text-sprintf-named/APKBUILD
index 5b2e0125f..8d7ff5b92 100644
--- a/user/perl-text-sprintf-named/APKBUILD
+++ b/user/perl-text-sprintf-named/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="sprintf-like function for Perl with named conversions"
url="https://metacpan.org/release/Text-Sprintf-Named"
arch="noarch"
license="MIT"
-depends="perl-module-build"
-makedepends=""
+depends="perl perl-module-build"
checkdepends="perl-test-warn"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-text-template/APKBUILD b/user/perl-text-template/APKBUILD
index 076f1eee5..7afc5ca1d 100644
--- a/user/perl-text-template/APKBUILD
+++ b/user/perl-text-template/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-text-template
_pkgreal=Text-Template
@@ -11,8 +11,8 @@ pkgdesc="Perl module for expanding embedded Perl in templates"
url="https://metacpan.org/pod/Text::Template"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-test-more-utf8 perl-test-warnings"
-makedepends=""
+depends="perl perl-test-more-utf8 perl-test-warnings"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-throwable/APKBUILD b/user/perl-throwable/APKBUILD
index d5712bfa5..8a919288c 100644
--- a/user/perl-throwable/APKBUILD
+++ b/user/perl-throwable/APKBUILD
@@ -11,8 +11,9 @@ pkgdesc="Role for Perl classes that can be thrown"
url="https://metacpan.org/release/Throwable"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-devel-stacktrace perl-module-runtime perl-moo perl-sub-quote"
-makedepends=""
+depends="perl perl-devel-stacktrace perl-module-runtime perl-moo
+ perl-sub-quote"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-time-duration-parse/APKBUILD b/user/perl-time-duration-parse/APKBUILD
index b7bd2c169..7f9c5b6f7 100644
--- a/user/perl-time-duration-parse/APKBUILD
+++ b/user/perl-time-duration-parse/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Parse strings in Perl that represent time durations"
url="https://metacpan.org/release/Time-Duration-Parse"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-exporter-lite perl-time-duration"
-makedepends=""
+depends="perl perl-exporter-lite perl-time-duration"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-time-duration/APKBUILD b/user/perl-time-duration/APKBUILD
index cdeeaa508..469a307d3 100644
--- a/user/perl-time-duration/APKBUILD
+++ b/user/perl-time-duration/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/Time-Duration"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-timedate/APKBUILD b/user/perl-timedate/APKBUILD
index f1e1e2bc0..8dbb85e6d 100644
--- a/user/perl-timedate/APKBUILD
+++ b/user/perl-timedate/APKBUILD
@@ -12,9 +12,11 @@ url="https://metacpan.org/release/TimeDate"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz
+ y2020.patch
+ "
builddir="$srcdir/$_pkgreal-$pkgver"
build() {
@@ -31,4 +33,5 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="c6aa7d57fbe82260c7455f74f6dfda55f7c93d7a75914bafb9d09ebfb83b5f57f6bc1e332ab0764d7688d857eb022b0f5e92cf5b685d809c63cdfa93a8d2c221 TimeDate-2.30.tar.gz"
+sha512sums="c6aa7d57fbe82260c7455f74f6dfda55f7c93d7a75914bafb9d09ebfb83b5f57f6bc1e332ab0764d7688d857eb022b0f5e92cf5b685d809c63cdfa93a8d2c221 TimeDate-2.30.tar.gz
+864e1dc96015b072008687205c49b5b7ef7966ca167fca3c5d745f90dea0bf75cdc101ab314f4de06e7fd17a4401bdf367b2966b8a1e9dfaecf60e787f739ec9 y2020.patch"
diff --git a/user/perl-timedate/y2020.patch b/user/perl-timedate/y2020.patch
new file mode 100644
index 000000000..b9c62d903
--- /dev/null
+++ b/user/perl-timedate/y2020.patch
@@ -0,0 +1,11 @@
+--- TimeDate-2.30/t/getdate.t.old 2009-12-12 12:30:06.000000000 +0000
++++ TimeDate-2.30/t/getdate.t 2020-01-19 22:18:19.279039627 +0000
+@@ -156,7 +156,7 @@
+ !;
+
+ require Time::Local;
+-my $offset = Time::Local::timegm(0,0,0,1,0,70);
++my $offset = Time::Local::timegm(0,0,0,1,0,1970);
+
+ @data = split(/\n/, $data);
+
diff --git a/user/perl-type-tiny/APKBUILD b/user/perl-type-tiny/APKBUILD
index 44ae6df66..e33309a48 100644
--- a/user/perl-type-tiny/APKBUILD
+++ b/user/perl-type-tiny/APKBUILD
@@ -5,14 +5,14 @@ _pkgreal=Type-Tiny
_author=TOBYINK
_au=${_author%%"${_author#??}"}
_a=${_author%%"${_author#?}"}
-pkgver=1.006000
+pkgver=1.008001
pkgrel=0
pkgdesc="Tiny Moo(se) compatible type constraint"
url="https://metacpan.org/release/Type-Tiny"
arch="noarch"
license="Artistic-1.0-Perl"
-depends="perl-exporter-tiny"
-makedepends=""
+depends="perl perl-exporter-tiny"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
@@ -31,4 +31,4 @@ package() {
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
}
-sha512sums="77502a89baf6d4999e4bbb84fff21f46d03f65602bf472e8c5d37db6601106d2395645b76f997b796ffc6fadbbb3b119bed09060cc1bb9dafaf6ed9342392905 Type-Tiny-1.006000.tar.gz"
+sha512sums="279aabdf387aca3398e513e88e2ba5ee36a8dfbcba4ea78edb933ac9cd7fd5b8284dc5d509c318361de5edd83ae3084cf7a1cd2b621ff88884eca2680a739921 Type-Tiny-1.008001.tar.gz"
diff --git a/user/perl-types-serialiser/APKBUILD b/user/perl-types-serialiser/APKBUILD
index 1aab72a8d..b9a70810d 100644
--- a/user/perl-types-serialiser/APKBUILD
+++ b/user/perl-types-serialiser/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Simple data types for common serialisation formats"
url="https://metacpan.org/pod/Types::Serialiser"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
-depends="perl-common-sense"
-makedepends=""
+depends="perl perl-common-sense"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-universal-require/APKBUILD b/user/perl-universal-require/APKBUILD
index 6b573becc..73e7604d4 100644
--- a/user/perl-universal-require/APKBUILD
+++ b/user/perl-universal-require/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/UNIVERSAL-require"
arch="noarch"
license="Artistic-1.0-Perl"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-www-form-urlencoded/APKBUILD b/user/perl-www-form-urlencoded/APKBUILD
index e10d4a7fd..5a53fa096 100644
--- a/user/perl-www-form-urlencoded/APKBUILD
+++ b/user/perl-www-form-urlencoded/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/WWW-Form-UrlEncoded"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl"
-makedepends="perl-module-build"
+makedepends="perl-dev perl-module-build"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-x11-xcb/APKBUILD b/user/perl-x11-xcb/APKBUILD
index e553e620a..ccf8703c3 100644
--- a/user/perl-x11-xcb/APKBUILD
+++ b/user/perl-x11-xcb/APKBUILD
@@ -10,14 +10,14 @@ pkgrel=0
pkgdesc="Perl bindings for libxcb"
url="https://metacpan.org/pod/X11::XCB"
arch="all"
+options="!check" # Tests require a running X server
license="Artistic-1.0-Perl AND GPL-2.0"
-depends="perl-extutils-pkgconfig perl-extutils-depends
+depends="perl perl-extutils-pkgconfig perl-extutils-depends
perl-xs-object-magic perl-data-dump perl-xml-simple
perl-xml-descent perl-mouse perl-mousex-nativetraits"
+checkdepends="perl-test-deep perl-test-exception"
makedepends="perl-dev perl-xs-object-magic-dev libxcb-dev
xcb-util-dev xcb-util-wm-dev"
-checkdepends="perl-test-deep perl-test-exception"
-options="!check" # Tests require a running X server
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-xml-descent/APKBUILD b/user/perl-xml-descent/APKBUILD
index 7b3f99c12..ad385fbcf 100644
--- a/user/perl-xml-descent/APKBUILD
+++ b/user/perl-xml-descent/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Recursive descent XML parsing"
url="https://metacpan.org/pod/XML::Descent"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
-depends="perl-xml-tokeparser"
-makedepends=""
+depends="perl perl-xml-tokeparser"
checkdepends="perl-test-pod perl-test-differences"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-xml-namespacesupport/APKBUILD b/user/perl-xml-namespacesupport/APKBUILD
index b55e4123a..4de6e775e 100644
--- a/user/perl-xml-namespacesupport/APKBUILD
+++ b/user/perl-xml-namespacesupport/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-xml-namespacesupport
_pkgreal=XML-NamespaceSupport
diff --git a/user/perl-xml-parser-lite/APKBUILD b/user/perl-xml-parser-lite/APKBUILD
index ad215f020..752e667ca 100644
--- a/user/perl-xml-parser-lite/APKBUILD
+++ b/user/perl-xml-parser-lite/APKBUILD
@@ -13,7 +13,7 @@ arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl"
checkdepends="perl-test-requires"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-xml-sax-base/APKBUILD b/user/perl-xml-sax-base/APKBUILD
index 6cde82c47..a44b135d6 100644
--- a/user/perl-xml-sax-base/APKBUILD
+++ b/user/perl-xml-sax-base/APKBUILD
@@ -12,7 +12,7 @@ url="https://metacpan.org/release/XML-SAX-Base"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
depends="perl"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-xml-sax/APKBUILD b/user/perl-xml-sax/APKBUILD
index f9fbad337..811d79713 100644
--- a/user/perl-xml-sax/APKBUILD
+++ b/user/perl-xml-sax/APKBUILD
@@ -11,10 +11,10 @@ pkgdesc="Perl SAX parser"
url="https://metacpan.org/release/XML-SAX"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-1.0+"
-depends="perl-xml-namespacesupport perl-xml-sax-base"
-makedepends=""
-install="$pkgname.post-install $pkgname.pre-deinstall"
+depends="perl perl-xml-namespacesupport perl-xml-sax-base"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
+install="$pkgname.post-install $pkgname.pre-deinstall"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz
install-fix.patch
"
diff --git a/user/perl-xml-simple/APKBUILD b/user/perl-xml-simple/APKBUILD
index 14c99dbf7..62d543912 100644
--- a/user/perl-xml-simple/APKBUILD
+++ b/user/perl-xml-simple/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-xml-simple
_pkgreal=XML-Simple
diff --git a/user/perl-xml-tokeparser/APKBUILD b/user/perl-xml-tokeparser/APKBUILD
index 601954f4e..6be97aaa5 100644
--- a/user/perl-xml-tokeparser/APKBUILD
+++ b/user/perl-xml-tokeparser/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="Simplified interface to XML::Parser"
url="https://metacpan.org/pod/XML::TokeParser"
arch="noarch"
license="Artistic-1.0-Perl AND GPL-2.0"
-depends="perl-xml-parser"
-makedepends=""
+depends="perl perl-xml-parser"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-xml-twig/APKBUILD b/user/perl-xml-twig/APKBUILD
index e4c5b6c02..b8307f27e 100644
--- a/user/perl-xml-twig/APKBUILD
+++ b/user/perl-xml-twig/APKBUILD
@@ -11,8 +11,8 @@ pkgdesc="XML, the Perl way"
url="https://metacpan.org/release/XML-Twig"
arch="noarch"
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-xml-parser"
-makedepends=""
+depends="perl perl-xml-parser"
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-xmlrpc-lite/APKBUILD b/user/perl-xmlrpc-lite/APKBUILD
index 3372e58e0..dc2f7bc8d 100644
--- a/user/perl-xmlrpc-lite/APKBUILD
+++ b/user/perl-xmlrpc-lite/APKBUILD
@@ -10,10 +10,11 @@ pkgrel=0
pkgdesc="Lightweight Perl implementation of XML-RPC"
url="https://metacpan.org/release/XMLRPC-Lite"
arch="noarch"
+options="!check" # https://rt.cpan.org/Public/Bug/Display.html?id=127761
license="Artistic-1.0-Perl OR GPL-2.0-only"
-depends="perl-soap-lite"
+depends="perl perl-soap-lite"
checkdepends="perl-dev"
-makedepends=""
+makedepends="perl-dev"
subpackages="$pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/perl-xs-object-magic/APKBUILD b/user/perl-xs-object-magic/APKBUILD
index bfbd8ef9e..f708427dd 100644
--- a/user/perl-xs-object-magic/APKBUILD
+++ b/user/perl-xs-object-magic/APKBUILD
@@ -11,9 +11,9 @@ pkgdesc="Opaque, extensible XS pointer backed objects using sv_magic"
url="https://metacpan.org/pod/XS::Object::Magic"
arch="all"
license="Artistic-1.0-Perl AND GPL-2.0"
-depends="perl-module-install perl-extutils-depends"
-makedepends="perl-dev"
+depends="perl perl-module-install perl-extutils-depends"
checkdepends="perl-test-fatal"
+makedepends="perl-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://cpan.metacpan.org/authors/id/$_a/$_au/$_author/$_pkgreal-$pkgver.tar.gz"
builddir="$srcdir/$_pkgreal-$pkgver"
diff --git a/user/phonon-vlc/APKBUILD b/user/phonon-vlc/APKBUILD
index adb9914ee..de6f49d36 100644
--- a/user/phonon-vlc/APKBUILD
+++ b/user/phonon-vlc/APKBUILD
@@ -28,7 +28,7 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DPHONON_BUILD_PHONON4QT5=True \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/physfs/APKBUILD b/user/physfs/APKBUILD
index 86f57e0cc..827e65a44 100644
--- a/user/physfs/APKBUILD
+++ b/user/physfs/APKBUILD
@@ -8,7 +8,7 @@ url="https://www.icculus.org/physfs"
arch="all"
license="Zlib"
depends=""
-makedepends=""
+makedepends="cmake"
subpackages="$pkgname-dev $pkgname-tools"
source="https://icculus.org/physfs/downloads/physfs-$pkgver.tar.bz2"
@@ -18,12 +18,11 @@ build() {
fi
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_LIBDIR=lib \
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/physlock/APKBUILD b/user/physlock/APKBUILD
index f9a5f9574..19858bde7 100644
--- a/user/physlock/APKBUILD
+++ b/user/physlock/APKBUILD
@@ -13,7 +13,8 @@ makedepends="linux-headers linux-pam-dev utmps-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/muennich/physlock/archive/v$pkgver.tar.gz
utmps.patch
- makefile.patch"
+ makefile.patch
+ "
build() {
make
diff --git a/user/picocom/APKBUILD b/user/picocom/APKBUILD
index b74fb608e..289d7d353 100644
--- a/user/picocom/APKBUILD
+++ b/user/picocom/APKBUILD
@@ -6,7 +6,7 @@ pkgrel=0
pkgdesc="Minimal dumb-terminal emulation program"
url="https://github.com/npat-efault/picocom"
arch="all"
-options="!check" # No test suite
+options="!check" # No test suite.
license="BSD-2-Clause AND GPL-2.0+"
depends=""
makedepends=""
diff --git a/user/pidgin-otr/APKBUILD b/user/pidgin-otr/APKBUILD
index a1369188d..6d713b2ee 100644
--- a/user/pidgin-otr/APKBUILD
+++ b/user/pidgin-otr/APKBUILD
@@ -13,7 +13,6 @@ subpackages=""
source="https://otr.cypherpunks.ca/pidgin-otr-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/pidgin/APKBUILD b/user/pidgin/APKBUILD
index 5921247b8..83ee02c14 100644
--- a/user/pidgin/APKBUILD
+++ b/user/pidgin/APKBUILD
@@ -7,15 +7,14 @@ url="http://pidgin.im/"
arch="all"
license="GPL-2.0-only"
depends="gst-plugins-base"
-makedepends="gtk+-dev perl-dev libsm-dev startup-notification-dev gtkspell-dev
+makedepends="gtk+2.0-dev perl-dev libsm-dev startup-notification-dev
libxml2-dev libidn-dev gnutls-dev dbus-dev dbus-glib-dev gstreamer-dev
- cyrus-sasl-dev ncurses-dev nss-dev tcl-dev tk-dev intltool
+ cyrus-sasl-dev ncurses-dev nss-dev tcl-dev tk-dev intltool gtkspell-dev
gst-plugins-base-dev farstream-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang finch libpurple"
source="https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
LIBS="-lX11 -ltinfo" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -42,12 +41,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/pigz/APKBUILD b/user/pigz/APKBUILD
index 107019248..0f8ea3a0b 100644
--- a/user/pigz/APKBUILD
+++ b/user/pigz/APKBUILD
@@ -7,23 +7,21 @@ pkgdesc="Parallel implementation of gzip"
url="http://zlib.net/pigz/"
arch="all"
license="zlib"
+depends=""
makedepends="zlib-dev"
subpackages="$pkgname-doc"
source="http://zlib.net/pigz/pigz-$pkgver.tar.gz"
build() {
- cd "$builddir"
export CXXFLAGS="$CXXFLAGS -std=gnu++98"
make
}
check() {
- cd "$builddir"
make tests
}
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/usr/bin
mkdir -p "$pkgdir"/usr/share/man/man1
for i in pigz unpigz; do
diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD
index 4d7883931..afa6daf78 100644
--- a/user/plasma-desktop/APKBUILD
+++ b/user/plasma-desktop/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=plasma-desktop
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Modern, functional, integrated libre desktop environment"
url="https://www.kde.org/plasma-desktop"
@@ -9,25 +9,25 @@ arch="all"
options="!check" # Test suite fails due to keyboard layouts
license="GPL-2.0 LGPL-2.1"
# theme/visual dependencies
-depends="breeze breeze-icons oxygen ttf-liberation"
+depends="breeze breeze-icons kirigami2 oxygen qt5-qtquickcontrols2
+ ttf-liberation"
# shell/QML dependencies
depends="$depends kde-cli-tools kded kwin qt5-qtgraphicaleffects setxkbmap"
# Good Ideas™ to have
-depends="$depends consolekit kdeclarative"
+depends="$depends consolekit2 kdeclarative"
makedepends="cmake qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtx11extras-dev
qt5-qtsvg-dev kdelibs4support-dev xf86-input-synaptics-dev
- kauth-dev plasma-framework-dev kdoctools-dev ki18n-dev
+ kauth-dev plasma-framework-dev kdoctools-dev ki18n-dev libkworkspace-dev
kcmutils-dev knewstuff-dev knotifications-dev knotifyconfig-dev
attica-dev kwallet-dev krunner-dev kglobalaccel-dev kdeclarative-dev
kpeople-dev kdbusaddons-dev kactivities-dev kactivities-stats-dev
kconfig-dev kitemmodels-dev plasma-workspace-dev xf86-input-evdev-dev
libxkbcommon-dev pulseaudio-dev libcanberra-dev libxkbfile-dev
xorg-server-dev kwin-dev kscreenlocker-dev baloo-dev xcb-util-image-dev
- xf86-input-libinput-dev breeze-dev xkeyboard-config extra-cmake-modules"
+ xf86-input-libinput-dev breeze-dev xkeyboard-config extra-cmake-modules
+ kirigami2-dev libksysguard-dev qt5-qtquickcontrols2-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz
- cmake-fixes.patch
- "
+source="https://download.kde.org/unstable/plasma/$pkgver/plasma-desktop-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -41,7 +41,7 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_TESTING=OFF \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -53,5 +53,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="dc55d9a894c52c44cd2aff844793e038dd66854862a212d47dfb0144dd489c3ae8d2c4e289a1e76c3d31ca68a8543bb511623f96617db799d28009736591c58f plasma-desktop-5.12.8.tar.xz
-45119bbd7b6f7803323410acac6c5cb2be232f776e6009938e932976091ca188f4a52ba0bca814212353856a8eb87700d86b2452d9cb925c4f6f1bf3577065b7 cmake-fixes.patch"
+sha512sums="8d62506fbe2c276e26a21e107efa192661c9839b94762595b465f515867ba13b17265a3f193ccab2523812c62da5c6c4900fa8f25c50f9ae63e1a5883db97c1b plasma-desktop-5.17.90.tar.xz"
diff --git a/user/plasma-desktop/cmake-fixes.patch b/user/plasma-desktop/cmake-fixes.patch
deleted file mode 100644
index c6457351a..000000000
--- a/user/plasma-desktop/cmake-fixes.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From bcd8015eaf3638fca0e369955aa1a4290d079ef8 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 31 Mar 2019 19:49:40 +0200
-Subject: Harmonize use of HAVE_X11, using cmakedefine01.
-
-Fixes: config-X11.h:44:18: warning: "TRUE" is not defined, evaluates to 0 [-Wundef]
-
-It should *all* be ported to cmakedefine01...
----
- CMakeLists.txt | 3 +++
- config-X11.h.cmake | 2 +-
- kcms/fonts/fonts.cpp | 4 ++--
- kcms/fonts/fonts.h | 4 ++--
- 4 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 036d781..df43295 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -88,6 +88,9 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
- TYPE REQUIRED
- PURPOSE "Required for building the X11 based workspace"
- )
-+if(X11_FOUND)
-+ set(HAVE_X11 1)
-+endif()
-
- find_package(UDev)
- set_package_properties(UDev PROPERTIES DESCRIPTION "UDev library"
-diff --git a/config-X11.h.cmake b/config-X11.h.cmake
-index 60286dd..ae8978a 100644
---- a/config-X11.h.cmake
-+++ b/config-X11.h.cmake
-@@ -41,4 +41,4 @@
- #cmakedefine HAS_RANDR_1_3 1
-
- /* Define if you have X11 at all */
--#define HAVE_X11 ${X11_FOUND}
-\ No newline at end of file
-+#cmakedefine01 HAVE_X11
-diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
-index f336518..218c3eb 100644
---- a/kcms/fonts/fonts.cpp
-+++ b/kcms/fonts/fonts.cpp
-@@ -224,7 +224,7 @@
- }
-
- /**** FontAASettings ****/
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- FontAASettings::FontAASettings(QWidget *parent)
- : QDialog(parent),
- changesMade(false)
-@@ -501,13 +501,13 @@
-
- void FontAASettings::changed()
- {
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- changesMade = true;
- enableWidgets();
- #endif
- }
-
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- int FontAASettings::exec()
- {
- const int i = QDialog::exec();
-@@ -643,7 +643,7 @@
- QGridLayout *lay = new QGridLayout();
- layout->addLayout(lay);
- lay->setColumnStretch(3, 10);
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- QLabel *label = 0L;
- label = new QLabel(i18n("Use a&nti-aliasing:"), this);
- label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
-@@ -692,7 +692,7 @@
- lay->addWidget(spinboxDpi, 1, 1);
- layout->addStretch(1);
-
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- aaSettings = new FontAASettings(this);
- #endif
-
-@@ -720,7 +720,7 @@
- fontUseList.at(i)->setDefault();
- }
-
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- useAA = AASystem;
- cbAA->setCurrentIndex(useAA);
- aaSettings->defaults();
-@@ -739,7 +739,7 @@
- (*it)->readFont();
- }
-
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- useAA_original = useAA = aaSettings->load() ? AAEnabled : AADisabled;
- cbAA->setCurrentIndex(useAA);
- #endif
-@@ -762,7 +762,7 @@
- spinboxDpi->setValue(dpicfg);
- dpi_original = dpicfg;
- };
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- if (cfgfonts.readEntry("dontChangeAASettings", true)) {
- useAA_original = useAA = AASystem;
- cbAA->setCurrentIndex(useAA);
-@@ -791,7 +791,7 @@
- } else {
- cfgfonts.writeEntry("forceFontDPI", dpi);
- }
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- cfgfonts.writeEntry("dontChangeAASettings", cbAA->currentIndex() == AASystem);
- #endif
- cfgfonts.sync();
-@@ -817,7 +817,7 @@
- // Don't overwrite global settings unless explicitly asked for - e.g. the system
- // fontconfig setup may be much more complex than this module can provide.
- // TODO: With AASystem the changes already made by this module should be reverted somehow.
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- bool aaSave = false;
- if (cbAA->currentIndex() == AAEnabled ) {
- aaSave = aaSettings->save(KXftConfig::AntiAliasing::Enabled);
-@@ -870,7 +870,7 @@
-
- void KFonts::slotUseAntiAliasing()
- {
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- useAA = static_cast< AASetting >(cbAA->currentIndex());
- aaSettingsButton->setEnabled(useAA == AAEnabled);
- emit changed(true);
-@@ -879,7 +879,7 @@
-
- void KFonts::slotCfgAa()
- {
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- if (aaSettings->exec()) {
- emit changed(true);
- }
-diff --git a/kcms/fonts/fonts.h b/kcms/fonts/fonts.h
-index f7ade6b..d760e52 100644
---- a/kcms/fonts/fonts.h
-+++ b/kcms/fonts/fonts.h
-@@ -80,7 +80,7 @@
-
- public:
-
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- FontAASettings(QWidget *parent);
-
- bool save(KXftConfig::AntiAliasing::State aaState);
-@@ -135,7 +135,7 @@
- void slotCfgAa();
-
- private:
--#if defined(HAVE_FONTCONFIG) && defined (HAVE_X11)
-+#if defined(HAVE_FONTCONFIG) && HAVE_X11
- enum AASetting { AAEnabled, AASystem, AADisabled };
- AASetting useAA, useAA_original;
- QComboBox *cbAA;
---
-cgit v1.1
diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD
index 1157879df..840941c95 100644
--- a/user/plasma-framework/APKBUILD
+++ b/user/plasma-framework/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=plasma-framework
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Frameworks for the KDE Plasma 5 desktop environment"
url="https://www.kde.org/"
@@ -43,4 +43,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a8b3cd9921b759631d717af365ef64e34a9b00db9237a4c2f4006a15bcf12c3f34f4d19bef8b50aaaa7e47ceb8055617cfb0a1e76783d9287f03127df1241f85 plasma-framework-5.65.0.tar.xz"
+sha512sums="b6a192e19e4cf4e9172aa3ac6697f58a6d3b198885929c2fd0da0732743153ee17d3d489328b2bffc7f48f5674369c20a025c4ef47aae10a0b50d03a660a7822 plasma-framework-5.66.0.tar.xz"
diff --git a/user/plasma-integration/APKBUILD b/user/plasma-integration/APKBUILD
index fbd0642e0..3b4116ae0 100644
--- a/user/plasma-integration/APKBUILD
+++ b/user/plasma-integration/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=plasma-integration
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Qt platform theme plugin for Plasma"
url="https://www.kde.org/"
@@ -14,7 +14,7 @@ makedepends="cmake extra-cmake-modules python3 qt5-qtbase-dev libxcursor-dev
kiconthemes-dev knotifications-dev kwayland-dev kwidgetsaddons-dev
kwindowsystem-dev breeze-dev qt5-qtquickcontrols2-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-integration-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/plasma-integration-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -29,7 +29,7 @@ build() {
-DCMAKE_C_FLAGS="$CFLAGS" \
-DCMAKE_DISABLE_FIND_PACKAGE_FontNotoSans=true \
-DCMAKE_DISABLE_FIND_PACKAGE_FontHack=true \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -41,4 +41,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="81c0c14680eee8b81e303ebf874dec11b43cee65f210eed90594a5496f83d59aa8527bb31aab82cc5a045c37ab954b07c6c023083b134d755b8b02bf0c041938 plasma-integration-5.12.8.tar.xz"
+sha512sums="a958c1d5817cc36ba6b62184d6b9ce7cc486a47334e93d00b50404d2a9940985eab616e58c1aceba0d20f81480baaf5804cbc160c3efcd60c35ac705fe6d51c9 plasma-integration-5.17.90.tar.xz"
diff --git a/user/plasma-workspace-wallpapers/APKBUILD b/user/plasma-workspace-wallpapers/APKBUILD
index e42251f11..b1321d956 100644
--- a/user/plasma-workspace-wallpapers/APKBUILD
+++ b/user/plasma-workspace-wallpapers/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=plasma-workspace-wallpapers
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Default wallpapers from KDE"
url="https://www.KDE.org/"
@@ -10,7 +10,7 @@ license="LGPL-3.0-only"
depends=""
makedepends="cmake extra-cmake-modules"
subpackages=""
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-wallpapers-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/plasma-workspace-wallpapers-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -23,7 +23,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -35,4 +35,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="9ac764a16eead6cebbeb720548b15946eba619d5de1d2bb5f74f65f85fa14565e42a26c91a23a3473d4ad4b0c819c0a50a92891018b8ee29e5909229932f1622 plasma-workspace-wallpapers-5.12.8.tar.xz"
+sha512sums="71b6df604d868038b59bc12e649404e460e34d969c2fd3648b98afb936c9d3c6f9370c35ccded208fa728a409ae5d5dd107419ff2366b192a60ee35baa01ecf8 plasma-workspace-wallpapers-5.17.90.tar.xz"
diff --git a/user/plasma-workspace/APKBUILD b/user/plasma-workspace/APKBUILD
index 036b2b456..971458789 100644
--- a/user/plasma-workspace/APKBUILD
+++ b/user/plasma-workspace/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=plasma-workspace
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="KDE Plasma 5 workspace"
url="https://www.kde.org/plasma-desktop"
@@ -20,17 +20,19 @@ depends="$depends libdbusmenu-qt kcmutils kde-cli-tools kded kdesu kio-extras
depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev kdelibs4support-dev
kitemmodels-dev kservice-dev kwindowsystem-dev"
makedepends="$depends_dev cmake extra-cmake-modules qt5-qtscript-dev
- iso-codes-dev libdbusmenu-qt-dev libxtst-dev xcb-util-image-dev
+ iso-codes-dev libdbusmenu-qt-dev libqalculate-dev libxtst-dev
+ xcb-util-image-dev libkworkspace-dev
baloo-dev kactivities-dev kcmutils-dev kcrash-dev kdbusaddons-dev
kdeclarative-dev kdesu-dev kdoctools-dev kglobalaccel-dev kholidays-dev
kidletime-dev kjsembed-dev knewstuff-dev knotifyconfig-dev kpackage-dev
krunner-dev kscreenlocker-dev ktexteditor-dev ktextwidgets-dev
kwallet-dev kwayland-dev kwin-dev kxmlrpcclient-dev libksysguard-dev
- plasma-framework-dev prison-dev"
+ plasma-framework-dev prison-dev kactivities-stats-dev kpeople-dev
+ kirigami2-dev kuserfeedback-dev libkscreen-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
- cmake-fixes.patch
+source="https://download.kde.org/unstable/plasma/$pkgver/plasma-workspace-$pkgver.tar.xz
+ libkworkspace.patch
"
build() {
@@ -45,7 +47,7 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_TESTING=OFF \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -57,5 +59,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="c19d338117c5d9b05581fc1be7d99fc60f4453a009a04ddf3609add1fef7ad08bdd0d0c19c0f4151484253036cc444d8301c3fb8ee0d29d8ecc19d9929a9ff8b plasma-workspace-5.12.8.tar.xz
-39ea169f50b98fd2dd246396133a3e8d9c844409338c9c3ecd79474945377886c5d1050205ad73c3d8c789315e8a4353311bafa9f1ddd22f25403b3ed7f30fde cmake-fixes.patch"
+sha512sums="8fc014e90dca30b54122ef0e83c08faabbb41a3ba5a511e4713db3898acd18faf53652ff766ffbaa70d1da3053618b70882255afeca060cd92e06d0bdf4e1934 plasma-workspace-5.17.90.tar.xz
+f58b88928fd68518bc0524db35388cb0f0dbc2a55d85fc47e92ce7fcbaf9b155482736e282bd84104ceecc625406845840128c8d0fcd2a4d5a854673964cd94f libkworkspace.patch"
diff --git a/user/plasma-workspace/cmake-fixes.patch b/user/plasma-workspace/cmake-fixes.patch
deleted file mode 100644
index 16307ce31..000000000
--- a/user/plasma-workspace/cmake-fixes.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From c534fdf1ba34d0ea8a08b9b5266384a3243271e0 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 10 Feb 2019 20:21:57 +0100
-Subject: Harmonize usage of HAVE_X11, using #if and #cmakedefine01 everywhere
-
-I got "#define HAVE_X11 TRUE" and errors because of that where #if was
-used.
-
-This also obeys the logic that HAVE_X11 is set (in the toplevel
-CMakeLists.txt) not only when X11_FOUND but also when XCB is found.
----
- appmenu/appmenu.cpp | 2 +-
- config-X11.h.cmake | 2 +-
- libkworkspace/config-libkworkspace.h.cmake | 2 +-
- runners/windows/config-windowsrunner.h.cmake | 2 +-
- shell/scripting/appinterface.cpp | 2 +-
- soliduiserver/soliduiserver.cpp | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/appmenu/appmenu.cpp b/appmenu/appmenu.cpp
-index 7c956c6..4ab7106 100644
---- a/appmenu/appmenu.cpp
-+++ b/appmenu/appmenu.cpp
-@@ -106,7 +106,7 @@ AppMenuModule::~AppMenuModule() = default;
-
- void AppMenuModule::slotWindowRegistered(WId id, const QString &serviceName, const QDBusObjectPath &menuObjectPath)
- {
--#ifdef HAVE_X11
-+#if HAVE_X11
- if (KWindowSystem::isPlatformX11()) {
- auto *c = QX11Info::connection();
-
-diff --git a/config-X11.h.cmake b/config-X11.h.cmake
-index 60286dd..ae8978a 100644
---- a/config-X11.h.cmake
-+++ b/config-X11.h.cmake
-@@ -41,4 +41,4 @@
- #cmakedefine HAS_RANDR_1_3 1
-
- /* Define if you have X11 at all */
--#define HAVE_X11 ${X11_FOUND}
-+#cmakedefine01 HAVE_X11
-diff --git a/libkworkspace/config-libkworkspace.h.cmake b/libkworkspace/config-libkworkspace.h.cmake
-index 36a826e..c3ae6d7 100644
---- a/libkworkspace/config-libkworkspace.h.cmake
-+++ b/libkworkspace/config-libkworkspace.h.cmake
-@@ -1,2 +1,2 @@
- /* Define if you have X11 at all */
--#define HAVE_X11 ${X11_FOUND}
-\ No newline at end of file
-+#cmakedefine01 HAVE_X11
-diff --git a/runners/windows/config-windowsrunner.h.cmake b/runners/windows/config-windowsrunner.h.cmake
-index 36a826e..c3ae6d7 100644
---- a/runners/windows/config-windowsrunner.h.cmake
-+++ b/runners/windows/config-windowsrunner.h.cmake
-@@ -1,2 +1,2 @@
- /* Define if you have X11 at all */
--#define HAVE_X11 ${X11_FOUND}
-\ No newline at end of file
-+#cmakedefine01 HAVE_X11
-diff --git a/shell/scripting/appinterface.cpp b/shell/scripting/appinterface.cpp
-index bd66cd2..a0ad73c 100644
---- a/shell/scripting/appinterface.cpp
-+++ b/shell/scripting/appinterface.cpp
-@@ -37,7 +37,7 @@
- #include <windows.h>
- #endif
-
--#ifdef HAVE_X11
-+#if HAVE_X11
- #include <X11/Xlib.h>
- #include <fixx11h.h>
- #endif
-diff --git a/soliduiserver/soliduiserver.cpp b/soliduiserver/soliduiserver.cpp
-index 3ec09c0..d06a1e6 100644
---- a/soliduiserver/soliduiserver.cpp
-+++ b/soliduiserver/soliduiserver.cpp
-@@ -219,7 +219,7 @@ void SolidUiServer::reparentDialog(QWidget *dialog, WId wId, const QString &appI
-
- KWindowSystem::setMainWindow(dialog, wId); // correct, set dialog parent
-
--#ifdef HAVE_X11
-+#if HAVE_X11
- if (modal) {
- KWindowSystem::setState(dialog->winId(), NET::Modal);
- } else {
---
-cgit v1.1
-
diff --git a/user/plasma-workspace/libkworkspace.patch b/user/plasma-workspace/libkworkspace.patch
new file mode 100644
index 000000000..e8e3d93b6
--- /dev/null
+++ b/user/plasma-workspace/libkworkspace.patch
@@ -0,0 +1,35 @@
+From 4717089b68c386446be240f463f2f13e7024468b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 22 Oct 2018 10:35:10 +0200
+Subject: [PATCH] libkworkspace: Allow standalone build
+
+---
+ CMakeLists.txt | 6 +++-
+ 1 file changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e587a386..d1a63527 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,6 +63,7 @@ set_package_properties(KF5Baloo PROPERTIES DESCRIPTION "File Searching"
+
+ find_package(KF5TextEditor)
+ find_package(KWinDBusInterface CONFIG REQUIRED)
++find_package(LibKWorkspace 5.17.90)
+
+ find_package(KScreenLocker 5.17.90 REQUIRED)
+ find_package(ScreenSaverDBusInterface CONFIG REQUIRED)
+@@ -151,7 +151,10 @@ endif()
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+
+ add_subdirectory(doc)
+-add_subdirectory(libkworkspace)
++if(NOT LibKWorkspace_FOUND)
++ message(STATUS "System LibKWorkspace not found, using bundled.")
++ add_subdirectory(libkworkspace)
++endif()
+ add_subdirectory(libdbusmenuqt)
+ add_subdirectory(appmenu)
+
+--
+2.19.1
diff --git a/user/plib/APKBUILD b/user/plib/APKBUILD
index 46a6ce3d6..f195034f9 100644
--- a/user/plib/APKBUILD
+++ b/user/plib/APKBUILD
@@ -9,7 +9,7 @@ arch="all"
options="!dbg" # No shared libraries
license="LGPL-2.0+"
depends=""
-makedepends="libxi-dev libxmu-dev libxt-dev mesa-dev"
+makedepends="autoconf automake libtool libxi-dev libxmu-dev libxt-dev mesa-dev"
subpackages="$pkgname-dev"
source="http://plib.sourceforge.net/dist/plib-$pkgver.tar.gz
fix-openflight.patch
@@ -25,7 +25,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -37,12 +36,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/pluma/APKBUILD b/user/pluma/APKBUILD
index fde49287d..0f85b410b 100644
--- a/user/pluma/APKBUILD
+++ b/user/pluma/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pluma
pkgver=1.22.2
pkgrel=0
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
source="https://pub.mate-desktop.org/releases/${pkgver%.*}/pluma-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/pm-quirks/APKBUILD b/user/pm-quirks/APKBUILD
index 9b90ead00..c74eb36fd 100644
--- a/user/pm-quirks/APKBUILD
+++ b/user/pm-quirks/APKBUILD
@@ -6,16 +6,15 @@ pkgrel=0
pkgdesc="Quirks data for pm-utils"
url="https://pm-utils.freedesktop.org/wiki/"
arch="noarch"
-options="!check" # this is a bunch of data files for pm-utils, nothing to check
-license="GPL-2.0-only" # same as pm-utils, hopefully
+options="!check" # This is a bunch of data files for pm-utils, nothing to check
+license="GPL-2.0-only" # same as pm-utils, hopefully
depends="pm-utils"
makedepends=""
source="https://pm-utils.freedesktop.org/releases/$pkgname-$pkgver.tar.gz"
package() {
- cd "$srcdir"
install -m755 -d ${pkgdir}/usr/lib/pm-utils/video-quirks
- install -m644 video-quirks/*.quirkdb ${pkgdir}/usr/lib/pm-utils/video-quirks/
+ install -m644 "$srcdir"/video-quirks/*.quirkdb ${pkgdir}/usr/lib/pm-utils/video-quirks/
}
sha512sums="e20244fb72475945e08010d7ec19db2c017c1a04fa01d3d08c03d704d7f07f9c087bac6a5a44242cc8ed6cec5db47bc06a8862dd0f74088a565d37b6d7b95afc pm-quirks-20100619.tar.gz"
diff --git a/user/pm-utils/APKBUILD b/user/pm-utils/APKBUILD
index 6ff9fb41a..1ce9ff1d5 100644
--- a/user/pm-utils/APKBUILD
+++ b/user/pm-utils/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://pm-utils.freedesktop.org/releases/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/ponysay/APKBUILD b/user/ponysay/APKBUILD
index ffb32bf57..d0928a344 100644
--- a/user/ponysay/APKBUILD
+++ b/user/ponysay/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch
source="ponysay-$pkgver.tar.gz::https://github.com/erkin/ponysay/archive/$pkgver.tar.gz"
check() {
- cd "$builddir"
./dependency-test.sh
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --destdir="$pkgdir" --with-man \
--freedom=sloppy --without-fish --with-custom-env-python=python3
}
diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD
index 338c8ad2d..11c7f70da 100644
--- a/user/postfix/APKBUILD
+++ b/user/postfix/APKBUILD
@@ -1,22 +1,23 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=postfix
-pkgver=3.4.7
+pkgver=3.4.8
pkgrel=0
pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside"
url="http://www.postfix.org/"
arch="all"
+pkgusers="postfix"
+pkggroups="postfix postdrop"
options="!check suid" # No test suite.
license="EPL-2.0 AND IPL-1.0"
depends=""
makedepends="cyrus-sasl-dev db-dev icu-dev linux-pam-dev lmdb-dev openldap-dev
- openssl-dev pcre-dev perl postgresql-dev sqlite-dev"
-install="$pkgname.pre-install"
+ openssl-dev pcre-dev perl postgresql-dev sqlite-dev m4"
subpackages="$pkgname-doc $pkgname-ldap $pkgname-lmdb $pkgname-openrc
$pkgname-pgsql $pkgname-sqlite"
-pkgusers="postfix"
-pkggroups="postfix postdrop"
+install="$pkgname.pre-install"
provider_priority=1
+provides="sendmail"
source="http://www.namesdir.com/mirrors/postfix-release/official/postfix-$pkgver.tar.gz
honour-config-directory.patch
postfix.initd
@@ -91,6 +92,6 @@ sqlite() {
_database "sqlite" "SQLite 3"
}
-sha512sums="2bc29a87a65c46d06b6fc51c4cdf22da773e63f19488871e040eba6250bf686eecc7de11e14224018c35b061e66e1759c69dc649d7388f724a58080195209e68 postfix-3.4.7.tar.gz
+sha512sums="782fe83e4b40c7aadfb4c55850db4c7163dd0f647f4ef133e59f7b47c993b2b4fa6c43ebbc45131caa54d968259f9c8568f47e81bfccda02ab142be52aa95d45 postfix-3.4.8.tar.gz
63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch
2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd"
diff --git a/user/powerdevil/APKBUILD b/user/powerdevil/APKBUILD
index 16bb82b24..7059472ba 100644
--- a/user/powerdevil/APKBUILD
+++ b/user/powerdevil/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=powerdevil
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="KDE Plasma power management utilities"
url="https://www.kde.org/"
@@ -11,9 +11,9 @@ depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev
kactivities-dev kauth-dev kconfig-dev kdbusaddons-dev kglobalaccel-dev
ki18n-dev kidletime-dev kio-dev knotifyconfig-dev kdelibs4support-dev
- kwayland-dev libkscreen-dev plasma-workspace-dev solid-dev eudev-dev"
+ kwayland-dev libkscreen-dev libkworkspace-dev solid-dev eudev-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/powerdevil-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/powerdevil-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -26,7 +26,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="ad159287ababd4410d2277bc43c0f006209f457a1c08ba903db25f60c62be95fd3b114abd56d5c64ebaccbecb523338766bc28468dc54fa7fc072f6381b8e181 powerdevil-5.12.8.tar.xz"
+sha512sums="4ec525ffa16727b419377851c668d3c18f0acde116c025e2b9247e2c55c86594e8c9b37bfd1871b64f894425d4ceefeb290fe80b09abdb274b60f94a70cbdcda powerdevil-5.17.90.tar.xz"
diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD
index b78addda1..a12fc10f4 100644
--- a/user/prison/APKBUILD
+++ b/user/prison/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=prison
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Qt Barcode library for programatically creating QR codes"
url="https://www.kde.org/"
@@ -44,4 +44,4 @@ quick() {
mv "$pkgdir"/usr/lib/qt5/qml "$subpkgdir"/usr/lib/qt5/
}
-sha512sums="90840044073a2a2b6c3e6540ee0ca7b06ddcfbc13ed332590fca087cb0d78f660b0163ffd74d7b332ae99e07faa6417bcc3aa1b5a503246b501363f3738b7ce8 prison-5.65.0.tar.xz"
+sha512sums="0ccdbfc603a21bd152cd8a52508c89de5af4d9465ddf19caee0a8a58115cdcd43ff839a88f90ed43f8afa70d326fe7cda060b83951eeb97d0accdde61af89616 prison-5.66.0.tar.xz"
diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD
index 95b728b76..3eefc6a67 100644
--- a/user/prosody/APKBUILD
+++ b/user/prosody/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=prosody
pkgver=0.11.3
pkgrel=0
@@ -21,7 +21,6 @@ source="https://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz
"
build() {
- cd "$builddir"
./configure \
--prefix=/usr \
--sysconfdir=/etc/prosody \
@@ -37,12 +36,10 @@ build() {
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -d -o prosody -g prosody "$pkgdir/var/log/prosody"
@@ -54,4 +51,4 @@ package() {
sha512sums="07239433c7c65184ca24d665c92b787ff9e4a5ee190ab90dede802ffd2cbd97855356d818858871e62284e9923f485b3468ab1baed5d3fb13aac0551a38967eb prosody-0.11.3.tar.gz
a6ca168fe3d11ee3b05295fb36dfaf8240c60a85507032b2502f9a97d3fd055f7eee38ba6efbb8f79472fc7cdd3556922194d0bd7099f7fb809be01890acc511 prosody.cfg.lua.patch
-24360603dbd5d2a92758e6c4b4aab4f02cbd05373580cba2df76df98b6045891e8108e8c2d16af9508e93968ed5880db952e7a21b2742ebeec6f14b167968c2c prosody.initd"
+11b0f5e4fa488e047c26aa5e51c35983100cdbf7ebbf7c8b6d003c8db7f52e797f93e4744d54b3094c82d722d5e4de62b5734376cb5e69a4c6127f8cb07a4347 prosody.initd"
diff --git a/user/prosody/prosody.initd b/user/prosody/prosody.initd
index 1d835daca..c0557bd81 100644
--- a/user/prosody/prosody.initd
+++ b/user/prosody/prosody.initd
@@ -19,7 +19,7 @@ checkconfig() {
eerror "You need a /etc/prosody/prosody.cfg.lua file to run prosody"
return 1
fi
- luac5.2 -p /etc/prosody/prosody.cfg.lua
+ luac -p /etc/prosody/prosody.cfg.lua
return $?
}
diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD
index cd4e52fbc..028164bd8 100644
--- a/user/protobuf/APKBUILD
+++ b/user/protobuf/APKBUILD
@@ -1,9 +1,9 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=protobuf
_gemname=google-protobuf
-pkgver=3.10.0
+pkgver=3.11.2
_tstver=1.8.1
pkgrel=0
pkgdesc="Library for extensible, efficient structure packing"
@@ -21,8 +21,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/google/$pkgname/archive/v$pk
prepare() {
default_prepare
-
- cd "$builddir"
./autogen.sh
# symlink tests to the test directory
@@ -33,7 +31,6 @@ prepare() {
build() {
# Build Protobuf
- cd "$builddir"
CXXFLAGS="$CXXFLAGS -fno-delete-null-pointer-checks" LDFLAGS="$LDFLAGS -latomic" \
./configure --prefix=/usr \
--sysconfdir=/etc \
@@ -69,7 +66,6 @@ build() {
}
check() {
- cd "$builddir"
make check
cd "$builddir"/ruby
rake test
@@ -78,7 +74,6 @@ check() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -116,5 +111,5 @@ vim() {
"$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim
}
-sha512sums="0dcba6d21486fdc162f57119754b47b4a2fb605af878d5b96a32df55895321535cffb5b804566fd90ee7c36e20106d0cd4f5d9f3c652dc9c4dfca96be41a1977 protobuf-3.10.0.tar.gz
+sha512sums="8319c1e003e5fc64e91b512de016ec1cf10265b294d3b4beea60856beaeb02b4d7682343c74b2c12b0f6d4d6258451af9b9d72bcb4b495293b7637da21030c8f protobuf-3.11.2.tar.gz
e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 googletest-1.8.1.tar.gz"
diff --git a/user/purple-plugin-pack/APKBUILD b/user/purple-plugin-pack/APKBUILD
index 22b797908..1ae2b8691 100644
--- a/user/purple-plugin-pack/APKBUILD
+++ b/user/purple-plugin-pack/APKBUILD
@@ -20,7 +20,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/py3-alabaster/APKBUILD b/user/py3-alabaster/APKBUILD
index 4bf90edf0..becfde6d2 100644
--- a/user/py3-alabaster/APKBUILD
+++ b/user/py3-alabaster/APKBUILD
@@ -13,24 +13,21 @@ arch="noarch"
license="BSD-3-Clause"
depends="python3 py3-pygments"
makedepends="python3-dev"
+subpackages=""
source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
# Zero tests currently.
python3 setup.py test
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
-
}
sha512sums="e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac py3-alabaster-0.7.12.tar.gz"
diff --git a/user/py3-configargparse/APKBUILD b/user/py3-configargparse/APKBUILD
index 199dce3b7..4781c2c27 100644
--- a/user/py3-configargparse/APKBUILD
+++ b/user/py3-configargparse/APKBUILD
@@ -5,7 +5,7 @@
# Maintainer:
pkgname=py3-configargparse
_pkgname=ConfigArgParse
-pkgver=0.14.0
+pkgver=0.15.2
pkgrel=0
pkgdesc="A drop-in replacement for argparse"
url="https://github.com/bw2/ConfigArgParse"
@@ -15,25 +15,20 @@ license="MIT"
depends="python3"
makedepends="python3-dev python3-tests"
subpackages=""
-source="$pkgname-$pkgver.tar.gz::https://github.com/bw2/$_pkgname/archive/$pkgver.tar.gz
- python3.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/bw2/$_pkgname/archive/$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py test
}
package() {
mkdir -p "$pkgdir"
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="e48ca61027abf0e0acb8414b6d89b276b186b4f714368b8c33975537c2264bb2d81f18cf3013b99d9ce752014361afa973f704b3f6957ca4b98319bb0ca5ca8c py3-configargparse-0.14.0.tar.gz
-df324cbc12d0d5cf3cf8bfe494e358d366d8a7891183e9a7922d5331f86e30cbe5810b709ad93dfd41f33cd08c1d87371b9aa13c92d7637d4459d83db41be33f python3.patch"
+sha512sums="c8403751506b3ce096d707067659492422ecef8e684107935ab26f2e518c7c2c4baca8882cac55dd1961a86e5ad95b73389bc1a681cd2a67b5000bd6d626d2d9 py3-configargparse-0.15.2.tar.gz"
diff --git a/user/py3-configargparse/python3.patch b/user/py3-configargparse/python3.patch
deleted file mode 100644
index b102e166f..000000000
--- a/user/py3-configargparse/python3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py 2018-02-04 10:00:01.000000000 -0800
-+++ b/setup.py 2018-11-20 21:08:21.339299614 -0800
-@@ -78,7 +78,7 @@
- 'ordereddict',
- ])
- tests_require.extend([
-- 'unittest2',
-+ 'unittest',
- ])
-
-
diff --git a/user/py3-configobj/APKBUILD b/user/py3-configobj/APKBUILD
index 7268eaa42..4fa196a19 100644
--- a/user/py3-configobj/APKBUILD
+++ b/user/py3-configobj/APKBUILD
@@ -8,22 +8,19 @@ pkgrel=0
pkgdesc="Python library for reading and writing of configuration files (ini)"
url="https://github.com/DiffSK/configobj"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="BSD-3-Clause"
depends="python3 py3-six"
makedepends="python3-dev"
subpackages=""
source="$pkgname-$pkgver.tar.gz::https://github.com/DiffSK/configobj/archive/v$pkgver.tar.gz"
-
builddir="$srcdir"/$_pkgname-$pkgver
build() {
- cd "$builddir"
python3 setup.py build
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-distutils-extra/APKBUILD b/user/py3-distutils-extra/APKBUILD
index 557658b55..9fb5b7b0b 100644
--- a/user/py3-distutils-extra/APKBUILD
+++ b/user/py3-distutils-extra/APKBUILD
@@ -1,29 +1,27 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=py3-distutils-extra
-pkgver=2.42
+pkgver=2.43
pkgrel=0
pkgdesc="Python distutils extras for gettext, themed icons, and scrollkeepr docs"
url="https://launchpad.net/python-distutils-extra"
arch="noarch"
license="GPL-2.0-only"
depends="python3"
-source="https://salsa.debian.org/debian/python-distutils-extra/-/archive/$pkgver/python-distutils-extra-$pkgver.tar.bz2"
+makedepends=""
+source="https://salsa.debian.org/python-team/modules/python-distutils-extra/-/archive/$pkgver/python-distutils-extra-$pkgver.tar.bz2"
builddir="$srcdir/python-distutils-extra-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py check
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="3f69aa3617c4b6f33bee989f8b3612aa12b4ce3c5e07f47799209aa402640078d738e15a1e883afb7062d177ed70ff235af6b09910e4f2cc890e013998eca832 python-distutils-extra-2.42.tar.bz2"
+sha512sums="a0a3ba147403e0096fd1c9f56eb898282edc7a1caf460128245730bf683d97af8706390127f2e997256b2ee50bc267125b2071b47e2eeac70ca0e2d58fa84176 python-distutils-extra-2.43.tar.bz2"
diff --git a/user/py3-docutils/APKBUILD b/user/py3-docutils/APKBUILD
index c07253ad7..5c1db1353 100644
--- a/user/py3-docutils/APKBUILD
+++ b/user/py3-docutils/APKBUILD
@@ -38,16 +38,15 @@ package() {
doc() {
default_doc
- cd "$builddir"
- local docdir="$subpkgdir/usr/share/doc/$pkgname"
+ docdir="$subpkgdir/usr/share/doc/$pkgname"
mkdir -p "$docdir"
- cp -R docs/* "$docdir"
- cp *.txt "$docdir"
+ cp -R "$builddir"/docs/* "$docdir"
+ cp "$builddir"/*.txt "$docdir"
- local licdir="$subpkgdir/usr/share/licenses/$pkgname"
+ licdir="$subpkgdir/usr/share/licenses/$pkgname"
mkdir -p "$licdir"
- rm -f licenses/docutils.conf
- cp licenses/* "$licdir"
+ rm -f "$builddir"/licenses/docutils.conf
+ cp "$builddir"/licenses/* "$licdir"
}
sha512sums="b4528c7eba5a27e40f290a9df6894c277d11906d02f6842b9f364b29af9aa1e46f6008c87e4355947bcfa9f2db1cae9f38cf9fa7b8008ba45fa6d685922003a6 py3-docutils-0.15.2.tar.gz"
diff --git a/user/py3-future/APKBUILD b/user/py3-future/APKBUILD
index 13265d2e6..d34548a8f 100644
--- a/user/py3-future/APKBUILD
+++ b/user/py3-future/APKBUILD
@@ -5,7 +5,7 @@ pkgname=py3-future
_pkgname=${pkgname##py3-}
_p="${_pkgname#?}"
_p="${_pkgname%"$_p"}"
-pkgver=0.17.1
+pkgver=0.18.2
pkgrel=0
pkgdesc="Easy, clean, reliable Python 2/3 compatibility"
url="http://python-future.org/"
@@ -19,14 +19,12 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
package() {
mkdir -p "$pkgdir"
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="50094c44db81afbfd37ee25e1710ed11ecb2c2d64ad076fb62a2688dd36a9696ab26b0d7989bf1ecb10da251961a0ee6bb37c4dbd115f70384cd8c9a675d0b2d future-0.17.1.tar.gz"
+sha512sums="91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2 future-0.18.2.tar.gz"
diff --git a/user/py3-html5lib/APKBUILD b/user/py3-html5lib/APKBUILD
index 898efe4f1..f4f5f7781 100644
--- a/user/py3-html5lib/APKBUILD
+++ b/user/py3-html5lib/APKBUILD
@@ -9,27 +9,27 @@ pkgrel=0
pkgdesc="HTML parser based on the WHATWG HTML specification"
url="https://pypi.python.org/pypi/html5lib"
arch="noarch"
+options="!check" # https://github.com/html5lib/html5lib-python/issues/433
license="MIT"
depends="python3 py3-six py3-webencodings"
-makedepends="python3-dev"
checkdepends="py3-pytest py3-mock py3-pytest-expect"
-source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
+makedepends="python3-dev"
+source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz
+ pytest.patch
+ "
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
pytest
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
-
}
-sha512sums="35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2 py3-html5lib-1.0.1.tar.gz"
+sha512sums="35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2 py3-html5lib-1.0.1.tar.gz
+89be46d5eb7b4a9ada22fa30576ae4f92d705b77988a47d52cbd876bf36240b461e7a0057c865a6b1798a3117343159ecbca43faf5316b446e5a80b8486a7e86 pytest.patch"
diff --git a/user/py3-html5lib/pytest.patch b/user/py3-html5lib/pytest.patch
new file mode 100644
index 000000000..fd6f99649
--- /dev/null
+++ b/user/py3-html5lib/pytest.patch
@@ -0,0 +1,163 @@
+From 2699544837e68b12f1740a7eb56882a0dc0a4008 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Thu, 28 Mar 2019 01:45:43 +0100
+Subject: [PATCH] Support pytest 4
+
+Fixes https://github.com/html5lib/html5lib-python/issues/411
+---
+ html5lib/tests/test_encoding.py | 4 ++--
+ html5lib/tests/test_sanitizer.py | 14 +++++++-------
+ html5lib/tests/test_serializer.py | 2 +-
+ html5lib/tests/test_stream.py | 7 ++++---
+ html5lib/tests/test_treewalkers.py | 2 +-
+ requirements-test.txt | 2 +-
+ 6 files changed, 16 insertions(+), 15 deletions(-)
+
+diff --git a/html5lib/tests/test_encoding.py b/html5lib/tests/test_encoding.py
+index 9a411c77..97b6ca2a 100644
+--- a/html5lib/tests/test_encoding.py
++++ b/html5lib/tests/test_encoding.py
+@@ -99,8 +99,8 @@ def test_encoding():
+ for filename in get_data_files("encoding"):
+ tests = _TestData(filename, b"data", encoding=None)
+ for test in tests:
+- yield (runParserEncodingTest, test[b'data'], test[b'encoding'])
+- yield (runPreScanEncodingTest, test[b'data'], test[b'encoding'])
++ runParserEncodingTest(test[b'data'], test[b'encoding'])
++ runPreScanEncodingTest(test[b'data'], test[b'encoding'])
+
+
+ # pylint:disable=wrong-import-position
+diff --git a/html5lib/tests/test_sanitizer.py b/html5lib/tests/test_sanitizer.py
+index 45046d57..1b7285fc 100644
+--- a/html5lib/tests/test_sanitizer.py
++++ b/html5lib/tests/test_sanitizer.py
+@@ -67,19 +67,19 @@ def test_sanitizer():
+ 'tfoot', 'th', 'thead', 'tr', 'select']:
+ continue # TODO
+ if tag_name == 'image':
+- yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
++ runSanitizerTest("test_should_allow_%s_tag" % tag_name,
+ "<img title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz",
+ "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
+ elif tag_name == 'br':
+- yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
++ runSanitizerTest("test_should_allow_%s_tag" % tag_name,
+ "<br title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz<br/>",
+ "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
+ elif tag_name in constants.voidElements:
+- yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
++ runSanitizerTest("test_should_allow_%s_tag" % tag_name,
+ "<%s title=\"1\"/>foo &lt;bad&gt;bar&lt;/bad&gt; baz" % tag_name,
+ "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
+ else:
+- yield (runSanitizerTest, "test_should_allow_%s_tag" % tag_name,
++ runSanitizerTest("test_should_allow_%s_tag" % tag_name,
+ "<%s title=\"1\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</%s>" % (tag_name, tag_name),
+ "<%s title='1'>foo <bad>bar</bad> baz</%s>" % (tag_name, tag_name))
+
+@@ -93,7 +93,7 @@ def test_sanitizer():
+ attribute_value = 'foo'
+ if attribute_name in sanitizer.attr_val_is_uri:
+ attribute_value = '%s://sub.domain.tld/path/object.ext' % sanitizer.allowed_protocols[0]
+- yield (runSanitizerTest, "test_should_allow_%s_attribute" % attribute_name,
++ runSanitizerTest("test_should_allow_%s_attribute" % attribute_name,
+ "<p %s=\"%s\">foo &lt;bad&gt;bar&lt;/bad&gt; baz</p>" % (attribute_name, attribute_value),
+ "<p %s='%s'>foo <bad>bar</bad> baz</p>" % (attribute_name, attribute_value))
+
+@@ -101,7 +101,7 @@ def test_sanitizer():
+ rest_of_uri = '//sub.domain.tld/path/object.ext'
+ if protocol == 'data':
+ rest_of_uri = 'image/png;base64,aGVsbG8gd29ybGQ='
+- yield (runSanitizerTest, "test_should_allow_uppercase_%s_uris" % protocol,
++ runSanitizerTest("test_should_allow_uppercase_%s_uris" % protocol,
+ "<img src=\"%s:%s\">foo</a>" % (protocol, rest_of_uri),
+ """<img src="%s:%s">foo</a>""" % (protocol, rest_of_uri))
+
+@@ -110,7 +110,7 @@ def test_sanitizer():
+ if protocol == 'data':
+ rest_of_uri = 'image/png;base64,aGVsbG8gd29ybGQ='
+ protocol = protocol.upper()
+- yield (runSanitizerTest, "test_should_allow_uppercase_%s_uris" % protocol,
++ runSanitizerTest("test_should_allow_uppercase_%s_uris" % protocol,
+ "<img src=\"%s:%s\">foo</a>" % (protocol, rest_of_uri),
+ """<img src="%s:%s">foo</a>""" % (protocol, rest_of_uri))
+
+diff --git a/html5lib/tests/test_serializer.py b/html5lib/tests/test_serializer.py
+index c23592af..a4250935 100644
+--- a/html5lib/tests/test_serializer.py
++++ b/html5lib/tests/test_serializer.py
+@@ -222,4 +222,4 @@ def test_serializer():
+ with open(filename) as fp:
+ tests = json.load(fp)
+ for test in tests['tests']:
+- yield runSerializerTest, test["input"], test["expected"], test.get("options", {})
++ runSerializerTest(test["input"], test["expected"], test.get("options", {}))
+diff --git a/html5lib/tests/test_stream.py b/html5lib/tests/test_stream.py
+index 27c39538..a9b3ebbe 100644
+--- a/html5lib/tests/test_stream.py
++++ b/html5lib/tests/test_stream.py
+@@ -308,9 +308,10 @@ def test_invalid_codepoints(inp, num):
+ ("'\\uD800\\uD800\\uD800'", 3),
+ ("'a\\uD800a\\uD800a\\uD800a'", 3),
+ ("'\\uDFFF\\uDBFF'", 2),
+- pytest.mark.skipif(sys.maxunicode == 0xFFFF,
+- ("'\\uDBFF\\uDFFF'", 2),
+- reason="narrow Python")])
++ pytest.param(
++ "'\\uDBFF\\uDFFF'", 2,
++ mark=pytest.mark.skipif(sys.maxunicode == 0xFFFF,
++ reason="narrow Python"))])
+ def test_invalid_codepoints_surrogates(inp, num):
+ inp = eval(inp) # pylint:disable=eval-used
+ fp = StringIO(inp)
+diff --git a/html5lib/tests/test_treewalkers.py b/html5lib/tests/test_treewalkers.py
+index 67fc89e5..c2323b7e 100644
+--- a/html5lib/tests/test_treewalkers.py
++++ b/html5lib/tests/test_treewalkers.py
+@@ -99,7 +99,7 @@ def test_treewalker_six_mix():
+
+ for tree in sorted(treeTypes.items()):
+ for intext, attrs, expected in sm_tests:
+- yield runTreewalkerEditTest, intext, expected, attrs, tree
++ runTreewalkerEditTest(intext, expected, attrs, tree)
+
+
+ @pytest.mark.parametrize("tree,char", itertools.product(sorted(treeTypes.items()), ["x", "\u1234"]))
+diff --git a/requirements-test.txt b/requirements-test.txt
+index 4e223a3f..b936e0fa 100644
+--- a/requirements-test.txt
++++ b/requirements-test.txt
+@@ -4,7 +4,7 @@ tox
+
+ flake8<3.0
+
+-pytest==3.2.5
++pytest>=4.3,<4.4
+ coverage
+ pytest-expect>=1.1,<2.0
+ mock
+From 29bb168659da16f7c03ce635a8fbb4cdc2502667 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
+Date: Mon, 6 Jan 2020 10:55:49 +0100
+Subject: [PATCH] marks not mark
+
+---
+ html5lib/tests/test_stream.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/html5lib/tests/test_stream.py b/html5lib/tests/test_stream.py
+index a9b3ebbe..06663b8c 100644
+--- a/html5lib/tests/test_stream.py
++++ b/html5lib/tests/test_stream.py
+@@ -310,8 +310,8 @@ def test_invalid_codepoints(inp, num):
+ ("'\\uDFFF\\uDBFF'", 2),
+ pytest.param(
+ "'\\uDBFF\\uDFFF'", 2,
+- mark=pytest.mark.skipif(sys.maxunicode == 0xFFFF,
+- reason="narrow Python"))])
++ marks=pytest.mark.skipif(sys.maxunicode == 0xFFFF,
++ reason="narrow Python"))])
+ def test_invalid_codepoints_surrogates(inp, num):
+ inp = eval(inp) # pylint:disable=eval-used
+ fp = StringIO(inp)
diff --git a/user/py3-incremental/APKBUILD b/user/py3-incremental/APKBUILD
index ff3ed3cb7..8843380f5 100644
--- a/user/py3-incremental/APKBUILD
+++ b/user/py3-incremental/APKBUILD
@@ -14,17 +14,14 @@ source="https://files.pythonhosted.org/packages/8f/26/02c4016aa95f45479eea37c90c
builddir="$srcdir/incremental-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py test
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-josepy/APKBUILD b/user/py3-josepy/APKBUILD
index baf70ee55..4cc48bb0b 100644
--- a/user/py3-josepy/APKBUILD
+++ b/user/py3-josepy/APKBUILD
@@ -24,4 +24,5 @@ package() {
mkdir -p "$pkgdir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
+
sha512sums="25a360b3893e1c1c524440b02e0af66c6dfefd756cebdad1c27ae8a82461200448a9c8fc835747e160cbcbb63261a4f79d7765eaae5e0b19feea5bf84d5e8896 josepy-1.2.0.tar.gz"
diff --git a/user/py3-lxml/APKBUILD b/user/py3-lxml/APKBUILD
index 37c34782c..e06030e11 100644
--- a/user/py3-lxml/APKBUILD
+++ b/user/py3-lxml/APKBUILD
@@ -5,7 +5,7 @@ pkgname=py3-lxml
_pkgname=lxml
_p="${_pkgname#?}"
_p="${_pkgname%"$_p"}"
-pkgver=4.4.1
+pkgver=4.4.2
pkgrel=0
pkgdesc="Python LXML Library"
url="https://lxml.de/"
@@ -26,4 +26,4 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="3f11469290868f5bd30631020ac170c40da7348853609edf6fc6b00437b053fd774e0dfc6e711703ac5d05398dfa1f31e59a185935c3dc8ef0e1914a518bd049 lxml-4.4.1.tar.gz"
+sha512sums="7a3dcbdb6de703ff939cd7e75c4c73f71b3c8b212796303c1a1ab74dc06153968661d69ab379a2c4b8b75e7643a53e09473988e21758643e9ee52819cd1042aa lxml-4.4.2.tar.gz"
diff --git a/user/py3-markdown/APKBUILD b/user/py3-markdown/APKBUILD
index 40df4e38d..cf6a22b2a 100644
--- a/user/py3-markdown/APKBUILD
+++ b/user/py3-markdown/APKBUILD
@@ -9,7 +9,7 @@ pkgrel=0
pkgdesc="A Python implementation of Markdown"
url="https://python-markdown.github.io/"
arch="noarch"
-options="!check" # needs flake8
+options="!check" # needs flake8
license="BSD-3-Clause"
depends="python3"
makedepends="python3-dev"
diff --git a/user/py3-markupsafe/APKBUILD b/user/py3-markupsafe/APKBUILD
index ced64dfdf..a9721b9d3 100644
--- a/user/py3-markupsafe/APKBUILD
+++ b/user/py3-markupsafe/APKBUILD
@@ -11,25 +11,22 @@ url="https://pypi.python.org/pypi/MarkupSafe"
arch="all"
license="BSD-3-Clause"
depends="python3"
-makedepends="python3-dev"
checkdepends="py3-pytest"
+makedepends="python3-dev"
+subpackages=""
source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
PYTHONPATH="$PYTHONPATH:$(echo build/lib.*)" pytest
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
-
}
sha512sums="f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6 py3-markupsafe-1.1.1.tar.gz"
diff --git a/user/py3-mock/APKBUILD b/user/py3-mock/APKBUILD
index 28047234a..4445df141 100644
--- a/user/py3-mock/APKBUILD
+++ b/user/py3-mock/APKBUILD
@@ -19,13 +19,11 @@ source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
package() {
mkdir -p "$pkgdir"
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-olefile/APKBUILD b/user/py3-olefile/APKBUILD
index c44ee5842..a890d231f 100644
--- a/user/py3-olefile/APKBUILD
+++ b/user/py3-olefile/APKBUILD
@@ -11,21 +11,19 @@ arch="noarch"
license="BSD-2-Clause AND Custom"
depends="python3"
makedepends="python3-dev unzip"
+subpackages=""
source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/o/$_pkgname/$_pkgname-$pkgver.zip"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
PYTHONPATH="build/lib" python3 tests/test_olefile.py
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
}
diff --git a/user/py3-paho-mqtt/APKBUILD b/user/py3-paho-mqtt/APKBUILD
index cda723c76..adc799311 100644
--- a/user/py3-paho-mqtt/APKBUILD
+++ b/user/py3-paho-mqtt/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=py3-paho-mqtt
_pkgname=paho.mqtt.python
-pkgver=1.4.0
+pkgver=1.5.0
pkgrel=0
pkgdesc="MQTT version 3.1.1 client class for Python"
url="https://www.eclipse.org/paho/"
@@ -10,8 +10,8 @@ url="https://www.eclipse.org/paho/"
arch="noarch"
license="EPL-1.0 AND EDL-1.0"
depends="python3"
-makedepends=""
checkdepends="py3-pytest"
+makedepends=""
# Use GitHub tarball since PyPI doesn't include tests
source="$pkgname-$pkgver.tar.gz::https://github.com/eclipse/paho.mqtt.python/archive/v$pkgver.tar.gz
setup.patch"
@@ -29,5 +29,5 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="2e49f0f146207ab4fbc8c346b10d3e2b50869b2d9db7c999b6645f7213fb635b64cff01c5405e7833a8b25334d24685ce6ed734a6e4b6b0660b48f65cf4a941c py3-paho-mqtt-1.4.0.tar.gz
-0cfff826651b36b5062dae8bad3abcab428dc18bfcee6c941a46f5c8900c871bd475d96fa382e06d731ea451ad9159edadf0ee3767f7dea992cb7a7ed7313d80 setup.patch"
+sha512sums="7e52180bf1783ee1f39aa5248730e82fae47fe3db7c4579b0b7207a29f5337c7c0af58d58aac1c265b1ed91fa9c240187d5e3005f55c6e28623e6cbc36750294 py3-paho-mqtt-1.5.0.tar.gz
+690f18379f1d920c9eb63a14dfa1331e8400d95db5a6038df85aaa78756d965a303a5b00877615b1546cefb804994dec99c4067564d899421aceb0e0ad3c3e68 setup.patch"
diff --git a/user/py3-paho-mqtt/setup.patch b/user/py3-paho-mqtt/setup.patch
index 70ccc869f..17a2243a9 100644
--- a/user/py3-paho-mqtt/setup.patch
+++ b/user/py3-paho-mqtt/setup.patch
@@ -1,14 +1,15 @@
--- paho.mqtt.python-1.4.0/setup.py 2018-09-02 11:20:42.000000000 +0000
+++ paho.mqtt.python-1.4.0/setup.py 2019-08-28 02:51:55.690633661 +0000
-@@ -11,9 +11,8 @@ with open('README.rst', 'rb') as readme_
+@@ -11,10 +11,9 @@ with open('README.rst', 'rb') as readme_
readme = readme_file.read().decode('utf-8')
requirements = []
--test_requirements = ['pytest', 'pylama']
+-test_requirements = ['pytest', 'pylama', 'six']
-needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
-setup_requirements = ['pytest-runner'] if needs_pytest else []
+test_requirements = ['pytest']
+setup_requirements = []
+ extra_requirements = {'proxy': ['PySocks']}
if sys.version_info < (3, 0):
test_requirements += ['mock']
diff --git a/user/py3-parsedatetime/APKBUILD b/user/py3-parsedatetime/APKBUILD
index dc2766b37..4e8698bc0 100644
--- a/user/py3-parsedatetime/APKBUILD
+++ b/user/py3-parsedatetime/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer:
pkgname=py3-parsedatetime
_pkgname=parsedatetime
-pkgver=2.4
+pkgver=2.5
pkgrel=0
pkgdesc="Parse human-readable date/time strings"
url="https://github.com/bear/parsedatetime"
@@ -14,17 +14,14 @@ license="Apache-2.0"
depends="python3 py3-future"
makedepends="python3-dev"
source="$_pkgname-$pkgver.tar.gz::https://github.com/bear/$_pkgname/archive/v$pkgver.tar.gz"
-
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="0fd8bfa3411476a20d8874b44036bc162735fb7865d39ca98b0a608daec39daac47100314279dbf66229ec333821492744f7505315d955f58216fdaa75cbf046 parsedatetime-2.4.tar.gz"
+sha512sums="f729c32a3e5ee94fe39322be4772dffacb0608753e106e64d79818a6be3febc36f37e0eeac73190f1510f5e88aa0755eb0fb85fab19aa53f4643619907b245bf parsedatetime-2.5.tar.gz"
diff --git a/user/py3-passlib/APKBUILD b/user/py3-passlib/APKBUILD
index 83d184039..18d0d23bd 100644
--- a/user/py3-passlib/APKBUILD
+++ b/user/py3-passlib/APKBUILD
@@ -4,7 +4,7 @@ pkgname=py3-passlib
_pkgname=${pkgname#py3-}
_p="${_pkgname#?}"
_p="${_pkgname%"$_p"}"
-pkgver=1.7.1
+pkgver=1.7.2
pkgrel=0
pkgdesc="Python password hashing framework"
url="https://pypi.org/project/passlib/"
@@ -31,4 +31,4 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="3d5f069cd4e44e5e87cdabc46845acbdd6c1eeedb7ce1f611aebee87b0f7af19009b6a47a10ec555fd84260b9f5c933c6429e325d30326de3869f05031674168 passlib-1.7.1.tar.gz"
+sha512sums="1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53 passlib-1.7.2.tar.gz"
diff --git a/user/py3-pexpect/APKBUILD b/user/py3-pexpect/APKBUILD
index b4e0e1745..e808ef46f 100644
--- a/user/py3-pexpect/APKBUILD
+++ b/user/py3-pexpect/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=py3-pexpect
_pkgname=${pkgname#*-}
_p="${_pkgname#?}"
@@ -16,17 +16,14 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$
builddir="$srcdir/pexpect-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py check
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-pillow/APKBUILD b/user/py3-pillow/APKBUILD
index c47d31b1e..8012a6fe2 100644
--- a/user/py3-pillow/APKBUILD
+++ b/user/py3-pillow/APKBUILD
@@ -43,11 +43,10 @@ doc() {
pkgdesc="Example scripts for $pkgname"
depends="$pkgname"
- cd "$builddir"
- local destdir="$subpkgdir/usr/share/doc/$pkgname"
+ destdir="$subpkgdir/usr/share/doc/$pkgname"
install -d "$destdir"/Scripts
- install -m 644 Scripts/* "$destdir"/Scripts/
- install -Dm644 LICENSE "$subpkgdir/usr/share/licenses/$pkgname/LICENSE"
+ install -m 644 "$builddir"/Scripts/* "$destdir"/Scripts/
+ install -Dm644 "$builddir"/LICENSE "$subpkgdir/usr/share/licenses/$pkgname/LICENSE"
}
sha512sums="757bfdab2ba418195e96e696d2d111de3b38b6bafe4f6f94012f024f59c9bc8542fdab54f643eaf7b2867a9214db806e72eecbdd636bfceb55b47d3164f643ec py3-pillow-6.2.1.tar.gz
diff --git a/user/py3-ply/APKBUILD b/user/py3-ply/APKBUILD
index 495a66d53..351c11b03 100644
--- a/user/py3-ply/APKBUILD
+++ b/user/py3-ply/APKBUILD
@@ -14,17 +14,14 @@ source="http://www.dabeaz.com/ply/ply-$pkgver.tar.gz"
builddir="$srcdir/ply-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py check
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-psutil/APKBUILD b/user/py3-psutil/APKBUILD
index 35f0dec94..3acb26611 100644
--- a/user/py3-psutil/APKBUILD
+++ b/user/py3-psutil/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=py3-psutil
_pkgname=${pkgname#py3-}
-pkgver=5.6.5
+pkgver=5.6.7
pkgrel=0
pkgdesc="Process and system utilities"
url="https://pypi.org/project/psutil/"
@@ -26,5 +26,5 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="037b1501b686b7101be4180c8698b09d20d4260962a88f0c437ff558d91c405f56eae186c9d55c1893c612c4534093ab26e6943f0ed56db69e343c5c0317be1b psutil-5.6.5.tar.gz
+sha512sums="74eb488b91764941e38214f07bca00e3c837167ad543bfd9ae3b83d665e2be1bb5341eca4aff9282ad50d321568a679e1ffa2ee72ad7b4965cda92b7c80b2503 psutil-5.6.7.tar.gz
5b0eea07856afeb0eff3268dc78bd3daf3491022e8a08c422db3eaad1b5e0da71429fe9e2e4b23f3eabf9669e7e4fb5a187c96aedbfe994692bb3e5a98fe2fc2 utmpx.patch"
diff --git a/user/py3-ptyprocess/APKBUILD b/user/py3-ptyprocess/APKBUILD
index 981976f23..af121ab31 100644
--- a/user/py3-ptyprocess/APKBUILD
+++ b/user/py3-ptyprocess/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=py3-ptyprocess
pkgver=0.6.0
pkgrel=0
@@ -10,21 +10,18 @@ license="ISC"
depends="python3"
makedepends=""
source="https://files.pythonhosted.org/packages/7d/2d/e4b8733cf79b7309d84c9081a4ab558c89d8c89da5961bf4ddb050ca1ce0/ptyprocess-$pkgver.tar.gz"
-sha512sums="b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86 ptyprocess-0.6.0.tar.gz"
builddir="$srcdir/ptyprocess-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py check
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
+sha512sums="b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86 ptyprocess-0.6.0.tar.gz"
diff --git a/user/py3-pycairo/APKBUILD b/user/py3-pycairo/APKBUILD
index 0e14ddb2d..d5f3e01b3 100644
--- a/user/py3-pycairo/APKBUILD
+++ b/user/py3-pycairo/APKBUILD
@@ -1,20 +1,21 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=py3-pycairo
pkgver=1.18.2
pkgrel=0
pkgdesc="Python bindings for Cairo"
url="https://pycairo.readthedocs.io/"
arch="all"
+options="!check" # Test suite requires unpackaged py3-flake8.
license="MIT AND (LGPL-2.1-only OR MPL-1.1)"
depends=""
+checkdepends="py3-pytest"
makedepends="python3-dev cairo-dev meson"
subpackages="$pkgname-dev"
source="https://files.pythonhosted.org/packages/source/p/pycairo/pycairo-$pkgver.tar.gz"
builddir="$srcdir/pycairo-$pkgver"
build() {
- cd "$builddir"
meson \
--prefix=/usr \
--sysconfdir=/etc \
@@ -26,11 +27,10 @@ build() {
}
check() {
- cd "$builddir"
+ ninja -C output test
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" ninja -C output install
}
diff --git a/user/py3-pycotap/APKBUILD b/user/py3-pycotap/APKBUILD
index a2731dc39..1a1ced5c9 100644
--- a/user/py3-pycotap/APKBUILD
+++ b/user/py3-pycotap/APKBUILD
@@ -15,17 +15,14 @@ source="https://files.pythonhosted.org/packages/a1/99/f1dfa70ffe1140f701ba979763
builddir="$srcdir/$_pipname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py check
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD
index 3a84f8e09..f8c355cb8 100644
--- a/user/py3-pygobject/APKBUILD
+++ b/user/py3-pygobject/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=py3-pygobject
pkgver=3.34.0
pkgrel=0
@@ -14,17 +14,14 @@ source="https://ftp.gnome.org/pub/GNOME/sources/pygobject/${pkgver%.*}/pygobject
builddir="$srcdir/pygobject-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py check
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-pytest-expect/APKBUILD b/user/py3-pytest-expect/APKBUILD
index 0a3d5cb17..2b82dc863 100644
--- a/user/py3-pytest-expect/APKBUILD
+++ b/user/py3-pytest-expect/APKBUILD
@@ -16,20 +16,16 @@ source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
# No tests available
python3 setup.py test
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
-
}
sha512sums="41d2b296844e9dab9429f34eec37fe106a4e6c2039824c37067ed048dcc328b13e666b22d3482ccfc6153af4e44b5d895f3011ec45df55ffa07a98459e3caefd py3-pytest-expect-1.1.0.tar.gz"
diff --git a/user/py3-random2/APKBUILD b/user/py3-random2/APKBUILD
index d8ac44035..da7838e39 100644
--- a/user/py3-random2/APKBUILD
+++ b/user/py3-random2/APKBUILD
@@ -12,22 +12,18 @@ arch="noarch"
license="Python-2.0"
depends="python3"
makedepends="python3-dev"
-install=""
source="$pkgname-$pkgver.zip::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.zip"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
PYTHONPATH="build/lib" python3 setup.py test
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-requests-toolbelt/APKBUILD b/user/py3-requests-toolbelt/APKBUILD
index 189ad887d..8ecddaa88 100644
--- a/user/py3-requests-toolbelt/APKBUILD
+++ b/user/py3-requests-toolbelt/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=0
pkgdesc="Useful classes and functions to be used with python-requests"
url="https://github.com/requests/toolbelt"
arch="noarch"
-options="!check" # needs betamax
+options="!check" # Needs betamax
license="Apache-2.0"
depends="python3"
makedepends="python3-dev"
@@ -17,13 +17,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/requests/$_pkgname/archive/$
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
package() {
mkdir -p "$pkgdir"
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-rfc3339/APKBUILD b/user/py3-rfc3339/APKBUILD
index 34332a1d8..5af94e017 100644
--- a/user/py3-rfc3339/APKBUILD
+++ b/user/py3-rfc3339/APKBUILD
@@ -20,13 +20,11 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
package() {
mkdir -p "$pkgdir"
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-six/APKBUILD b/user/py3-six/APKBUILD
index 94ece5835..32beed401 100644
--- a/user/py3-six/APKBUILD
+++ b/user/py3-six/APKBUILD
@@ -10,23 +10,20 @@ arch="noarch"
options="!check" # Circular dependency with py3-pytest
license="MIT"
depends=""
-makedepends="python3-dev"
#checkdepends="py3-pluggy py3-pytest"
+makedepends="python3-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/benjaminp/$_pkgname/archive/$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py test
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-twisted/APKBUILD b/user/py3-twisted/APKBUILD
index c1f9a6321..37f2b0976 100644
--- a/user/py3-twisted/APKBUILD
+++ b/user/py3-twisted/APKBUILD
@@ -10,7 +10,7 @@ pkgdesc="Asynchronous networking framework written in Python"
url="https://twistedmatrix.com/"
arch="all"
license="MIT"
-depends="py3-incremental"
+depends="python3 py3-incremental"
makedepends="python3-dev"
subpackages=""
source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.bz2"
diff --git a/user/py3-u-msgpack-python/APKBUILD b/user/py3-u-msgpack-python/APKBUILD
index b4bb4187b..68ea543d2 100644
--- a/user/py3-u-msgpack-python/APKBUILD
+++ b/user/py3-u-msgpack-python/APKBUILD
@@ -11,8 +11,8 @@ url="https://pypi.python.org/pypi/u-msgpack-python"
arch="noarch"
license="MIT"
depends="python3"
-makedepends="python3-dev"
checkdepends="py3-pytest"
+makedepends="python3-dev"
source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
@@ -26,7 +26,6 @@ check() {
package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
-
}
sha512sums="cefba7ed86d2b7c37b0d92e3a4fb4ec62c89dffee0be078c783010638413e6ce1af7ab959b43dfedb6fd8cf2943185c18fc2201a4a9764c423e8242bcedf21a9 py3-u-msgpack-python-2.5.2.tar.gz"
diff --git a/user/py3-webencodings/APKBUILD b/user/py3-webencodings/APKBUILD
index 967596d83..728488106 100644
--- a/user/py3-webencodings/APKBUILD
+++ b/user/py3-webencodings/APKBUILD
@@ -12,25 +12,21 @@ arch="noarch"
# Packaging error, see https://github.com/gsnedders/python-webencodings/blob/master/LICENSE
license="BSD-3-Clause"
depends="python3"
-makedepends="python3-dev"
checkdepends="py3-pytest"
+makedepends="python3-dev"
source="$pkgname-$pkgver.tar.gz::https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
PYTHONPATH="build/lib:$PYTHONPATH" pytest webencodings/tests.py
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
-
}
sha512sums="b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326 py3-webencodings-0.5.1.tar.gz"
diff --git a/user/py3-zope-component/APKBUILD b/user/py3-zope-component/APKBUILD
index 32feb82ad..1553b39ed 100644
--- a/user/py3-zope-component/APKBUILD
+++ b/user/py3-zope-component/APKBUILD
@@ -8,7 +8,7 @@ pkgrel=1
pkgdesc="Zope Component Architecture"
url="https://pypi.python.org/pypi/zope.component"
arch="noarch"
-options="!check" # needs nose
+options="!check" # needs nose
license="ZPL-2.1"
depends="python3 py3-zope-deferredimport py3-zope-deprecation py3-zope-event py3-zope-hookable py3-zope-interface py3-zope-proxy"
makedepends="python3-dev"
@@ -17,12 +17,10 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/ar
builddir="$srcdir"/$_pkgname-$pkgver
build() {
- cd "$builddir"
python3 setup.py build
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-zope-deferredimport/APKBUILD b/user/py3-zope-deferredimport/APKBUILD
index 4e68d859c..dff95a0ec 100644
--- a/user/py3-zope-deferredimport/APKBUILD
+++ b/user/py3-zope-deferredimport/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Zope module that allows for lazy module importing"
url="https://github.com/zopefoundation/zope.deferredimport"
arch="noarch"
-options="!check" # needs zope.testrunner
+options="!check" # needs zope.testrunner
license="ZPL-2.1"
depends="python3"
makedepends="python3-dev py3-zope-proxy"
diff --git a/user/py3-zope-deprecation/APKBUILD b/user/py3-zope-deprecation/APKBUILD
index 22e629f26..faf402240 100644
--- a/user/py3-zope-deprecation/APKBUILD
+++ b/user/py3-zope-deprecation/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="A function to mark deprecated parts of an API"
url="https://github.com/zopefoundation/zope.deprecation"
arch="noarch"
-options="!check" # needs zope.testrunner
+options="!check" # needs zope.testrunner
license="ZPL-2.1"
depends="python3"
makedepends="python3-dev"
@@ -16,12 +16,10 @@ source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/ar
builddir="$srcdir"/$_pkgname-$pkgver
build() {
- cd "$builddir"
python3 setup.py build
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-zope-event/APKBUILD b/user/py3-zope-event/APKBUILD
index 391da22f7..38ac46e39 100644
--- a/user/py3-zope-event/APKBUILD
+++ b/user/py3-zope-event/APKBUILD
@@ -8,26 +8,22 @@ pkgrel=0
pkgdesc="Event publishing / dispatch, used by Zope Component Architecture"
url="https://github.com/zopefoundation/zope.event"
arch="noarch"
-options="!check" # needs nose
+options="!check" # needs nose
license="ZPL-2.1"
depends="python3"
makedepends="python3-dev"
source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz"
-
builddir="$srcdir"/$_pkgname-$pkgver
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py test
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-zope-interface/APKBUILD b/user/py3-zope-interface/APKBUILD
index b1025e17c..65130c841 100644
--- a/user/py3-zope-interface/APKBUILD
+++ b/user/py3-zope-interface/APKBUILD
@@ -18,17 +18,14 @@ source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$
builddir="$srcdir/$_pkgname-$pkgver"
build() {
- cd "$builddir"
python3 setup.py build
}
check() {
- cd "$builddir"
python3 setup.py test
}
package() {
- cd "$builddir"
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
diff --git a/user/py3-zope-proxy/APKBUILD b/user/py3-zope-proxy/APKBUILD
index 1b2a069df..2704aa053 100644
--- a/user/py3-zope-proxy/APKBUILD
+++ b/user/py3-zope-proxy/APKBUILD
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Zope module for class and function proxies"
url="https://github.com/zopefoundation/zope.proxy"
arch="all"
-options="!check" # needs zope.testrunner, zope.security
+options="!check" # needs zope.testrunner, zope.security
license="ZPL-2.1"
depends="python3 py3-zope-interface"
makedepends="python3-dev"
diff --git a/user/qastools/APKBUILD b/user/qastools/APKBUILD
index 0161221f4..0586a751d 100644
--- a/user/qastools/APKBUILD
+++ b/user/qastools/APKBUILD
@@ -11,9 +11,9 @@ depends="bash"
makedepends="alsa-lib-dev cmake eudev-dev qt5-qtbase-dev qt5-qtsvg-dev
qt5-qttools-dev"
subpackages="$pkgname-doc $pkgname-lang"
+langdir="/usr/share/qastools/l10n"
source="https://gitlab.com/sebholt/qastools/-/archive/v$pkgver/qastools-v$pkgver.tar.bz2"
builddir="$srcdir/$pkgname-v$pkgver"
-langdir="/usr/share/qastools/l10n"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -24,8 +24,7 @@ build() {
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- -DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/qca/APKBUILD b/user/qca/APKBUILD
index cd0210d0b..fd2dc82f1 100644
--- a/user/qca/APKBUILD
+++ b/user/qca/APKBUILD
@@ -13,21 +13,19 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://download.kde.org/stable/qca/$pkgver/qca-${pkgver}.tar.xz"
build() {
- cd "$builddir"
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DWITH_cyrus-sasl_PLUGIN=yes \
.
make
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/qemu/APKBUILD b/user/qemu/APKBUILD
index 472b5e90e..e64bb2510 100644
--- a/user/qemu/APKBUILD
+++ b/user/qemu/APKBUILD
@@ -157,6 +157,7 @@ source="https://download.qemu.org/$pkgname-$pkgver.tar.xz
signal-fixes.patch
sysinfo-header.patch
fix-lm32-underlinking.patch
+ time64.patch
$pkgname-guest-agent.confd
$pkgname-guest-agent.initd
@@ -409,6 +410,7 @@ fb0130fa4e8771b23ae337ea3e5e29fd5f7dcfe7f9f7a68968f5b059bb4dd1336b0d04c118840d55
c6436b1cc986788baccd5fe0f9d23c7db9026f6b723260611cf894bd94ee830140a17ee5859efe0dad0ca3bfe9caae1269bc5c9ab4c6e696f35c7857c1b5c86b signal-fixes.patch
698f6b134f4ca87f4de62caf7a656841a40a451b8686ca95928f67a296e58a7493d432d9baa5f6360917865aa4929600baf1699993b0600923a066ca9d45d1da sysinfo-header.patch
2828cc612539aa93b5789de7de6d4f85d3cf82311484c0fe91fdd3efeb972057e2baa2a3809ed633d6caa1785642d49196cb282b095d7553c510c47ce7d6a702 fix-lm32-underlinking.patch
+87f659800b78b31731ea1828a27a3762662ef124d10e942f6029b332d5e8cf4487f62a3d742ad59709c2eb9e3ae8af36fa849d6cbac89978a282d29786b9b41a time64.patch
d90c034cae3f9097466854ed1a9f32ab4b02089fcdf7320e8f4da13b2b1ff65067233f48809911485e4431d7ec1a22448b934121bc9522a2dc489009e87e2b1f qemu-guest-agent.confd
1cd24c2444c5935a763c501af2b0da31635aad9cf62e55416d6477fcec153cddbe7de205d99616def11b085e0dd366ba22463d2270f831d884edbc307c7864a6 qemu-guest-agent.initd
9b7a89b20fcf737832cb7b4d5dc7d8301dd88169cbe5339eda69fbb51c2e537d8cb9ec7cf37600899e734209e63410d50d0821bce97e401421db39c294d97be2 80-kvm.rules
diff --git a/user/qemu/time64.patch b/user/qemu/time64.patch
new file mode 100644
index 000000000..8ec9f45df
--- /dev/null
+++ b/user/qemu/time64.patch
@@ -0,0 +1,20 @@
+--- qemu-3.0.0/hw/input/virtio-input-host.c.old 2018-08-14 19:10:34.000000000 +0000
++++ qemu-3.0.0/hw/input/virtio-input-host.c 2020-01-24 06:12:08.788062930 +0000
+@@ -193,13 +193,16 @@
+ {
+ VirtIOInputHost *vih = VIRTIO_INPUT_HOST(vinput);
+ struct input_event evdev;
++ struct timeval tv;
+ int rc;
+
+- if (gettimeofday(&evdev.time, NULL)) {
++ if (gettimeofday(&tv, NULL)) {
+ perror("virtio_input_host_handle_status: gettimeofday");
+ return;
+ }
+
++ evdev.input_event_sec = tv.tv_sec;
++ evdev.input_event_usec = tv.tv_usec;
+ evdev.type = le16_to_cpu(event->type);
+ evdev.code = le16_to_cpu(event->code);
+ evdev.value = le32_to_cpu(event->value);
diff --git a/user/qml-box2d/APKBUILD b/user/qml-box2d/APKBUILD
index 701e06871..1919cb10a 100644
--- a/user/qml-box2d/APKBUILD
+++ b/user/qml-box2d/APKBUILD
@@ -15,13 +15,11 @@ source="qml-box2d-$pkgver.tar.gz::https://github.com/qml-box2d/qml-box2d/archive
builddir="$srcdir/qml-box2d-$_hash"
build() {
- cd "$builddir"
qmake
make
}
package() {
- cd "$builddir"
make install INSTALL_ROOT="$pkgdir"
}
diff --git a/user/qpdf/APKBUILD b/user/qpdf/APKBUILD
index df20bbe25..30efe0385 100644
--- a/user/qpdf/APKBUILD
+++ b/user/qpdf/APKBUILD
@@ -7,8 +7,8 @@ url="http://qpdf.sourceforge.net"
arch="all"
license="Apache-2.0 OR Artistic-2.0"
depends=""
-makedepends="bash libjpeg-turbo-dev zlib-dev"
checkdepends="coreutils perl"
+makedepends="bash libjpeg-turbo-dev zlib-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs
$pkgname-fix-qdf:fix_qdf:noarch"
source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/user/qpdfview/APKBUILD b/user/qpdfview/APKBUILD
index 6bafa639b..4d37c6ad4 100644
--- a/user/qpdfview/APKBUILD
+++ b/user/qpdfview/APKBUILD
@@ -9,7 +9,7 @@ arch="all"
options="!check" # No test suite.
license="GPL-2.0+"
depends=""
-makedepends="cups-dev djvulibre-dev gnutls-dev libspectre-dev
+makedepends="cups-dev djvulibre-dev gnutls-dev libspectre-dev poppler-dev
poppler-qt5-dev qt5-qttools-dev qt5-qtbase-dev qt5-qtsvg-dev"
subpackages="$pkgname-doc"
source="https://launchpad.net/qpdfview/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz"
diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD
index 550bb8352..c260bdfe0 100644
--- a/user/qps/APKBUILD
+++ b/user/qps/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=qps
pkgver=1.10.20
pkgrel=0
@@ -13,14 +13,13 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev
qt5-qttools-dev libxrender-dev lxqt-build-tools>=0.6.0"
subpackages="$pkgname-doc"
source="https://github.com/lxqt/qps/releases/download/$pkgver/qps-$pkgver.tar.xz
- qps-1.10.17-compile-fixes.patch"
+ qps-1.10.17-compile-fixes.patch
+ "
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -28,18 +27,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="407130ac12f1e68da3e22543634d101c7a8353363ff1d9c6edbf98ce5d48f149aa5d937985f00109b40bd3cdb0b9a8e9745e845dd921be4aaf119022632bb9ef qps-1.10.20.tar.xz
diff --git a/user/qt-creator/APKBUILD b/user/qt-creator/APKBUILD
index 4bb436a7d..3ed606043 100644
--- a/user/qt-creator/APKBUILD
+++ b/user/qt-creator/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=qt-creator
-pkgver=4.9.2
+pkgver=4.11.0
pkgrel=0
pkgdesc="Cross-platform multi-language programming IDE"
url="https://doc.qt.io/qtcreator/index.html"
@@ -20,13 +20,11 @@ builddir="$srcdir/$pkgname-opensource-src-$pkgver"
build() {
export LLVM_INSTALL_DIR=/usr
qmake -r "QMAKE_CFLAGS += $CFLAGS" "QMAKE_CXXFLAGS += $CXXFLAGS" "QMAKE_LFLAGS += $LDFLAGS" "QMAKE_LIBS += -lexecinfo"
- ln -s /usr/bin/python3 "$srcdir"/python
- PATH="$PATH:$srcdir" make
- rm "$srcdir"/python
+ make
}
package() {
make install INSTALL_ROOT="$pkgdir"/usr
}
-sha512sums="a67a4c53c4b3777bf05151aaa317bb72a46dc3040769e900e72b25458feb42220a68556f63ff75623c873c10a10d882df80fe0d582eedaccd6facb1d9cfa0bf8 qt-creator-opensource-src-4.9.2.tar.gz"
+sha512sums="29e5c72d4002cdddecbdea689dd5048aa8d0b74c980a6b8096b03c3c39f4868e4490c4516ba287a4082eaaa4ec412309c1d498a4f97754720c88ae4ab53d30b8 qt-creator-opensource-src-4.11.0.tar.gz"
diff --git a/user/qt5-qtvirtualkeyboard/APKBUILD b/user/qt5-qtvirtualkeyboard/APKBUILD
new file mode 100644
index 000000000..98c1a2abc
--- /dev/null
+++ b/user/qt5-qtvirtualkeyboard/APKBUILD
@@ -0,0 +1,27 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=qt5-qtvirtualkeyboard
+_pkgname=qtvirtualkeyboard-everywhere-src
+pkgver=5.12.6
+pkgrel=0
+pkgdesc="On-screen keyboard module for Qt 5"
+url="https://www.qt.io/"
+arch="all"
+options="!check"
+license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0"
+depends=""
+makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev"
+subpackages="$pkgname-dev"
+source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
+builddir="$srcdir"/$_pkgname-$pkgver
+
+build() {
+ qmake
+ make
+}
+
+package() {
+ make install INSTALL_ROOT="$pkgdir"
+}
+
+sha512sums="9ddac64a6a688333ac7250ce3be38e0909cab4c25ebc1574da30f472df557d9898674cc8b7ad408877b01e7635897c72e45f6b88002134e0e48cff378c066208 qtvirtualkeyboard-everywhere-src-5.12.6.tar.xz"
diff --git a/user/qt5-qtwebchannel/APKBUILD b/user/qt5-qtwebchannel/APKBUILD
index d90c0ad28..b1e793132 100644
--- a/user/qt5-qtwebchannel/APKBUILD
+++ b/user/qt5-qtwebchannel/APKBUILD
@@ -10,7 +10,7 @@ arch="all"
options="!check"
license="LGPL-3.0-only WITH Qt-LGPL-exception-1.1 OR GPL-3.0-only WITH Qt-GPL-exception-1.0"
depends=""
-makedepends="qt5-qtbase-dev"
+makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev"
subpackages="$pkgname-dev"
source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz"
builddir="$srcdir"/$_pkgname-$pkgver
diff --git a/user/qt5-qtwebkit/0001-Add-ARM-64-support.patch b/user/qt5-qtwebkit/0001-Add-ARM-64-support.patch
deleted file mode 100644
index 73f5c97f8..000000000
--- a/user/qt5-qtwebkit/0001-Add-ARM-64-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Source/WTF/wtf/Platform.h b/Source/WTF/wtf/Platform.h
-index 4594ec8..639f28f 100644
---- a/Source/WTF/wtf/Platform.h
-+++ b/Source/WTF/wtf/Platform.h
-@@ -342,7 +342,7 @@
- #endif
- #endif
-
--#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64)
-+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(SPARC) || CPU(MIPS64) || CPU(AARCH64)
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
- #endif
-
diff --git a/user/qt5-qtwebkit/APKBUILD b/user/qt5-qtwebkit/APKBUILD
index 36b624e8a..45f739573 100644
--- a/user/qt5-qtwebkit/APKBUILD
+++ b/user/qt5-qtwebkit/APKBUILD
@@ -1,72 +1,78 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=qt5-qtwebkit
-_pkgname=qtwebkit-opensource-src
-pkgver=5.9.1
-pkgrel=4
-pkgdesc="Qt 5 - WebKit components"
-url="https://www.qt.io/"
+_realname=$pkgname
+#qtwebkit
+pkgver=5.212.0_git20191114
+_realver=$(printf '%s' "$pkgver" | sed 's/_/-/')
+pkgrel=0
+pkgdesc="Open source Web browser engine"
+url="https://github.com/qtwebkit/qtwebkit"
arch="all"
-options="!check"
-license="LGPL-2.0 with exceptions OR GPL-3.0 with exceptions"
-depends=""
-depends_dev="qt5-qtdeclarative-dev gstreamer-dev gst-plugins-base-dev
- libxslt-dev mesa-dev icu-dev libxext-dev glib-dev libxcomposite-dev
- libxrender-dev
- "
-makedepends="$depends_dev bison flex fontconfig-dev gperf libjpeg-turbo-dev
- libpng-dev libwebp-dev pcre-dev qt5-qtbase-dev ruby sqlite-dev zlib-dev"
+options="!check" # Tests fail (surprise), require X11.
+license="LGPL-2.1+ AND BSD-3-Clause AND Others"
+depends="gst-plugins-base"
+depends_dev="qt5-qtbase-dev"
+makedepends="$depends_dev ninja sqlite-dev icu-dev ruby perl bison flex gperf
+ libxml2-dev libxslt-dev libjpeg-turbo-dev libpng-dev zlib-dev glib-dev
+ gstreamer-dev fontconfig-dev qt5-qtsensors-dev qt5-qtpositioning-dev
+ qt5-qtdeclarative-dev qt5-qtwebchannel-dev libxcomposite-dev cmake
+ libxrender-dev gst-plugins-base-dev hyphen-dev libexecinfo-dev
+ ruby-dev glib-dev libgcrypt-dev libtasn1-dev"
subpackages="$pkgname-dev"
-source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz
- pic.patch
- fix-rpath.patch
- fix-execinfo.patch
- 0001-Add-ARM-64-support.patch
+#source="https://github.com/qtwebkit/qtwebkit/releases/download/$_realname-$_realver/$_realname-$_realver.tar.xz
+source="https://distfiles.adelielinux.org/source/$_realname-$_realver.tar.xz
+ bug-931.patch
+ cmake.patch
+ ppc-llint.patch
"
-builddir="$srcdir"/$_pkgname-$pkgver
-
-prepare() {
- default_prepare
- # remove some bundled
- mkdir Source/ThirdParty/orig
- mv Source/ThirdParty/gtest/ \
- Source/ThirdParty/qunit/ \
- Source/ThirdParty/orig/
- syncqt.pl -version $pkgver Source/sync.profile
-}
+builddir="$srcdir"/$_realname-$_realver
build() {
- local _maybe_smaller=""
- cd "$builddir"
-
- # On 32-bit x86, ld.bfd will run out of memory if debugging information
- # is built. See https://sourceware.org/bugzilla/show_bug.cgi?id=23470
- # for more information.
- case "$CARCH" in
- pmmx) _maybe_smaller="QMAKE_CXXFLAGS_DEBUG+=-g0"
- esac
-
- qmake $_maybe_smaller
-
- # /usr/include/fortify/stdlib.h:20:25: fatal error: stdlib.h: No such file or directory
- # see: http://stackoverflow.com/questions/37218953/isystem-on-a-system-include-directory-causes-errors
- # see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71090
- # see: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
- qmake Source/JavaScriptCore/LLIntOffsetsExtractor.pro -o \
- Source/JavaScriptCore/Makefile.LLIntOffsetsExtractor
- sed -i 's:-isystem /usr/include ::' \
- Source/JavaScriptCore/Makefile.LLIntOffsetsExtractor
-
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ # We can enable the JIT when it is stable on all Tier 1 platforms:
+ # pmmx (ensure no SSE)
+ # ppc
+ # ppc64
+ #
+ # DONE:
+ # aarch64
+ # armv7
+ # x86_64
+ #
+ # https://github.com/qtwebkit/qtwebkit/issues/930
+ # -DENABLE_MEDIA_SOURCE=ON \
+ # -DENABLE_VIDEO=ON \
+ # -DENABLE_WEB_AUDIO=ON \
+ # -DUSE_GSTREAMER=ON \
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_LIBDIR=lib \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ -DENABLE_JIT=OFF \
+ -DENABLE_PRINT_SUPPORT=ON \
+ -DENABLE_QT_WEBCHANNEL=ON \
+ -DPORT=Qt \
+ -DUSE_SYSTEM_MALLOC=ON \
+ -DUSE_WOFF2=OFF \
+ ${CMAKE_CROSSOPTS} .
make
}
+check() {
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
package() {
- cd "$builddir"
- make install INSTALL_ROOT="$pkgdir"
- sed -i -e 's:-L/home[^ ]\+::g' "$pkgdir"/usr/lib/pkgconfig/*.pc
+ make DESTDIR="$pkgdir" install
}
-sha512sums="79316ab746a230fdb290e28629d7cec5fca75119ba8868060742c682ab86490de9ffd8e517569aa7412f35fd709568dbb5f7d2d467bdb4461e192f8b05d6f1e5 qtwebkit-opensource-src-5.9.1.tar.xz
-9a62a5e7af91c44311b517608262f88b5bc607e75dc5878dd08b0a0872ec03fb7a566df0a41413f7e60beb1b9880e24f084b90c38ed50d4219ec2ad6af9bd62f pic.patch
-00d59c0cdb58ae8e7cf6bc3d03f133697e74c267ccebe12238bcdc274d4c90210b82c2d8bdf0e949cd43da13a4fd8a4c35fb54a00ed5102a4ac4d23aa002d0fe fix-rpath.patch
-f17c2f4b90090c8f12e4ba1f2cbd7a9f496c8de024ba6e0d55b98e5b89ab89298aff84f39e81905e0491fe6bd11544633a8b191403a866e16ed654d44cf8dc6f fix-execinfo.patch
-af5097d44f73de156ca31a5423136301dfc12ae693e20c4702bf3f1c6e16395f3912e9268582480ba3177021f37d4cae3b84d4b23eeb063fdc40f2444d3b34c8 0001-Add-ARM-64-support.patch"
+sha512sums="ec009773953b9f3e2c0e47072cd678f7044b16219c85879a6031c109c7b2b84f426564bb673ccaafa0bcc3f7a656e3cb0d8e3be28d3bbfb401adcd1a6b8b9edd qt5-qtwebkit-5.212.0-git20191114.tar.xz
+85adb979eb5d58ccab85d07d6a6db470b34bdb6fd8af2eef04ce268da41a596b4a19295c97dca1201daf4a51ca9e183bb27dd36b9b12b0e149224793d1c190a9 bug-931.patch
+4ee26787bf01f3067fae51e1942b72d783629b13fe13ffcfba9329bbea823de7b751905f01c71c6c498164cb41a33765debce375a034dde83e3f784d6e549ada cmake.patch
+0b358e4df16e8792c995a385386bfe9e197e23854f30129b504d3ba851cdfab3a2adef462a6ae3a775ec01d02cd67ef404259491339336c6ce896d7940597c95 ppc-llint.patch"
diff --git a/user/qt5-qtwebkit/bug-931.patch b/user/qt5-qtwebkit/bug-931.patch
new file mode 100644
index 000000000..7d363dd62
--- /dev/null
+++ b/user/qt5-qtwebkit/bug-931.patch
@@ -0,0 +1,10 @@
+--- qt5-qtwebkit-5.212.0-git20191114/Source/JavaScriptCore/runtime/NativeExecutable.cpp.old 2019-11-14 19:31:45.000000000 +0000
++++ qt5-qtwebkit-5.212.0-git20191114/Source/JavaScriptCore/runtime/NativeExecutable.cpp 2020-01-04 19:14:22.974744920 +0000
+@@ -28,6 +28,7 @@
+ #include "BatchedTransitionOptimizer.h"
+ #include "CodeBlock.h"
+ #include "Debugger.h"
++#include "ExecutableBaseInlines.h"
+ #include "JIT.h"
+ #include "JSCInlines.h"
+ #include "LLIntEntrypoint.h"
diff --git a/user/qt5-qtwebkit/cmake.patch b/user/qt5-qtwebkit/cmake.patch
new file mode 100644
index 000000000..a41be9ce4
--- /dev/null
+++ b/user/qt5-qtwebkit/cmake.patch
@@ -0,0 +1,60 @@
+--- qt5-qtwebkit-5.212.0-git20191114/Source/PlatformQt.cmake.old 2019-11-14 19:31:45.000000000 +0000
++++ qt5-qtwebkit-5.212.0-git20191114/Source/PlatformQt.cmake 2020-01-04 20:53:20.522367347 +0000
+@@ -99,8 +99,8 @@
+ set(Qt5@MODULE_NAME@_EXECUTABLE_COMPILE_FLAGS \"\")
+ set(Qt5@MODULE_NAME@_PRIVATE_INCLUDE_DIRS \"\") # FIXME: Support private headers
+
+-get_target_property(Qt5@MODULE_NAME@_INCLUDE_DIRS Qt5::@MODULE_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
+-get_target_property(Qt5@MODULE_NAME@_COMPILE_DEFINITIONS Qt5::@MODULE_NAME@ INTERFACE_COMPILE_DEFINITIONS)
++get_target_property(Qt5@MODULE_NAME@_INCLUDE_DIRS Qt5::@FULL_MODULE_NAME@ INTERFACE_INCLUDE_DIRECTORIES)
++get_target_property(Qt5@MODULE_NAME@_COMPILE_DEFINITIONS Qt5::@FULL_MODULE_NAME@ INTERFACE_COMPILE_DEFINITIONS)
+
+ foreach (_module_dep \${_Qt5@MODULE_NAME@_MODULE_DEPENDENCIES})
+ list(APPEND Qt5@MODULE_NAME@_INCLUDE_DIRS \${Qt5\${_module_dep}_INCLUDE_DIRS})
+@@ -117,6 +117,7 @@
+ ")
+
+ set(MODULE_NAME WebKit)
++set(FULL_MODULE_NAME WebKitLegacy)
+ string(CONFIGURE ${_package_footer_template} QTWEBKIT_PACKAGE_FOOTER @ONLY)
+ ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt5WebKitConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitConfig.cmake"
+@@ -124,6 +125,7 @@
+ )
+
+ set(MODULE_NAME WebKitWidgets)
++set(FULL_MODULE_NAME WebKitWidgets)
+ string(CONFIGURE ${_package_footer_template} QTWEBKIT_PACKAGE_FOOTER @ONLY)
+ ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/Qt5WebKitWidgetsConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/Qt5WebKitWidgetsConfig.cmake"
+@@ -154,18 +154,18 @@
+ )
+
+ # QTFIXME
+-#install(EXPORT WebKitTargets
+-# FILE WebKitTargets.cmake
+-# NAMESPACE Qt5::
+-# DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit"
+-# COMPONENT Data
+-#)
+-#install(EXPORT Qt5WebKitWidgetsTargets
+-# FILE Qt5WebKitWidgetsTargets.cmake
+-# NAMESPACE Qt5::
+-# DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets"
+-# COMPONENT Data
+-#)
++install(EXPORT WebKitTargets
++ FILE WebKitTargets.cmake
++ NAMESPACE Qt5::
++ DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKit"
++ COMPONENT Data
++)
++install(EXPORT Qt5WebKitWidgetsTargets
++ FILE Qt5WebKitWidgetsTargets.cmake
++ NAMESPACE Qt5::
++ DESTINATION "${KDE_INSTALL_CMAKEPACKAGEDIR}/Qt5WebKitWidgets"
++ COMPONENT Data
++)
+
+ # Documentation
+
diff --git a/user/qt5-qtwebkit/fix-execinfo.patch b/user/qt5-qtwebkit/fix-execinfo.patch
deleted file mode 100644
index 6fbf4ed8f..000000000
--- a/user/qt5-qtwebkit/fix-execinfo.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- webkitgtk-2.2.0.orig/Source/WTF/wtf/Assertions.cpp
-+++ webkitgtk-2.2.0/Source/WTF/wtf/Assertions.cpp
-@@ -64,7 +64,7 @@
- #include <windows.h>
- #endif
-
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) && !OS(ANDROID)
- #include <cxxabi.h>
- #include <dlfcn.h>
- #include <execinfo.h>
-@@ -242,7 +242,7 @@
-
- void WTFGetBacktrace(void** stack, int* size)
- {
--#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID)
-+#if OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__)) && !OS(ANDROID)
- *size = backtrace(stack, *size);
- #elif OS(WINDOWS) && !OS(WINCE)
- // The CaptureStackBackTrace function is available in XP, but it is not defined
diff --git a/user/qt5-qtwebkit/fix-rpath.patch b/user/qt5-qtwebkit/fix-rpath.patch
deleted file mode 100644
index 6b08fd1a3..000000000
--- a/user/qt5-qtwebkit/fix-rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Tools/qmake/mkspecs/features/unix/default_post.prf.orig
-+++ ./Tools/qmake/mkspecs/features/unix/default_post.prf
-@@ -59,8 +59,6 @@
- }
- }
-
--contains(TEMPLATE, app): CONFIG += rpath
--
- CONFIG(debug, debug|release)|force_debug_info {
- # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
- !force_static_libs_as_shared:config_gnuld: QMAKE_LFLAGS += -Wl,--no-keep-memory
diff --git a/user/qt5-qtwebkit/pic.patch b/user/qt5-qtwebkit/pic.patch
deleted file mode 100644
index ef8993ee3..000000000
--- a/user/qt5-qtwebkit/pic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Source/WTF/wtf/InlineASM.h.orig 2013-10-07 11:36:58.995128674 +0000
-+++ ./Source/WTF/wtf/InlineASM.h 2013-10-07 11:37:28.058792290 +0000
-@@ -42,7 +42,7 @@
- #define THUMB_FUNC_PARAM(name)
- #endif
-
--#if (OS(LINUX) || OS(FREEBSD)) && CPU(X86_64)
-+#if (OS(LINUX) || OS(FREEBSD)) && (CPU(X86_64) || defined(__PIC__))
- #define GLOBAL_REFERENCE(name) #name "@plt"
- #elif CPU(X86) && COMPILER(MINGW)
- #define GLOBAL_REFERENCE(name) "@" #name "@4"
diff --git a/user/qt5-qtwebkit/ppc-llint.patch b/user/qt5-qtwebkit/ppc-llint.patch
new file mode 100644
index 000000000..033bbab68
--- /dev/null
+++ b/user/qt5-qtwebkit/ppc-llint.patch
@@ -0,0 +1,32 @@
+This fixes JavaScriptCore on big endian systems (mainly ppc).
+
+Without the patch, attempting to run any JS results in
+a crash as the generated code was endian specific.
+
+--- qtwebkit/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
++++ qtwebkit/Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm
+@@ -1440,13 +1440,13 @@ _llint_op_put_by_id:
+ loadp StructureChain::m_vector[t3], t3
+ assert(macro (ok) btpnz t3, ok end)
+
+- loadp Structure::m_prototype[t2], t2
++ loadp Structure::m_prototype + PayloadOffset[t2], t2
+ btpz t2, .opPutByIdTransitionChainDone
+ .opPutByIdTransitionChainLoop:
+ loadp [t3], t1
+ bineq t1, JSCell::m_structureID[t2], .opPutByIdSlow
+ addp 4, t3
+- loadp Structure::m_prototype[t1], t2
++ loadp Structure::m_prototype + PayloadOffset[t1], t2
+ btpnz t2, .opPutByIdTransitionChainLoop
+
+ .opPutByIdTransitionChainDone:
+@@ -2004,7 +2004,7 @@ _llint_throw_from_slow_path_trampoline:
+ # When throwing from the interpreter (i.e. throwing from LLIntSlowPaths), so
+ # the throw target is not necessarily interpreted code, we come to here.
+ # This essentially emulates the JIT's throwing protocol.
+- loadp Callee[cfr], t1
++ loadp Callee + PayloadOffset[cfr], t1
+ andp MarkedBlockMask, t1
+ loadp MarkedBlockFooterOffset + MarkedBlock::Footer::m_vm[t1], t1
+ jmp VM::targetMachinePCForThrow[t1]
diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD
index 8b86da42c..f54023654 100644
--- a/user/qt5ct/APKBUILD
+++ b/user/qt5ct/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=qt5ct
pkgver=0.41
pkgrel=0
@@ -13,13 +13,11 @@ makedepends="qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev"
source="https://sourceforge.net/projects/qt5ct/files/qt5ct-$pkgver.tar.bz2"
build() {
- cd "$builddir"
qmake PREFIX=/usr
make
}
package() {
- cd "$builddir"
make INSTALL_ROOT="$pkgdir" install
}
diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD
index 906759828..2ccd6bdf2 100644
--- a/user/qterminal/APKBUILD
+++ b/user/qterminal/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=qterminal
pkgver=0.14.1
pkgrel=0
@@ -14,11 +14,9 @@ makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0
source="https://github.com/lxqt/qterminal/releases/download/$pkgver/qterminal-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,18 +24,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="bb9ac6519236bb834892c1be50bc27f86631b2c7ed60c1ddd4300fedd48f3ea8a08aa453fa03199693486159f667f9391af9491dea5402b4f807ee91e8a6e5cf qterminal-0.14.1.tar.xz"
diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD
index 8894829c8..916d2e1f4 100644
--- a/user/qtermwidget/APKBUILD
+++ b/user/qtermwidget/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=qtermwidget
pkgver=0.14.1
pkgrel=0
@@ -18,11 +18,9 @@ source="https://github.com/lxqt/qtermwidget/releases/download/$pkgver/qtermwidge
"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -31,18 +29,16 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DQTERMWIDGET_USE_UTEMPTER=True \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="6b6d4abd6fc21f10f5323321f26132c0ff5b9682d09a086e265e57976deb60fca8db9a9906a29a0ed8d0e7b83417d5852df55d0118936d5f7a1342a9c2cb6410 qtermwidget-0.14.1.tar.xz
diff --git a/user/qtkeychain/APKBUILD b/user/qtkeychain/APKBUILD
index e3e861748..8a61af1eb 100644
--- a/user/qtkeychain/APKBUILD
+++ b/user/qtkeychain/APKBUILD
@@ -1,21 +1,19 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=qtkeychain
pkgver=0.9.1
pkgrel=0
pkgdesc="Platform-independent Qt-based API for storing passwords securely"
url="https://github.com/frankosterfeld/qtkeychain"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="BSD-3-Clause"
-depends_dev=""
+depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev"
-install=""
subpackages="$pkgname-dev"
source="qtkeychain-$pkgver.tar.gz::https://github.com/frankosterfeld/qtkeychain/archive/v$pkgver.tar.gz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -26,22 +24,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
-check() {
- cd "$builddir"
- make check
-}
-
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/quassel/APKBUILD b/user/quassel/APKBUILD
index a52be97cb..7f7a81c7c 100644
--- a/user/quassel/APKBUILD
+++ b/user/quassel/APKBUILD
@@ -11,7 +11,8 @@ depends="$pkgname-client $pkgname-core"
makedepends="qt5-qtbase-dev qt5-qtmultimedia-dev libdbusmenu-qt-dev sonnet-dev
extra-cmake-modules kconfigwidgets-dev kcoreaddons-dev kxmlgui-dev
knotifications-dev knotifyconfig-dev ktextwidgets-dev qt5-qtscript-dev
- kwidgetsaddons-dev qca-dev qt5-qttools-dev zlib-dev libexecinfo-dev"
+ kwidgetsaddons-dev qca-dev qt5-qttools-dev zlib-dev libexecinfo-dev
+ cmake"
langdir="/usr/share/quassel/translations"
subpackages="$pkgname-core $pkgname-client $pkgname-lang"
source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2
@@ -24,7 +25,6 @@ source="https://quassel-irc.org/pub/quassel-$pkgver.tar.bz2
# - CVE-2018-1000179
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -38,17 +38,15 @@ build() {
-DUSE_QT5=ON \
-DWITH_KDE=ON \
-DWITH_WEBENGINE=OFF \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
@@ -58,7 +56,6 @@ client() {
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/quasselclient "$subpkgdir"/usr/bin/
- local dir
for dir in applications icons pixmaps knotifications5; do
mkdir -p "$subpkgdir"/usr/share/$dir
mv "$pkgdir"/usr/share/$dir "$subpkgdir"/usr/share/
diff --git a/user/quaternion/APKBUILD b/user/quaternion/APKBUILD
index a3445fb3d..f8a5f8b8a 100644
--- a/user/quaternion/APKBUILD
+++ b/user/quaternion/APKBUILD
@@ -25,7 +25,7 @@ build() {
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/quazip/APKBUILD b/user/quazip/APKBUILD
index bae54fd46..f6afd9948 100644
--- a/user/quazip/APKBUILD
+++ b/user/quazip/APKBUILD
@@ -8,7 +8,7 @@ url="https://stachenov.github.io/quazip/"
arch="all"
license="LGPL-2.1-only WITH Static-linking-exception"
depends=""
-makedepends="qt5-qtbase-dev zlib-dev"
+makedepends="cmake qt5-qtbase-dev zlib-dev"
subpackages="$pkgname-dev"
source="quazip-$pkgver.tar.gz::https://github.com/stachenov/quazip/archive/v$pkgver.tar.gz"
diff --git a/user/r/APKBUILD b/user/r/APKBUILD
index 6e6caed89..dd86b0c54 100644
--- a/user/r/APKBUILD
+++ b/user/r/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=r
-pkgver=3.6.1
+pkgver=3.6.2
pkgrel=0
pkgdesc="Environment for statistical computing and graphics"
url="https://www.r-project.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fae7d114437c4b5d10fcb2a4265acd707ad2a4810eeb7c11e25caca1d85093a1495c2e13457b4894c1508830ec1b2be95379b7d54007cf3e574c2a9eea28ef80 R-3.6.1.tar.gz"
+sha512sums="17513e9f4dd27c61c11f7aa45227aeeeefb375bf5d4e193b471724f379a1b2da33e127cbe91aa175cbbbb048b892047e2f610280585c8159242a6c94790b07f9 R-3.6.2.tar.gz"
diff --git a/user/ragel/APKBUILD b/user/ragel/APKBUILD
index 9ecfbe587..809e2ff26 100644
--- a/user/ragel/APKBUILD
+++ b/user/ragel/APKBUILD
@@ -9,14 +9,11 @@ arch="all"
options="!check" # no tests
license="GPL-2.0+"
depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
+makedepends=""
subpackages="$pkgname-doc"
source="http://www.colm.net/files/ragel/ragel-$pkgver.tar.gz"
build() {
- cd "$builddir"
export CXXFLAGS="$CXXFLAGS -std=gnu++98"
./configure \
--build=$CBUILD \
@@ -26,13 +23,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
}
sha512sums="6c1fe4f6fa8546ae28b92ccfbae94355ff0d3cea346b9ae8ce4cf6c2bdbeb823e0ccd355332643ea72d3befd533a8b3030ddbf82be7ffa811c2c58cbb01aaa38 ragel-6.10.tar.gz"
diff --git a/user/range-v3/APKBUILD b/user/range-v3/APKBUILD
new file mode 100644
index 000000000..3221286be
--- /dev/null
+++ b/user/range-v3/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=range-v3
+pkgver=0.10.0
+pkgrel=0
+pkgdesc="Range library for C++"
+url="http://ericniebler.com/2018/12/05/standard-ranges/"
+arch="noarch"
+license="BSL-1.0 AND NCSA AND MIT"
+depends=""
+makedepends="cmake doxygen"
+subpackages=""
+source="range-v3-$pkgver.tar.gz::https://github.com/ericniebler/range-v3/archive/$pkgver.tar.gz"
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ ${CMAKE_CROSSOPTS} \
+ .
+ make
+}
+
+check() {
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="4db089dcbf638eb30fa20dcf6785dd460c5a074a8912984a484592753cfee9f5b9a0e2c56b5bc5921d1b6120877aa2c83ac0a6fe428088ef2854033a635e9723 range-v3-0.10.0.tar.gz"
diff --git a/user/raptor2/APKBUILD b/user/raptor2/APKBUILD
index e092e2e64..3237059c9 100644
--- a/user/raptor2/APKBUILD
+++ b/user/raptor2/APKBUILD
@@ -10,7 +10,7 @@ arch="all"
license="Public-Domain AND (LGPL-2.1+ OR GPL-2.0+ OR Apache-2.0+)"
depends=""
depends_dev="curl-dev libxml2-dev libxslt-dev yajl-dev"
-makedepends="$depends_dev"
+makedepends="$depends_dev autoconf automake libtool"
subpackages="$pkgname-dev $pkgname-doc"
source="http://download.librdf.org/source/$pkgname-$pkgver.tar.gz"
@@ -21,7 +21,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,14 +34,12 @@ build() {
}
check() {
- cd "$builddir"
# Note: some tests are shown as FAIL but they are actually XFAIL :)
# As long as the return status is zero we are fine
make check -j1
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/rasqal/APKBUILD b/user/rasqal/APKBUILD
index ddeb6bd5e..3329fd30f 100644
--- a/user/rasqal/APKBUILD
+++ b/user/rasqal/APKBUILD
@@ -20,7 +20,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,12 +33,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/rdesktop/APKBUILD b/user/rdesktop/APKBUILD
index 51e79ab84..4a67f7c6f 100644
--- a/user/rdesktop/APKBUILD
+++ b/user/rdesktop/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=rdesktop
-pkgver=1.8.6
+pkgver=1.9.0
pkgrel=0
pkgdesc="Remote Desktop Protocol client"
url="https://www.rdesktop.org/"
@@ -9,22 +9,18 @@ arch="all"
options="!check" # No test suite.
license="GPL-3.0-only"
depends=""
-makedepends="alsa-lib-dev krb5-dev libice-dev libsamplerate-dev libx11-dev
- libxrandr-dev openssl-dev"
+makedepends="alsa-lib-dev krb5-dev libice-dev libsamplerate-dev libtasn1-dev
+ libx11-dev libxcursor-dev libxrandr-dev nettle-dev gnutls-dev bash"
subpackages="$pkgname-doc"
-source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop-$pkgver.tar.gz
- gssapi.patch
- signed-int.patch
- "
+source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop-$pkgver.tar.gz"
prepare() {
default_prepare
update_config_sub
- ./bootstrap
}
build() {
- ./configure \
+ bash ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -43,6 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="18b918883746c490852b97086e7727d546a0b1902a87515d6ff7b9568f30404a24934ea3ac55c9213d4db7bf5be3b47985490fa0533b15d9d6749d31c77260a6 rdesktop-1.8.6.tar.gz
-d55709968b21b64fe33bc1fe90156515e88fe715cbaad6f9c7a15ce4b26e09397821708139748c744ba8bb12f1e751602189317c583ff2017941f39360b4b8cd gssapi.patch
-e8b4af70a54944d83b7c899aa680042f559e75af3e9a3deb2c7395f8b4a56e50d1c2f26bd10b2377ff577115d635c2aa0fdbddf995588f1d492badfc3e72456e signed-int.patch"
+sha512sums="e101147b496ae70118c2756bf120007d4748aad9d9917d9ebc0878ffaf35764500861c548ef0528722777555c78e1d3d146b6f3691daa2b8657b0d3a541094f5 rdesktop-1.9.0.tar.gz"
diff --git a/user/rdesktop/gssapi.patch b/user/rdesktop/gssapi.patch
deleted file mode 100644
index a24d2b718..000000000
--- a/user/rdesktop/gssapi.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b556651fe109c8802a0c798b8a680e5ff883bf4e Mon Sep 17 00:00:00 2001
-From: Pierre Ossman <ossman@cendio.se>
-Date: Mon, 10 Jul 2017 15:14:01 +0200
-Subject: [PATCH 2/2] Use standard GSSAPI rather than libgssglue
-
-That project is abandoned and the distributions aren't including
-it anymore.
----
- configure.ac | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e045c409..a969ad5d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -122,27 +122,20 @@ fi
-
- dnl CredSSP feature
- AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP]))
--AC_ARG_ENABLE([static-gssglue], AS_HELP_STRING([--enable-static-gssglue]),
-- [static_gssglue=yes], [static_gssglue=no])
- AS_IF([test "x$enable_credssp" != "xno"], [
- if test -n "$PKG_CONFIG"; then
-- PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
-+ PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0])
- fi
-
- if test x"$WITH_CREDSSP" = "x1"; then
- CREDSSPOBJ="cssp.o"
-- CFLAGS="$CFLAGS $GSSGLUE_CFLAGS"
--
-- AS_IF([test "x$static_gssglue" != "xno"], [
-- LIBS="$LIBS -Wl,-Bstatic -lgssglue -Wl,-Bdynamic"
-- ], [
-- LIBS="$LIBS -lgssglue"
-- ])
-+ CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
-+ LIBS="$LIBS $GSSAPI_LIBS"
-
- AC_DEFINE(WITH_CREDSSP)
- else
- echo
-- echo "CredSSP support requires libgssglue, install the dependency"
-+ echo "CredSSP support requires GSSAPI, install the dependency"
- echo "or disable the feature using --disable-credssp."
- echo
- exit 1
diff --git a/user/rdesktop/signed-int.patch b/user/rdesktop/signed-int.patch
deleted file mode 100644
index 405a4dd3e..000000000
--- a/user/rdesktop/signed-int.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- rdesktop-1.8.4/orders.c.old 2019-01-02 14:03:25.000000000 +0000
-+++ rdesktop-1.8.4/orders.c 2019-01-09 17:13:26.170000000 +0000
-@@ -1266,7 +1266,7 @@
- in_uint16_le(s, flags); /* used by bmpcache2 */
- in_uint8(s, type);
-
-- if (!s_check_rem(s, length + 7))
-+ if (!s_check_rem(s, (sint16) length + 7))
- {
- rdp_protocol_error("process_secondary_order(), next order pointer would overrun stream", &packet);
- }
diff --git a/user/redis/APKBUILD b/user/redis/APKBUILD
index 1c2058d14..3e08ff14a 100644
--- a/user/redis/APKBUILD
+++ b/user/redis/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: V.Krishn <vkrishn4@gmail.com>
# Maintainer: Alyx Wolcott <alyx@leuhta.com>
pkgname=redis
-pkgver=5.0.6
+pkgver=5.0.7
pkgrel=0
pkgdesc="Advanced key-value store"
url="https://redis.io/"
arch="all"
license="BSD-3-Clause"
depends=""
-makedepends="linux-headers"
checkdepends="tcl"
+makedepends="linux-headers"
subpackages="$pkgname-openrc"
install="redis.pre-install"
pkgusers="redis"
@@ -79,7 +79,7 @@ package() {
install
}
-sha512sums="19a4738ec4c3ac077d57857559557685c56b0ac58ccfff5aac88a099894fa9a2bbe18ef126522960e38d6c0e8b0f9a00755879305c07caaa5add41bc677d44f3 redis-5.0.6.tar.gz
+sha512sums="75c1d4bcca3e28d80f6b6942f0153ff33538d706339c69bddd2646c36f88b901c77dde09fba5629ba90ace00077e45d37b0a822a863f9f737ef9a79eb7093d9d redis-5.0.7.tar.gz
f768acea3e1868dbf0596085640c83e58d899860d7d647b0965fa858844c494d0a49b229fb417456d83f3e2690e5450950c31e0fa40529df85a9cde38d8981c4 fix-ppc-atomics.patch
856ae98e9e8670801827c3bd793dc14ed2c62c37365f8d04b452d7e1ab97300a0bf18c59b52ea686c2689d53aeed8e29e2c55207d3d4fb1fd8fc7fc820f33157 posix-runtest.patch
91b663f802aea9a473195940d3bf2ce3ca2af4e5b6e61a2d28ebbfe502ef2c764b574b7e87c49e60345d1a5d6b73d12920924c93b26be110c2ce824023347b6f redis.initd
diff --git a/user/redland/APKBUILD b/user/redland/APKBUILD
index 1059aa845..d13582ff7 100644
--- a/user/redland/APKBUILD
+++ b/user/redland/APKBUILD
@@ -21,7 +21,6 @@ prepare() {
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,12 +34,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/redshift/APKBUILD b/user/redshift/APKBUILD
index 33a015d32..59bd659fd 100644
--- a/user/redshift/APKBUILD
+++ b/user/redshift/APKBUILD
@@ -7,14 +7,13 @@ pkgdesc="Adjust the color temperature of your screen according to your surroundi
url="http://jonls.dk/redshift/"
arch="all"
license="GPL-3.0+"
-options="!check" # No test suite
+options="!check" # No test suite.
depends=""
makedepends="glib-dev intltool libdrm-dev libx11-dev libxcb-dev libxxf86vm-dev"
subpackages="$pkgname-doc $pkgname-gui $pkgname-lang"
source="https://github.com/jonls/redshift/releases/download/v$pkgver/redshift-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,13 +34,12 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
doc() {
- cd "$builddir"
- install -Dm644 -t "$subpkgdir/usr/share/doc/$pkgname" redshift.conf.sample
+ install -Dm644 -t "$subpkgdir/usr/share/doc/$pkgname" \
+ "$builddir"/redshift.conf.sample
default_doc
}
diff --git a/user/rendercheck/APKBUILD b/user/rendercheck/APKBUILD
index 30a821e2c..10ba7f50c 100644
--- a/user/rendercheck/APKBUILD
+++ b/user/rendercheck/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/rendercheck-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/rfkill/APKBUILD b/user/rfkill/APKBUILD
index 9f9889e9a..38575aca5 100644
--- a/user/rfkill/APKBUILD
+++ b/user/rfkill/APKBUILD
@@ -10,18 +10,16 @@ options="!check" # No test suite.
license="MIT"
depends=""
makedepends=""
-install=""
subpackages="$pkgname-doc"
source="https://www.kernel.org/pub/software/network/rfkill/rfkill-$pkgver.tar.xz
- dont-use-git.patch"
+ dont-use-git.patch
+ "
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/rgb/APKBUILD b/user/rgb/APKBUILD
index 42be8cbe4..f45691ebc 100644
--- a/user/rgb/APKBUILD
+++ b/user/rgb/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/rgb-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/rinutils/APKBUILD b/user/rinutils/APKBUILD
new file mode 100644
index 000000000..9abfd0fc3
--- /dev/null
+++ b/user/rinutils/APKBUILD
@@ -0,0 +1,41 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=rinutils
+pkgver=0.2.0
+pkgrel=0
+pkgdesc="C11 utilities library"
+url=" "
+arch="noarch"
+license="Expat"
+depends=""
+checkdepends="cmocka-dev perl perl-dev perl-env-path perl-inline perl-inline-c
+ perl-path-tiny perl-string-shellquote perl-test-differences
+ perl-test-trailingspace"
+makedepends="cmake"
+# Headers-only library: no -dev split.
+subpackages=""
+source="https://github.com/shlomif/rinutils/releases/download/$pkgver/rinutils-$pkgver.tar.xz"
+
+build() {
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ ${CMAKE_CROSSOPTS} \
+ .
+ make
+}
+
+check() {
+ CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+ make DESTDIR="$pkgdir" install
+}
+
+sha512sums="82d09313f014fd118025438575a90dbc5b9a46d3d58ed9ffc774380d285b32ed00e7d9b453097ce0b8efc20a85a783e178b0d6831e925da3cd65f35037306dc3 rinutils-0.2.0.tar.xz"
diff --git a/user/ripgrep/APKBUILD b/user/ripgrep/APKBUILD
index 91444ec54..be18ce2e1 100644
--- a/user/ripgrep/APKBUILD
+++ b/user/ripgrep/APKBUILD
@@ -8,6 +8,7 @@ pkgdesc="Recursively searches directories for a regex pattern"
url="https://github.com/BurntSushi/ripgrep"
arch="all"
license="Unlicense"
+depends=""
makedepends="cargo pcre2-dev"
subpackages="$pkgname-zsh-completion:_zshcomp:noarch"
source=""
diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD
index 6dd2d5251..2beebf167 100644
--- a/user/ristretto/APKBUILD
+++ b/user/ristretto/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ristretto
pkgver=0.10.0
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Image viewer for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+ AND LGPL-2.0+"
+depends=""
makedepends="intltool libexif-dev gtk+2.0-dev libxfce4util-dev libxfce4ui-dev
libmagic"
subpackages="$pkgname-lang"
diff --git a/user/rlottie/APKBUILD b/user/rlottie/APKBUILD
new file mode 100644
index 000000000..4fc7fb579
--- /dev/null
+++ b/user/rlottie/APKBUILD
@@ -0,0 +1,36 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=rlottie
+pkgver=0.0.20200110
+_commit=f6fc61f214945ac9961ba49fdfc9a3d3336e999b
+pkgrel=0
+pkgdesc="Library for Lottie animations"
+url=" "
+arch="all"
+license="LGPL-2.1+ AND MIT AND BSD-3-Clause"
+depends=""
+makedepends="meson ninja"
+subpackages="$pkgname-dev"
+source="rlottie-$pkgver.tar.gz::https://github.com/Samsung/rlottie/archive/$_commit.tar.gz"
+builddir="$srcdir/rlottie-$_commit"
+
+build() {
+ meson \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var \
+ --buildtype=release \
+ . build
+ ninja -C build
+}
+
+check() {
+ ninja -C build test
+}
+
+package() {
+ DESTDIR="$pkgdir" ninja -C build install
+}
+
+sha512sums="e78470254ab7b9653dcd95037001a1763f4229bdc611f4631943f302b20739a6e4b519d54c967c1ecd7bcc4b555bb8f651af0bceebc04cc9ea41789360b49af4 rlottie-0.0.20200110.tar.gz"
diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD
index a679afb20..561db860f 100644
--- a/user/rocs/APKBUILD
+++ b/user/rocs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=rocs
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Graph theory IDE"
url="https://www.kde.org/applications/education/rocs/"
@@ -14,10 +14,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev boost-dev
karchive-dev kconfig-dev kcoreaddons-dev kcrash-dev kdeclarative-dev
ki18n-dev kitemviews-dev ktexteditor-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/rocs-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/rocs-$pkgver.tar.xz
+ webkit.patch
+ "
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +29,17 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="2832a0dfe83076100357c86eeb3ad0fccf55f667bd4b86c0cd8bd2db21f8b323a524d3016db9509f7bfee1837820d9bcdac0dc4dd8a4e5d2af020f8102b4aa0d rocs-19.08.2.tar.xz"
+sha512sums="4477a9b995419087871c8c3b03c8df22db8107a78683417e13ecf7780af83e197ced6efadc4e4f47b47cb24ff7f85cf053c3b54a4cd737f833011aef80ab063b rocs-19.12.1.tar.xz
+0ed6660f78096d0f6b53e563f7c632dd1616beda4032a3a6556aef20dc1c79f6a31b93a377b005a1d3acaecd9da7b20ae8c0b3e7e36d97ef65837b207d3e94b3 webkit.patch"
diff --git a/user/rocs/webkit.patch b/user/rocs/webkit.patch
new file mode 100644
index 000000000..87ba9e747
--- /dev/null
+++ b/user/rocs/webkit.patch
@@ -0,0 +1,11 @@
+--- rocs-19.12.0/src/CMakeLists.txt.old 2019-12-05 19:44:59.000000000 +0000
++++ rocs-19.12.0/src/CMakeLists.txt 2020-01-05 05:05:52.820317770 +0000
+@@ -103,7 +103,7 @@
+ Qt5::Core
+ Qt5::Quick
+ Qt5::QuickWidgets
+- Qt5::WebKit
++ Qt5::WebKitLegacy
+ Qt5::WebKitWidgets
+ Qt5::XmlPatterns
+ )
diff --git a/user/rpcbind/APKBUILD b/user/rpcbind/APKBUILD
index d1af0d6f9..a535b8c7a 100644
--- a/user/rpcbind/APKBUILD
+++ b/user/rpcbind/APKBUILD
@@ -9,15 +9,15 @@ arch="all"
options="!check" # No test suite.
license="BSD-3-Clause"
depends=""
-install="$pkgname.pre-install $pkgname.pre-upgrade"
makedepends="libtirpc-dev bsd-compat-headers"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
subpackages="$pkgname-dbg $pkgname-doc $pkgname-openrc"
source="http://downloads.sourceforge.net/project/rpcbind/rpcbind/$pkgver/rpcbind-$pkgver.tar.bz2
rpcbind.initd
- rpcbind.confd"
+ rpcbind.confd
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +32,12 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/rpcbind.initd "$pkgdir"/etc/init.d/rpcbind
install -Dm644 "$srcdir"/rpcbind.confd "$pkgdir"/etc/conf.d/rpcbind
install -D -m644 COPYING "$pkgdir"/usr/share/licenses/rpcbind/COPYING
}
+
sha512sums="e884c4757950ccead0f9a07f50625a63e6f18f9bfae9fcfffa3e5fa4b7a66c3a99d9fa303061848fe8211509d5456f24ff26e4579af6e161a35522268f3ef3e4 rpcbind-1.2.5.tar.bz2
1cd655d86226a45fa3e927f8ac2bb580537644d2fb3684e0f4a956bf3721c95d95b8b8c1d9a2a742fb714eeba9277e0400a7493bf1bf676466d70adb2b35a88e rpcbind.initd
0641087162ebc8fb10c5cb329105261d77cad073daed3f9a6c92574177298cd8a19a87b62dde14161cc554b5e68680cfd870b5334f3cfd8d6074ec8a43f4dfe3 rpcbind.confd"
diff --git a/user/rpcsvc-proto/APKBUILD b/user/rpcsvc-proto/APKBUILD
index 533e63cc5..2ae70b29c 100644
--- a/user/rpcsvc-proto/APKBUILD
+++ b/user/rpcsvc-proto/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://github.com/thkukuk/rpcsvc-proto/releases/download/v$pkgver/rpcsvc-proto-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/rpm2targz/APKBUILD b/user/rpm2targz/APKBUILD
index ca2cd6a5a..05c55a912 100644
--- a/user/rpm2targz/APKBUILD
+++ b/user/rpm2targz/APKBUILD
@@ -13,17 +13,14 @@ subpackages=""
source="https://distfiles.adelielinux.org/source/rpm2targz-$pkgver.tar.xz"
build() {
- cd "$builddir"
make
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/rrdtool/APKBUILD b/user/rrdtool/APKBUILD
index bec89b8ca..c4fdcd582 100644
--- a/user/rrdtool/APKBUILD
+++ b/user/rrdtool/APKBUILD
@@ -19,7 +19,6 @@ source="https://oss.oetiker.ch/$pkgname/pub/$pkgname-$pkgver.tar.gz
"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
LANG=C.UTF-8 LC_ALL=C.UTF-8 TZ=UTC make check
}
package() {
- cd "$builddir"
export INSTALLDIRS=vendor
make DESTDIR="$pkgdir" install
find "$pkgdir" -name '.packlist' -delete
@@ -52,7 +49,7 @@ dev() {
}
perl_rrd() {
- depends=
+ depends=""
pkgdesc="Perl interface for rrdtool"
mkdir -p "$subpkgdir"/usr/lib \
"$pkgdir"/usr/share
@@ -61,7 +58,7 @@ perl_rrd() {
}
cached() {
- depends=
+ depends=""
pkgdesc="RRDtool data caching daemon"
mkdir -p "$subpkgdir"/usr/sbin \
"$subpkgdir"/var/lib/rrdcached/db \
@@ -71,14 +68,14 @@ cached() {
}
cgi() {
- depends=
+ depends=""
pkgdesc="Create web pages containing RRD graphs based on templates"
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/rrdcgi "$subpkgdir"/usr/bin
}
utils() {
- depends=
+ depends=""
pkgdesc="RRDtool standalone utilities"
mkdir -p "$subpkgdir"/usr/bin
mv "$pkgdir"/usr/bin/rrdinfo \
diff --git a/user/rsibreak/APKBUILD b/user/rsibreak/APKBUILD
index fd3864d48..d07cd72eb 100644
--- a/user/rsibreak/APKBUILD
+++ b/user/rsibreak/APKBUILD
@@ -27,7 +27,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/rtmpdump/APKBUILD b/user/rtmpdump/APKBUILD
index eb14d000c..7ece78237 100644
--- a/user/rtmpdump/APKBUILD
+++ b/user/rtmpdump/APKBUILD
@@ -13,7 +13,9 @@ depends_dev="zlib-dev"
makedepends="$depends_dev linux-headers openssl-dev"
subpackages="$pkgname-dev $pkgname-doc librtmp"
source="https://distfiles.adelielinux.org/source/rtmpdump-$pkgver.tar.xz
- fix-chunk-size.patch"
+ fix-chunk-size.patch
+ openssl11.patch
+ "
build() {
make
@@ -31,4 +33,5 @@ librtmp() {
}
sha512sums="5273452508b3187aa1a7431fb0b44b1a5883dc6b28f6eda92b4a2db6925c72dea68bdd666a2affd68476ef8db714db4022a9417323c8ef3c58bbf1f407fe99d4 rtmpdump-2.4.tar.xz
-f97b4780fb8cfffccf59785c5a89c8d4929e21ec587192f10602caaf9a0b008dfbfebaa09db1d9d955fc9911fc443d76bf19972cc59fedfab5a8889f7fe70b5d fix-chunk-size.patch"
+f97b4780fb8cfffccf59785c5a89c8d4929e21ec587192f10602caaf9a0b008dfbfebaa09db1d9d955fc9911fc443d76bf19972cc59fedfab5a8889f7fe70b5d fix-chunk-size.patch
+6533efc24d22b55cea8db0ba2d4ed5fc2672e17b2ef80a987a65f54abe815cb1337b571a9e2a6cd12b826d129da427c2c0e1c16241f24e67a3ca66761a894e2d openssl11.patch"
diff --git a/user/rtmpdump/openssl11.patch b/user/rtmpdump/openssl11.patch
new file mode 100644
index 000000000..ba4ad9359
--- /dev/null
+++ b/user/rtmpdump/openssl11.patch
@@ -0,0 +1,251 @@
+Another Great Gentoo Hack™.
+
+"Upstream": https://gitweb.gentoo.org/repo/gentoo.git/plain/media-video/rtmpdump/files/rtmpdump-openssl-1.1-v2.patch
+Originally from: https://raw.githubusercontent.com/xbmc/inputstream.rtmp/master/depends/common/librtmp/0003-openssl-1.1.patch
+See also: https://github.com/xbmc/inputstream.rtmp/pull/46
+--- a/librtmp/dh.h
++++ b/librtmp/dh.h
+@@ -253,20 +253,42 @@
+ if (!dh)
+ goto failed;
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ MP_new(dh->g);
+
+ if (!dh->g)
+ goto failed;
++#else
++ BIGNUM *g = NULL;
++ MP_new(g);
++ if (!g)
++ goto failed;
++#endif
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ MP_gethex(dh->p, P1024, res); /* prime P1024, see dhgroups.h */
++#else
++ BIGNUM* p = NULL;
++ DH_get0_pqg(dh, (BIGNUM const**)&p, NULL, NULL);
++ MP_gethex(p, P1024, res); /* prime P1024, see dhgroups.h */
++#endif
+ if (!res)
+ {
+ goto failed;
+ }
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ MP_set_w(dh->g, 2); /* base 2 */
++#else
++ MP_set_w(g, 2); /* base 2 */
++ DH_set0_pqg(dh, p, NULL, g);
++#endif
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ dh->length = nKeyBits;
++#else
++ DH_set_length(dh, nKeyBits);
++#endif
+ return dh;
+
+ failed:
+@@ -293,12 +315,24 @@
+ MP_gethex(q1, Q1024, res);
+ assert(res);
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ res = isValidPublicKey(dh->pub_key, dh->p, q1);
++#else
++ BIGNUM const* pub_key = NULL;
++ BIGNUM const* p = NULL;
++ DH_get0_key(dh, &pub_key, NULL);
++ DH_get0_pqg(dh, &p, NULL, NULL);
++ res = isValidPublicKey((BIGNUM*)pub_key, (BIGNUM*)p, q1);
++#endif
+ if (!res)
+ {
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ MP_free(dh->pub_key);
+ MP_free(dh->priv_key);
+ dh->pub_key = dh->priv_key = 0;
++#else
++ DH_free(dh);
++#endif
+ }
+
+ MP_free(q1);
+@@ -314,15 +348,29 @@
+ DHGetPublicKey(MDH *dh, uint8_t *pubkey, size_t nPubkeyLen)
+ {
+ int len;
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (!dh || !dh->pub_key)
++#else
++ BIGNUM const* pub_key = NULL;
++ DH_get0_key(dh, &pub_key, NULL);
++ if (!dh || !pub_key)
++#endif
+ return 0;
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ len = MP_bytes(dh->pub_key);
++#else
++ len = MP_bytes(pub_key);
++#endif
+ if (len <= 0 || len > (int) nPubkeyLen)
+ return 0;
+
+ memset(pubkey, 0, nPubkeyLen);
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ MP_setbin(dh->pub_key, pubkey + (nPubkeyLen - len), len);
++#else
++ MP_setbin(pub_key, pubkey + (nPubkeyLen - len), len);
++#endif
+ return 1;
+ }
+
+@@ -364,7 +412,13 @@
+ MP_gethex(q1, Q1024, len);
+ assert(len);
+
++#if !defined(USE_OPENSSL) || !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
+ if (isValidPublicKey(pubkeyBn, dh->p, q1))
++#else
++ BIGNUM const* p = NULL;
++ DH_get0_pqg(dh, &p, NULL, NULL);
++ if (isValidPublicKey(pubkeyBn, (BIGNUM*)p, q1))
++#endif
+ res = MDH_compute_key(secret, nPubkeyLen, pubkeyBn, dh);
+ else
+ res = -1;
+--- a/librtmp/handshake.h
++++ b/librtmp/handshake.h
+@@ -31,9 +31,9 @@
+ #define SHA256_DIGEST_LENGTH 32
+ #endif
+ #define HMAC_CTX sha2_context
+-#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
+-#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len)
+-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
++#define HMAC_setup(ctx, key, len) sha2_hmac_starts(ctx, (unsigned char *)key, len, 0)
++#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(ctx, buf, len)
++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
+
+ typedef arc4_context * RC4_handle;
+ #define RC4_alloc(h) *h = malloc(sizeof(arc4_context))
+@@ -50,9 +50,9 @@
+ #endif
+ #undef HMAC_CTX
+ #define HMAC_CTX struct hmac_sha256_ctx
+-#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key)
+-#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf)
+-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
++#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(ctx, len, key)
++#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(ctx, len, buf)
++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
+ #define HMAC_close(ctx)
+
+ typedef struct arcfour_ctx* RC4_handle;
+@@ -64,14 +64,23 @@
+
+ #else /* USE_OPENSSL */
+ #include <openssl/sha.h>
++#include <openssl/ossl_typ.h>
+ #include <openssl/hmac.h>
+ #include <openssl/rc4.h>
+ #if OPENSSL_VERSION_NUMBER < 0x0090800 || !defined(SHA256_DIGEST_LENGTH)
+ #error Your OpenSSL is too old, need 0.9.8 or newer with SHA256
+ #endif
+-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0)
+-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, buf, len)
+-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
++#else
++#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
++#endif
++#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, buf, len)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_cleanup(ctx)
++#else
++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, dig, &dlen); HMAC_CTX_free(ctx)
++#endif
+
+ typedef RC4_KEY * RC4_handle;
+ #define RC4_alloc(h) *h = malloc(sizeof(RC4_KEY))
+@@ -117,7 +126,7 @@
+ {
+ uint8_t digest[SHA256_DIGEST_LENGTH];
+ unsigned int digestLen = 0;
+- HMAC_CTX ctx;
++ HMAC_CTX* ctx = NULL;
+
+ RC4_alloc(rc4keyIn);
+ RC4_alloc(rc4keyOut);
+@@ -266,7 +275,7 @@
+ size_t keylen, uint8_t *digest)
+ {
+ unsigned int digestLen;
+- HMAC_CTX ctx;
++ HMAC_CTX* ctx = NULL;
+
+ HMAC_setup(ctx, key, keylen);
+ HMAC_crunch(ctx, message, messageLen);
+--- a/librtmp/hashswf.c
++++ b/librtmp/hashswf.c
+@@ -37,9 +37,9 @@
+ #define SHA256_DIGEST_LENGTH 32
+ #endif
+ #define HMAC_CTX sha2_context
+-#define HMAC_setup(ctx, key, len) sha2_hmac_starts(&ctx, (unsigned char *)key, len, 0)
+-#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(&ctx, buf, len)
+-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(&ctx, dig)
++#define HMAC_setup(ctx, key, len) sha2_hmac_starts(ctx, (unsigned char *)key, len, 0)
++#define HMAC_crunch(ctx, buf, len) sha2_hmac_update(ctx, buf, len)
++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; sha2_hmac_finish(ctx, dig)
+ #define HMAC_close(ctx)
+ #elif defined(USE_GNUTLS)
+ #include <nettle/hmac.h>
+@@ -48,19 +48,27 @@
+ #endif
+ #undef HMAC_CTX
+ #define HMAC_CTX struct hmac_sha256_ctx
+-#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(&ctx, len, key)
+-#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(&ctx, len, buf)
+-#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(&ctx, SHA256_DIGEST_LENGTH, dig)
++#define HMAC_setup(ctx, key, len) hmac_sha256_set_key(ctx, len, key)
++#define HMAC_crunch(ctx, buf, len) hmac_sha256_update(ctx, len, buf)
++#define HMAC_finish(ctx, dig, dlen) dlen = SHA256_DIGEST_LENGTH; hmac_sha256_digest(ctx, SHA256_DIGEST_LENGTH, dig)
+ #define HMAC_close(ctx)
+ #else /* USE_OPENSSL */
+ #include <openssl/ssl.h>
+ #include <openssl/sha.h>
+ #include <openssl/hmac.h>
+ #include <openssl/rc4.h>
+-#define HMAC_setup(ctx, key, len) HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (unsigned char *)key, len, EVP_sha256(), 0)
+-#define HMAC_crunch(ctx, buf, len) HMAC_Update(&ctx, (unsigned char *)buf, len)
+-#define HMAC_finish(ctx, dig, dlen) HMAC_Final(&ctx, (unsigned char *)dig, &dlen);
+-#define HMAC_close(ctx) HMAC_CTX_cleanup(&ctx)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#define HMAC_setup(ctx, key, len) HMAC_CTX_init(ctx); HMAC_Init_ex(ctx, (unsigned char *)key, len, EVP_sha256(), 0)
++#else
++#define HMAC_setup(ctx, key, len) ctx = HMAC_CTX_new(); HMAC_CTX_reset(ctx); HMAC_Init_ex(ctx, key, len, EVP_sha256(), 0)
++#endif
++#define HMAC_crunch(ctx, buf, len) HMAC_Update(ctx, (unsigned char *)buf, len)
++#define HMAC_finish(ctx, dig, dlen) HMAC_Final(ctx, (unsigned char *)dig, &dlen);
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++#define HMAC_close(ctx) HMAC_CTX_cleanup(ctx)
++#else
++#define HMAC_close(ctx) HMAC_CTX_reset(ctx); HMAC_CTX_free(ctx)
++#endif
+ #endif
+
+ extern void RTMP_TLS_Init();
+@@ -289,7 +297,7 @@
+ struct info
+ {
+ z_stream *zs;
+- HMAC_CTX ctx;
++ HMAC_CTX *ctx;
+ int first;
+ int zlib;
+ int size;
diff --git a/user/rttr/APKBUILD b/user/rttr/APKBUILD
index bb9b5e7b0..58d0bb293 100644
--- a/user/rttr/APKBUILD
+++ b/user/rttr/APKBUILD
@@ -8,7 +8,7 @@ url=" "
arch="all"
license="MIT"
depends=""
-makedepends="doxygen graphviz"
+makedepends="cmake doxygen graphviz"
subpackages="$pkgname-dev $pkgname-doc"
source="https://github.com/rttrorg/rttr/releases/download/v$pkgver/rttr-$pkgver-src.tar.gz
arm64.patch
@@ -27,7 +27,7 @@ build() {
-DBUILD_SHARED_LIBS=True \
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS -Wno-error=class-memaccess -DNDEBUG" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/rubberband/APKBUILD b/user/rubberband/APKBUILD
index 4bbe58f6c..0a5c2d851 100644
--- a/user/rubberband/APKBUILD
+++ b/user/rubberband/APKBUILD
@@ -1,20 +1,21 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=rubberband
pkgver=1.8.2
pkgrel=0
pkgdesc="Library for audio time-stretching and pitch-shifting"
url="https://www.breakfastquay.com/rubberband/"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="BSD-4-Clause AND BSD-3-Clause AND GPL-2.0+"
+depends=""
makedepends="libsamplerate-dev libsndfile-dev fftw-dev vamp-sdk-dev ladspa-dev"
subpackages="$pkgname-dev"
source="https://breakfastquay.com/files/releases/rubberband-$pkgver.tar.bz2
- no-jni.patch"
+ no-jni.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,7 +27,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/ruby-bundler/APKBUILD b/user/ruby-bundler/APKBUILD
index d3c470b51..b553c1187 100644
--- a/user/ruby-bundler/APKBUILD
+++ b/user/ruby-bundler/APKBUILD
@@ -2,15 +2,16 @@
# Maintainer: Alyx Wolcott <alyx@leuhta.com>
_gemname=bundler
pkgname=ruby-$_gemname
-pkgver=2.0.2
+pkgver=2.1.2
pkgrel=0
pkgdesc="Manage an application's gem dependencies"
url="https://bundler.io/"
arch="noarch"
+options="!check"
license="MIT"
depends="ruby ruby-dev"
+makedepends=""
subpackages="$pkgname-doc"
-options="!check"
source="https://rubygems.org/downloads/$_gemname-$pkgver.gem"
builddir="$srcdir/$_gemname-$pkgver"
@@ -25,7 +26,7 @@ package() {
--verbose \
"$srcdir"/$_gemname-$pkgver.gem
- local n; for n in 1 5; do
+ for n in 1 5; do
mkdir -p "$pkgdir"/usr/share/man/man$n
mv "$gemdir"/gems/$_gemname-$pkgver/man/*.$n "$pkgdir"/usr/share/man/man$n/
done
@@ -38,4 +39,4 @@ package() {
}
-sha512sums="f41fe9e385fbf42859f3514b71abdaa1fd787f4ff4b1169b8ee40ea7778c114657c60ca3d6d6d72fbe972af0558f0cccd9c9f28cad7fc712ada27f037dce8a6a bundler-2.0.2.gem"
+sha512sums="2a3b42fa2c6f40998c900eaf9d81d6417970f3daa572e4f1c5cc954fd8ce1e3cacbda0dc9b77d44b2fa756cfb1e72838ef3edee1812881198bbe8c946017e22b bundler-2.1.2.gem"
diff --git a/user/ruby-diff-lcs/APKBUILD b/user/ruby-diff-lcs/APKBUILD
index c6f163ada..5dbca7146 100644
--- a/user/ruby-diff-lcs/APKBUILD
+++ b/user/ruby-diff-lcs/APKBUILD
@@ -15,7 +15,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/halostatue/$_gemname/archive
builddir="$srcdir/$_gemname-$pkgver"
build() {
- cd "$builddir"
gem build $_gemname.gemspec
}
@@ -23,7 +22,6 @@ package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
local geminstdir="$gemdir/gems/$_gemname-$pkgver"
- cd "$builddir"
gem install --local \
--install-dir "$gemdir" \
--bindir "$pkgdir/usr/bin" \
diff --git a/user/ruby-rake-compiler/APKBUILD b/user/ruby-rake-compiler/APKBUILD
index cdd459e33..be2ed80b0 100644
--- a/user/ruby-rake-compiler/APKBUILD
+++ b/user/ruby-rake-compiler/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=ruby-rake-compiler
_gemname=${pkgname#ruby-}
-pkgver=1.0.8
+pkgver=1.0.9
pkgrel=0
pkgdesc="Provide a standard and simplified way to build and package Ruby extensions"
url="https://github.com/rake-compiler/rake-compiler"
@@ -10,25 +10,22 @@ arch="noarch"
license="MIT"
depends="ruby ruby-rake"
checkdepends="ruby-rspec"
+makedepends=""
source="$pkgname-$pkgver.tar.gz::https://github.com/rake-compiler/$_gemname/archive/v$pkgver.tar.gz
gemfile-remove-unwanted-files.patch"
builddir="$srcdir/$_gemname-$pkgver"
build() {
- cd "$builddir"
gem build $_gemname.gemspec
}
check() {
- cd "$builddir"
rspec spec
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
- cd "$builddir"
-
gem install --local \
--install-dir "$gemdir" \
--bindir "$pkgdir/usr/bin" \
@@ -42,5 +39,5 @@ package() {
rm -r cache build_info doc
}
-sha512sums="30b753d45a1180e034b520ad6385f2799098f0916d55e8b4729f5e3a29dabc1acfa292475edfb384c7809543e1c3e428e28db1bacb5383deb9f4bb31b18d6fe5 ruby-rake-compiler-1.0.8.tar.gz
-e68672541d62898bc72fb7e40f16bc75ed1d46eabedd18da60a6f0673d67bf63d990e191fb41d6034e3f6361662807030cbd8f0c817223a5d03c46a3a664f855 gemfile-remove-unwanted-files.patch"
+sha512sums="8a5ccbc4bbe6a546634f939c1cbe42b35d952173bbe914e7a22eb78f3f2e85b48e207ff36b70432fe469a2d07d62b8e59c9827352181122fde76ba89bbc2aca0 ruby-rake-compiler-1.0.9.tar.gz
+21feda7887b7fe0978f906d407ecd44d7f25e334e7ee8ff27f73e71d494bd10af4174d7373652b29b1a8eaf95f53f2c8581879088f343e7f045fc265eecf7eac gemfile-remove-unwanted-files.patch"
diff --git a/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch b/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch
index 3424cd912..6c2909c09 100644
--- a/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch
+++ b/user/ruby-rake-compiler/gemfile-remove-unwanted-files.patch
@@ -1,6 +1,6 @@
--- a/rake-compiler.gemspec
+++ b/rake-compiler.gemspec
-@@ -22,14 +22,8 @@
+@@ -23,14 +23,8 @@
s.add_development_dependency 'cucumber', '~> 1.1.4'
# components, files and paths
@@ -11,16 +11,16 @@
- s.files += Dir.glob("spec/**/*.rb")
- s.files += Dir.glob("tasks/**/*.rake")
- s.files += ["Rakefile", "Gemfile"]
-- s.files += Dir.glob("*.{rdoc,txt,yml}")
+- s.files += Dir.glob("*.{md,rdoc,txt,yml}")
s.bindir = 'bin'
s.executables = ['rake-compiler']
-@@ -38,8 +32,6 @@
+@@ -39,8 +33,6 @@
# documentation
- s.rdoc_options << '--main' << 'README.rdoc' << '--title' << 'rake-compiler -- Documentation'
+ s.rdoc_options << '--main' << 'README.md' << '--title' << 'rake-compiler -- Documentation'
-
-- s.extra_rdoc_files = %w(README.rdoc LICENSE.txt History.txt)
+- s.extra_rdoc_files = %w(README.md LICENSE.txt History.txt)
# project information
s.homepage = 'https://github.com/rake-compiler/rake-compiler'
diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD
index 0f4beb483..6168bb2ba 100644
--- a/user/ruby-rspec-core/APKBUILD
+++ b/user/ruby-rspec-core/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=ruby-rspec-core
_gemname=${pkgname#ruby-}
-pkgver=3.8.2
+pkgver=3.9.0
pkgrel=0
pkgdesc="RSpec runner and formatters"
url="https://relishapp.com/rspec/rspec-core"
@@ -10,8 +10,10 @@ arch="noarch"
options="!check" # rspec's tests are written in rspec
license="MIT"
depends="ruby ruby-rspec-support~=${pkgver%.*}"
+makedepends=""
source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz
- gemspec.patch"
+ gemspec.patch
+ "
builddir="$srcdir/$_gemname-$pkgver"
build() {
@@ -35,5 +37,5 @@ package() {
"$gemdir"/doc
}
-sha512sums="2fe88ee3d66ecf134562dfa7b1001f23a1a750640c4f65cdec64d85dd735e0fde9d91479286f8f9c38064746813f41632d12d21b3926724ccd7c9ded50d2a7c8 ruby-rspec-core-3.8.2.tar.gz
+sha512sums="c4e1136ea671d51f00c6de3067a479b15785fcb0f580fbdc57a9d35f852f10ec4b86e842a534536cc520175510de559f4d03dbc3fbd34fb22df411e89d06d662 ruby-rspec-core-3.9.0.tar.gz
e0cbcfddcc4c73d9b9673907e3b1a785b399c0b3b213761e9dbca9fadc55d50a88389eaf561f5603bd674eb94ce9f2ecf829d884eaa77df8ef1b565c0c7f25f2 gemspec.patch"
diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD
index 5ba129a65..b78363e57 100644
--- a/user/ruby-rspec-expectations/APKBUILD
+++ b/user/ruby-rspec-expectations/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=ruby-rspec-expectations
_gemname=${pkgname#ruby-}
-pkgver=3.8.5
+pkgver=3.9.0
pkgrel=0
pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec"
url="https://relishapp.com/rspec/rspec-expectations/"
@@ -10,19 +10,19 @@ arch="noarch"
options="!check" # rspec's tests are written in rspec
license="MIT"
depends="ruby ruby-diff-lcs ruby-rspec-support~=${pkgver%.*}"
+makedepends=""
source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz
- gemspec.patch"
+ gemspec.patch
+ "
builddir="$srcdir/$_gemname-$pkgver"
build() {
- cd "$builddir"
gem build $_gemname.gemspec
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
- cd "$builddir"
gem install --local \
--install-dir "$gemdir" \
--ignore-dependencies \
@@ -36,5 +36,5 @@ package() {
"$gemdir"/doc
}
-sha512sums="3d7042e00e3b0f55c653abe0c4f581989c8d400cfaf8da23c45cd2511afc34044bf5979f202ad5cbf430667ce10703525c86d00f8a29fac150f8ff40312e5b14 ruby-rspec-expectations-3.8.5.tar.gz
+sha512sums="663b9739681c19b5bb1301447017ce4e10bc377ea3f4e51745ccfaa12b014a47e893aeb262b6fa3792e823adb90ae7a15f5c146c48aa80c72eec5faaf84d516c ruby-rspec-expectations-3.9.0.tar.gz
1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346 gemspec.patch"
diff --git a/user/ruby-rspec-mocks/APKBUILD b/user/ruby-rspec-mocks/APKBUILD
index b89f955be..d2b3fab97 100644
--- a/user/ruby-rspec-mocks/APKBUILD
+++ b/user/ruby-rspec-mocks/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=ruby-rspec-mocks
_gemname=${pkgname#ruby-}
-pkgver=3.8.2
+pkgver=3.9.0
pkgrel=0
pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking"
url="https://relishapp.com/rspec/rspec-mocks/"
@@ -10,19 +10,19 @@ arch="noarch"
options="!check" # rspec's tests are written in rspec
license="MIT"
depends="ruby ruby-diff-lcs ruby-rspec-support~=${pkgver%.*}"
+makedepends=""
source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz
- gemspec.patch"
+ gemspec.patch
+ "
builddir="$srcdir/$_gemname-$pkgver"
build() {
- cd "$builddir"
gem build $_gemname.gemspec
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
- cd "$builddir"
gem install --local \
--install-dir "$gemdir" \
--ignore-dependencies \
@@ -36,5 +36,5 @@ package() {
"$gemdir"/doc
}
-sha512sums="42b9b952386ce862a1cc19116991ae6b4633d551db057babe2e4aa6553acb6eafbb05b98df8a5c6cb362a00025ac3ce0f43f3c4e4ea63343c8bf0dad769a3aed ruby-rspec-mocks-3.8.2.tar.gz
+sha512sums="bb6bb5d5dc272e0e0726d23069e0087f780f57614840208816867c570173f1980a43c2cc955c68b2ceca58828951229361305551a4b6bf3530880db843a49bf9 ruby-rspec-mocks-3.9.0.tar.gz
6fd7ab08b20a93f806a8d3c42da5da0a99162793079ecb1695341a04dff2a7cefdb12592d1798fb844dfbdf8ead6ad0b8729e461d3cd5af46d853b182d15228d gemspec.patch"
diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD
index a91d0d9dc..2e4f838e2 100644
--- a/user/ruby-rspec-support/APKBUILD
+++ b/user/ruby-rspec-support/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=ruby-rspec-support
_gemname=${pkgname#ruby-}
-pkgver=3.8.3
+pkgver=3.9.0
pkgrel=0
pkgdesc="Support utilities for RSpec gems"
url="https://rubygems.org/gems/rspec-support"
@@ -10,19 +10,19 @@ arch="noarch"
options="!check" # rspec's tests are written in rspec
license="MIT"
depends="ruby"
+makedepends=""
source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz
- gemspec.patch"
+ gemspec.patch
+ "
builddir="$srcdir/$_gemname-$pkgver"
build() {
- cd "$builddir"
gem build $_gemname.gemspec
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
- cd "$builddir"
gem install --local \
--install-dir "$gemdir" \
--ignore-dependencies \
@@ -36,5 +36,5 @@ package() {
"$gemdir"/doc
}
-sha512sums="90d678e08ca93be30ace986a60aba4c4a81a58d7c56d34863aca70f91efe92480299970aa7eb158e3f8c4878b1ea3303aa0afabfc8c7782bc78f7f63b90b4f9a ruby-rspec-support-3.8.3.tar.gz
+sha512sums="10e8fa4af59097891219f00e2ced5940e7a5bc67d946fbd348683d2246a4a491e62f7bac6bb757e14d82bb0ba970fe5633609ca4ab2c97c4900719b8004cf4b5 ruby-rspec-support-3.9.0.tar.gz
e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731 gemspec.patch"
diff --git a/user/ruby-rspec/APKBUILD b/user/ruby-rspec/APKBUILD
index 7c6f5ef10..d95857860 100644
--- a/user/ruby-rspec/APKBUILD
+++ b/user/ruby-rspec/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=ruby-rspec
_gemname=${pkgname#ruby-}
-pkgver=3.8.0
+pkgver=3.9.0
pkgrel=0
pkgdesc="Behaviour Driven Development for Ruby"
url="http://rspec.info/"
@@ -13,19 +13,18 @@ depends="ruby
ruby-rspec-core~=${pkgver%.*}
ruby-rspec-expectations~=${pkgver%.*}
ruby-rspec-mocks~=${pkgver%.*}"
+makedepends=""
source="$pkgname-$pkgver.tar.gz::https://github.com/rspec/$_gemname/archive/v$pkgver.tar.gz
gemspec.patch"
builddir="$srcdir/$_gemname-$pkgver"
build() {
- cd "$builddir"
gem build $_gemname.gemspec
}
package() {
local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
- cd "$builddir"
gem install --local \
--install-dir "$gemdir" \
--ignore-dependencies \
@@ -39,5 +38,5 @@ package() {
"$gemdir"/doc
}
-sha512sums="0468bfab40de2acb622c772101aef7cc71364c3414344848e90a91376106ae7597d0abcdacebe3a9fad6140780008619d9450bc0842b6e5c9e95bafb9fccae9b ruby-rspec-3.8.0.tar.gz
+sha512sums="f6869ca17252ad27de1307b9c75f7184e4b397000fdabe9ab9bcd02805981549831c82f5d5c07838315da2c3a1e004431e02714291bb9da3bd83ac0ee56c170c ruby-rspec-3.9.0.tar.gz
f554eef881574e68532dd6c9edeb6b8ad172ac707f7518134378e1099a40ada959c6c770514aab13a6345343113594208be0e42044803c0c2cde3adde00c5520 gemspec.patch"
diff --git a/user/rxvt-unicode/APKBUILD b/user/rxvt-unicode/APKBUILD
index f9c836dde..b9802516b 100644
--- a/user/rxvt-unicode/APKBUILD
+++ b/user/rxvt-unicode/APKBUILD
@@ -12,16 +12,17 @@ arch="all"
options="!check" # No test suite.
license="(GPL-2.0+ OR BSD-2-Clause) AND GPL-2.0+ AND GPL-3.0+"
depends="$pkgname-terminfo"
-makedepends="libx11-dev libxft-dev ncurses fontconfig-dev
+makedepends="libx11-dev libxft-dev ncurses fontconfig-dev utmps-dev
gdk-pixbuf-dev libxrender-dev perl-dev startup-notification-dev"
subpackages="$pkgname-doc $pkgname-terminfo::noarch"
source="http://dist.schmorp.de/$pkgname/$pkgname-$pkgver.tar.bz2
gentables.patch
- kerning.patch"
+ kerning.patch
+ "
build() {
- cd "$builddir"
- ./configure \
+ export CXXFLAGS="$CXXFLAGS -DWTMPX_FILE=\\\"\"/run/utmps/wtmp\"\\\""
+ LIBS="-lutmps -lskarnet" ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
@@ -40,10 +41,7 @@ build() {
--enable-text-blink \
--enable-fading \
--enable-startup-notification \
- --enable-unicode3 \
- --disable-utmp \
- --disable-wtmp \
- --disable-lastlog
+ --enable-unicode3
make
}
@@ -54,7 +52,6 @@ package() {
export TERMINFO="$pkgdir/usr/share/terminfo"
mkdir -p "$TERMINFO"
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD
index c2d36c2df..4fbbfe04a 100644
--- a/user/s6-dns/APKBUILD
+++ b/user/s6-dns/APKBUILD
@@ -9,13 +9,12 @@ arch="all"
options="!check"
license="ISC"
_skalibs_version=2.9
-depends=
+depends=""
makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--enable-shared \
--enable-static \
@@ -28,42 +27,36 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-
libs() {
- pkgdesc="$pkgdesc (shared libraries)"
- depends="skalibs-libs>=$_skalibs_version"
- mkdir -p "$subpkgdir/usr/lib"
- mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/"
+ pkgdesc="$pkgdesc (shared libraries)"
+ depends="skalibs-libs>=$_skalibs_version"
+ mkdir -p "$subpkgdir/usr/lib"
+ mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/"
}
-
dev() {
- pkgdesc="$pkgdesc (development files)"
- depends="skalibs-dev>=$_skalibs_version"
- mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
- mv "$pkgdir/usr/include" "$subpkgdir/usr/"
+ pkgdesc="$pkgdesc (development files)"
+ depends="skalibs-dev>=$_skalibs_version"
+ install_if="dev $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
+ mv "$pkgdir/usr/include" "$subpkgdir/usr/"
mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/"
}
-
libsdev() {
- pkgdesc="$pkgdesc (development files for dynamic linking)"
- depends="$pkgname-dev"
- mkdir -p "$subpkgdir/usr/lib"
- mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/"
+ pkgdesc="$pkgdesc (development files for dynamic linking)"
+ depends="$pkgname-dev"
+ mkdir -p "$subpkgdir/usr/lib"
+ mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/"
}
-
doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ default_doc
+ mkdir -p "$subpkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
sha512sums="e69ee16cb16139d344255adc4bb92bd73003464925bbd2df893e3b922add155308b547274a66e3f20a5d3c0310c8fadc877b656753299ff9a269b4e25c26f7a9 s6-dns-2.3.1.1.tar.gz"
diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD
index e71092f9a..54ff1b005 100644
--- a/user/s6-linux-utils/APKBUILD
+++ b/user/s6-linux-utils/APKBUILD
@@ -9,13 +9,12 @@ arch="all"
options="!check"
license="ISC"
_skalibs_version=2.9
-depends=
+depends=""
makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
subpackages="$pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--disable-allstatic \
--prefix=/usr \
@@ -24,17 +23,15 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-
doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ pkgdesc="$pkgdesc (documentation)"
+ depends=""
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
sha512sums="59c58c4d8e13b7a6e0215f21978f8ac2ac54fc3685884204ea1f011f2a882b9381a9686cbb24c9e566e322c14174dda40368c308e37e9c44f6a1687231d108a2 s6-linux-utils-2.5.1.1.tar.gz"
diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD
index 545b1e9f3..be124a5a8 100644
--- a/user/s6-networking/APKBUILD
+++ b/user/s6-networking/APKBUILD
@@ -15,56 +15,51 @@ subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
- ./configure \
- --enable-shared \
- --enable-static \
- --disable-allstatic \
- --prefix=/usr \
+ ./configure \
+ --enable-shared \
+ --enable-static \
+ --disable-allstatic \
+ --prefix=/usr \
--libdir=/usr/lib \
- --libexecdir="/usr/lib/$pkgname" \
- --with-dynlib=/lib \
- --enable-ssl=bearssl
- make
+ --libexecdir="/usr/lib/$pkgname" \
+ --with-dynlib=/lib \
+ --enable-ssl=bearssl
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
}
-
libs() {
- pkgdesc="$pkgdesc (shared libraries)"
- depends="skalibs-libs>=$_skalibs_version"
- mkdir -p "$subpkgdir/usr/lib"
- mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/"
+ pkgdesc="$pkgdesc (shared libraries)"
+ depends="skalibs-libs>=$_skalibs_version"
+ mkdir -p "$subpkgdir/usr/lib"
+ mv "$pkgdir"/usr/lib/*.so.* "$subpkgdir/usr/lib/"
}
-
dev() {
- pkgdesc="$pkgdesc (development files)"
- depends="skalibs-dev>=$_skalibs_version"
- mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
- mv "$pkgdir/usr/include" "$subpkgdir/usr/"
- mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/"
+ pkgdesc="$pkgdesc (development files)"
+ depends="skalibs-dev>=$_skalibs_version"
+ install_if="dev $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/include" "$subpkgdir/usr/lib"
+ mv "$pkgdir/usr/include" "$subpkgdir/usr/"
+ mv "$pkgdir"/usr/lib/*.a "$subpkgdir/usr/lib/"
}
-
libsdev() {
- pkgdesc="$pkgdesc (development files for dynamic linking)"
- depends="$pkgname-dev"
- mkdir -p "$subpkgdir/usr/lib"
- mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/"
+ pkgdesc="$pkgdesc (development files for dynamic linking)"
+ depends="$pkgname-dev"
+ mkdir -p "$subpkgdir/usr/lib"
+ mv "$pkgdir"/usr/lib/*.so "$subpkgdir/usr/lib/"
}
-
doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ pkgdesc="$pkgdesc (documentation)"
+ depends=""
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
sha512sums="3bd7cdbf6f105bb83c5116e736f4288d378571467e7aa93f862eba80ce28255bda77140a2a1cf80af80480789dfb38682049f6769952fb8964b860bdf465551b s6-networking-2.3.1.1.tar.gz"
diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD
index fb81c7529..5a7a85540 100644
--- a/user/s6-portable-utils/APKBUILD
+++ b/user/s6-portable-utils/APKBUILD
@@ -9,13 +9,12 @@ arch="all"
options="!check"
license="ISC"
_skalibs_version=2.9
-depends=
+depends=""
makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
subpackages="$pkgname-doc"
source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--disable-allstatic \
--prefix=/usr \
@@ -24,17 +23,14 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-
doc() {
- pkgdesc="$pkgdesc (documentation)"
- depends=
- install_if="docs $pkgname=$pkgver-r$pkgrel"
- mkdir -p "$subpkgdir/usr/share/doc"
- cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+ pkgdesc="$pkgdesc (documentation)"
+ install_if="docs $pkgname=$pkgver-r$pkgrel"
+ mkdir -p "$subpkgdir/usr/share/doc"
+ cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
sha512sums="2e74befec59ae6d3f27cb5f2bb92db23af484043e4d5e53e4816d75927059af6698614a4c3ce7ed7e380a88d5bbe88e41dcbc97eb607a10d7a3e46b8a36744ed s6-portable-utils-2.2.2.1.tar.gz"
diff --git a/user/sassc/APKBUILD b/user/sassc/APKBUILD
index 258dc3e3f..e09466f60 100644
--- a/user/sassc/APKBUILD
+++ b/user/sassc/APKBUILD
@@ -8,7 +8,7 @@ url="https://sass-lang.com/"
arch="all"
license="MIT"
depends=""
-makedepends="libsass-dev"
+makedepends="autoconf automake libsass-dev libtool"
subpackages=""
source="sassc-$pkgver.tar.gz::https://github.com/sass/sassc/archive/$pkgver.tar.gz"
@@ -22,8 +22,7 @@ build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
- --prefix=/usr \
- --enable-shared
+ --prefix=/usr
make
}
diff --git a/user/schismtracker/APKBUILD b/user/schismtracker/APKBUILD
index d0fd28f5e..6392b0e6b 100644
--- a/user/schismtracker/APKBUILD
+++ b/user/schismtracker/APKBUILD
@@ -10,7 +10,7 @@ options="!check" # No test suite.
license="GPL-2.0-only"
depends=""
makedepends="libbsd-dev libtool libx11-dev libxau-dev libxdmcp-dev libxext-dev
- python3 sdl-dev"
+ python3 sdl-dev autoconf automake"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/schismtracker/schismtracker/archive/$pkgver.tar.gz"
diff --git a/user/scons/APKBUILD b/user/scons/APKBUILD
index 533ee6789..934a09d68 100644
--- a/user/scons/APKBUILD
+++ b/user/scons/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=scons
-pkgver=3.1.1
+pkgver=3.1.2
pkgrel=0
pkgdesc="Python-based software building system"
url="https://scons.org/"
@@ -26,5 +26,5 @@ package() {
python3 setup.py install --prefix=/usr --root="$pkgdir"
}
-sha512sums="2e80b45571679d8acc0554273538f56163488df5aa9007c7c9c3a6deb2698909ab05da8df91502ea287c0cc0ff0a98f226454f67fcfb7a943570f673f4bd8f54 scons-3.1.1.tar.gz
+sha512sums="bfc0d58d33408a03eb37c1eff166af8139078026e6b43d6274afceac889d0a6743e359e89ad9a30be5ca43aeed26fba92fa4732854750b7d53091ef3e99b3d33 scons-3.1.2.tar.gz
cb8be26f0d8cae7974dffcb3008c67254e8904bb8bb91f9732dd01a9942e33d57527101ec4104a866061096b991a336d00b344da48cf835489fc5d26fb1f331e python3-bang.patch"
diff --git a/user/screen/APKBUILD b/user/screen/APKBUILD
index 53f650cbd..85164bbcc 100644
--- a/user/screen/APKBUILD
+++ b/user/screen/APKBUILD
@@ -7,15 +7,16 @@ pkgrel=0
pkgdesc="A window manager that multiplexes a physical terminal"
url="http://ftp.gnu.org/gnu/screen/"
arch="all"
-license="GPL-3.0+"
options="!check" # No test suite.
+license="GPL-3.0+"
+depends=""
makedepends="ncurses-dev utmps-dev libutempter-dev"
subpackages="$pkgname-doc"
-source="http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
- utmpx.patch"
+source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+ utmpx.patch
+ "
build() {
- cd "$builddir"
export CFLAGS="-DNONETHACK -DGETUTENT"
LIBS="-lutmps -lskarnet" ./configure \
--build=$CBUILD \
@@ -29,7 +30,6 @@ build() {
}
package() {
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
# remove suid root
diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD
index 81b6e647e..721dad5a7 100644
--- a/user/screengrab/APKBUILD
+++ b/user/screengrab/APKBUILD
@@ -1,11 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=screengrab
pkgver=1.101
pkgrel=0
pkgdesc="Cross-platform Qt-based software for taking screenshots"
url="https://github.com/lxqt/screengrab"
arch="all"
+options="!check" # No test suite.
license="GPL-2.0+"
depends=""
makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev
@@ -14,11 +15,9 @@ subpackages="$pkgname-doc"
source="https://github.com/lxqt/screengrab/releases/download/$pkgver/screengrab-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
- mkdir -p build && cd build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
@@ -26,18 +25,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS} ..
- make
+ ${CMAKE_CROSSOPTS} -Bbuild
+ make -C build
}
check() {
- cd "$builddir"/build
- CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+ CTEST_OUTPUT_ON_FAILURE=TRUE make -C build test
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="f253c4015f9c9ae6b53bb4919c0301cc843b0d6f6ab0b8ad88befbd397004aa4838d5900d1af86ed348cbba45fa352ded5192d494bd738c2f2b314e9ad73fb13 screengrab-1.101.tar.xz"
diff --git a/user/scummvm/APKBUILD b/user/scummvm/APKBUILD
index 129c202b5..e9b6b2074 100644
--- a/user/scummvm/APKBUILD
+++ b/user/scummvm/APKBUILD
@@ -13,10 +13,11 @@ makedepends="alsa-lib-dev curl-dev flac-dev fluidsynth-dev freetype-dev
libjpeg-turbo-dev libmpeg2-dev libogg-dev libpng-dev libvorbis-dev
sdl-dev zlib-dev"
subpackages="$pkgname-doc"
-source="https://www.scummvm.org/frs/scummvm/$pkgver/scummvm-$pkgver.tar.bz2"
+source="https://www.scummvm.org/frs/scummvm/$pkgver/scummvm-$pkgver.tar.bz2
+ fluidsynth.patch
+ "
build() {
- cd "$builddir"
./configure \
--prefix=/usr \
--disable-readline
@@ -24,8 +25,8 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="5f91a65cdde62e6f996ae8a983d212f3d04edcf1ce3ab0e5273f1dfce155724912f386025959f5b2cc6ba566432845d929503f80f0cee513c774d5e04dafde1f scummvm-2.1.0.tar.bz2"
+sha512sums="5f91a65cdde62e6f996ae8a983d212f3d04edcf1ce3ab0e5273f1dfce155724912f386025959f5b2cc6ba566432845d929503f80f0cee513c774d5e04dafde1f scummvm-2.1.0.tar.bz2
+20b20a68263c691efb7db83aa8132ec980f2732af728300a641d30c4035d4aa8fcf6efdcebb8c5b924e68fafb50e39ed1825cd64d1f81145259493e858bd50f4 fluidsynth.patch"
diff --git a/user/scummvm/fluidsynth.patch b/user/scummvm/fluidsynth.patch
new file mode 100644
index 000000000..a815cc705
--- /dev/null
+++ b/user/scummvm/fluidsynth.patch
@@ -0,0 +1,37 @@
+Backport of upstream commits:
+
+* 8593a9e
+* 68758a8
+* 8014f12
+
+--- scummvm-2.1.0/audio/softsynth/fluidsynth.cpp.old 2019-10-04 21:41:29.000000000 +0000
++++ scummvm-2.1.0/audio/softsynth/fluidsynth.cpp 2020-01-13 08:21:46.705102910 +0000
+@@ -20,10 +20,18 @@
+ *
+ */
+
+-#include "common/scummsys.h"
++#if defined(HAVE_CONFIG_H)
++#include "config.h"
++#endif
+
+ #ifdef USE_FLUIDSYNTH
+
++// Fluidsynth v2.1+ uses printf in one of it's headers,
++// include/fluidsynth/log.h around line 82 so need to include this
++// prior scummsys.h inclusion and thus forbidden.h
++#include <fluidsynth.h>
++
++#include "common/scummsys.h"
+ #include "common/config-manager.h"
+ #include "common/error.h"
+ #include "common/system.h"
+@@ -35,8 +43,6 @@
+ #include "backends/platform/ios7/ios7_common.h"
+ #endif
+
+-#include <fluidsynth.h>
+-
+ class MidiDriver_FluidSynth : public MidiDriver_Emulated {
+ private:
+ MidiChannel_MPU401 _midiChannels[16];
diff --git a/user/sddm-kcm/APKBUILD b/user/sddm-kcm/APKBUILD
index 6a8deccf3..d4311745f 100644
--- a/user/sddm-kcm/APKBUILD
+++ b/user/sddm-kcm/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=sddm-kcm
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="KDE configuration applet for SDDM"
url="https://www.kde.org/"
@@ -14,9 +14,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev
knewstuff-dev"
install_if="systemsettings sddm"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz
- qt59.patch
- "
+source="https://download.kde.org/unstable/plasma/$pkgver/sddm-kcm-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -29,7 +27,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -41,5 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="dbf341868837044a12d50c9292fefaf6a28cd3da48b91a0516f9709c63124ab2ccc73e3472d78dd41209fd07532126bb94059d1b27bf877e61deb1b3cbd5ac64 sddm-kcm-5.12.8.tar.xz
-698bdd605b96655dc2038378cb3a749101c0dcc19cf7ba996f4d64ec6281e8541efb313b8dbf6095181766ab5a5bb3d2fecd25267e61b848dc4f08f89cde9bde qt59.patch"
+sha512sums="1ab200061efd664c81182595a7884f8c03242822ca8d03bba2275a73d204675278c6b474555e106db98071e3aa48472401f1269c10005b40e5a25bea4a981d49 sddm-kcm-5.17.90.tar.xz"
diff --git a/user/sddm-kcm/qt59.patch b/user/sddm-kcm/qt59.patch
deleted file mode 100644
index 977874172..000000000
--- a/user/sddm-kcm/qt59.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e2f7ead351eedf245c2bb1840053288d18d5c0fc Mon Sep 17 00:00:00 2001
-From: David Edmundson <kde@davidedmundson.co.uk>
-Date: Tue, 5 Mar 2019 14:05:21 +0000
-Subject: Revert "Fix autologin session loading"
-
-It introduces Qt API > 5.8 which Plasma 5.12 depends on
-
-This reverts commit 634a2dd1bef5dd8434db95a391300f68f30fd14e.
----
- src/sessionmodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp
-index 08fe05d..9e52b12 100644
---- a/src/sessionmodel.cpp
-+++ b/src/sessionmodel.cpp
-@@ -64,7 +64,7 @@ void SessionModel::loadDir(const QString &path, SessionType type)
- QFile inputFile(dir.absoluteFilePath(session));
- if (!inputFile.open(QIODevice::ReadOnly))
- continue;
-- SessionPtr si { new Session { session.chopped(strlen(".desktop")), QString(), QString(), QString() } };
-+ SessionPtr si { new Session { session, "", "", "" } };
- bool isHidden = false;
- QString current_section;
- QTextStream in(&inputFile);
---
-cgit v1.1
-
diff --git a/user/sddm/APKBUILD b/user/sddm/APKBUILD
index b37641257..fa2eef17d 100644
--- a/user/sddm/APKBUILD
+++ b/user/sddm/APKBUILD
@@ -5,6 +5,8 @@ pkgver=0.18.1
pkgrel=2
pkgdesc="Simple Desktop Display Manager"
url="https://github.com/sddm/sddm/"
+pkgusers="sddm"
+pkggroups="sddm"
arch="all"
license="GPL-2.0+"
depends="consolekit2 dbus-x11"
@@ -14,8 +16,6 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxcb-dev upower-dev
subpackages="$pkgname-lang $pkgname-openrc"
install="sddm.post-install"
langdir="/usr/share/sddm/translations"
-pkgusers="sddm"
-pkggroups="sddm"
source="https://github.com/sddm/sddm/releases/download/v$pkgver/sddm-$pkgver.tar.xz
ck2-support.patch
pam-path-fix.patch
@@ -37,7 +37,7 @@ build() {
-DENABLE_JOURNALD=OFF \
-DUID_MIN=500 \
-DUID_MAX=65000 \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD
index d9926687a..e11d9d7ae 100644
--- a/user/sdl2/APKBUILD
+++ b/user/sdl2/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sdl2
pkgver=2.0.10
-pkgrel=0
+pkgrel=1
pkgdesc="Low level audio, keyboard, mouse, joystick and graphics library"
url="https://www.libsdl.org/"
arch="all"
@@ -13,7 +13,10 @@ makedepends="alsa-lib-dev libx11-dev libxcursor-dev libxext-dev libxi-dev
libxkbcommon-dev libxrandr-dev libxrender-dev libusb-dev mesa-dev
libxscrnsaver-dev dbus-dev eudev-dev pulseaudio-dev cmake"
subpackages="$pkgname-dev"
-source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz"
+source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz
+ gles.patch
+ sdl2-soname.patch
+ "
builddir="$srcdir/SDL2-$pkgver"
build() {
@@ -35,4 +38,6 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 SDL2-2.0.10.tar.gz"
+sha512sums="f49b869362699b3282f6e82920e59c7fac581bcbf955f18a81cc126293c08093a90df7fcb39517cc8bc32708d2213fe645a42b655d6d811c1386efebb3d3c798 SDL2-2.0.10.tar.gz
+c345096eb98617c41ea5a7b79864082d869800dd54fb9d4aa565446dfafc9ec345193555c25c03f318fa13ed82f267eab6b164a1870ead5fb98a1216cbfd4a0b gles.patch
+23fbb178730f0955732cbb3a61145e7ec1bf7810a2589c259cd715557cb4ff5bcbc676197db375ad31be46dab93c6ea7e06b3549414205ae56e1b65a8c8ab21a sdl2-soname.patch"
diff --git a/user/sdl2/gles.patch b/user/sdl2/gles.patch
new file mode 100644
index 000000000..c400577e1
--- /dev/null
+++ b/user/sdl2/gles.patch
@@ -0,0 +1,12 @@
+--- SDL2-2.0.10/src/video/SDL_video.c.old 2019-07-25 04:32:37.000000000 +0000
++++ SDL2-2.0.10/src/video/SDL_video.c 2020-01-20 17:32:52.918453596 +0000
+@@ -37,7 +37,8 @@
+ #include "SDL_opengl.h"
+ #endif /* SDL_VIDEO_OPENGL */
+
+-#if SDL_VIDEO_OPENGL_ES
++/* GL and GLES headers conflict on Linux 32 bits */
++#if SDL_VIDEO_OPENGL_ES && !SDL_VIDEO_OPENGL
+ #include "SDL_opengles.h"
+ #endif /* SDL_VIDEO_OPENGL_ES */
+
diff --git a/user/sdl2/sdl2-soname.patch b/user/sdl2/sdl2-soname.patch
new file mode 100644
index 000000000..8f040e30c
--- /dev/null
+++ b/user/sdl2/sdl2-soname.patch
@@ -0,0 +1,13 @@
+The library name is SDL2-2.0, not SDL2. This fixes builds against SDL.
+
+--- SDL2-2.0.10/CMakeLists.txt.old 2019-07-25 04:32:36.000000000 +0000
++++ SDL2-2.0.10/CMakeLists.txt 2020-01-03 17:23:42.451699149 +0000
+@@ -224,7 +224,7 @@
+
+ # Those are used for pkg-config and friends, so that the SDL2.pc, sdl2-config,
+ # etc. are created correctly.
+-set(SDL_LIBS "-lSDL2")
++set(SDL_LIBS "-lSDL2-2.0")
+ set(SDL_CFLAGS "")
+
+ # When building shared lib for Windows with MinGW,
diff --git a/user/sdl2_image/APKBUILD b/user/sdl2_image/APKBUILD
index e29ebdf53..fb0af1ea6 100644
--- a/user/sdl2_image/APKBUILD
+++ b/user/sdl2_image/APKBUILD
@@ -1,13 +1,14 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer:
pkgname=sdl2_image
+_pkgname=SDL2_image
pkgver=2.0.5
pkgrel=0
-_pkgname=SDL2_image
pkgdesc="Library to load images of various formats as SDL surfaces"
url="https://www.libsdl.org/projects/SDL_image/"
arch="all"
license="zlib"
+depends=""
makedepends="sdl2-dev libjpeg-turbo-dev libpng-dev libwebp-dev tiff-dev
zlib-dev"
subpackages="$pkgname-dev"
@@ -24,7 +25,6 @@ builddir="$srcdir/$_pkgname-$pkgver"
# - CVE-2019-12221
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -39,12 +39,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/sdl_image/APKBUILD b/user/sdl_image/APKBUILD
index 16f3d6551..05612a04d 100644
--- a/user/sdl_image/APKBUILD
+++ b/user/sdl_image/APKBUILD
@@ -15,13 +15,11 @@ source="https://www.libsdl.org/projects/SDL_image/release/SDL_image-${pkgver}.ta
builddir="$srcdir"/SDL_image-$pkgver
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,7 +31,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/sdl_mixer/APKBUILD b/user/sdl_mixer/APKBUILD
index 2cdb8238e..05972034e 100644
--- a/user/sdl_mixer/APKBUILD
+++ b/user/sdl_mixer/APKBUILD
@@ -9,13 +9,13 @@ arch="all"
options="!check" # No test suite.
license="Zlib"
depends=""
-makedepends="flac-dev fluidsynth-dev libvorbis-dev linux-headers sdl-dev"
+makedepends="bash flac-dev fluidsynth-dev libvorbis-dev linux-headers sdl-dev"
subpackages="$pkgname-dev"
source="https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-${pkgver}.tar.gz"
builddir="$srcdir"/SDL_mixer-$pkgver
prepare() {
- cd "$builddir"
+ default_prepare
update_config_sub
sed -e "/CONFIG_FILE_ETC/s/\/etc\/timidity.cfg/\/etc\/timidity++\/timidity.cfg/" \
-e "/DEFAULT_PATH/s/\/etc\/timidity/\/etc\/timidity++/" \
@@ -24,20 +24,18 @@ prepare() {
}
build() {
- cd "$builddir"
- ./configure \
+ bash ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- --enable-music-mod
+ --enable-music-mod SHELL=/bin/bash
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/sdl_net/APKBUILD b/user/sdl_net/APKBUILD
index 6172ddc1e..16a01d234 100644
--- a/user/sdl_net/APKBUILD
+++ b/user/sdl_net/APKBUILD
@@ -15,13 +15,11 @@ source="https://www.libsdl.org/projects/$_pkgname/release/$_pkgname-$pkgver.tar.
builddir="$srcdir"/$_pkgname-$pkgver
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/sdl_ttf/APKBUILD b/user/sdl_ttf/APKBUILD
index 96321243a..3e34063d8 100644
--- a/user/sdl_ttf/APKBUILD
+++ b/user/sdl_ttf/APKBUILD
@@ -15,13 +15,11 @@ source="https://www.libsdl.org/projects/$_pkgname/release/$_pkgname-$pkgver.tar.
builddir="$srcdir"/$_pkgname-$pkgver
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +31,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/serf/APKBUILD b/user/serf/APKBUILD
index 06cc98c2a..4ff3c66dd 100644
--- a/user/serf/APKBUILD
+++ b/user/serf/APKBUILD
@@ -15,18 +15,14 @@ source="https://www.apache.org/dist/serf/serf-$pkgver.tar.bz2
"
build() {
- cd "$builddir"
scons PREFIX=/usr -j "$JOBS"
}
check() {
- cd "$builddir"
scons test
}
package() {
- cd "$builddir"
- local _header
install -D -m644 libserf-1.a "$pkgdir"/usr/lib/libserf-1.a
install -D -m755 libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1.3.0
ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1
diff --git a/user/sg3_utils/APKBUILD b/user/sg3_utils/APKBUILD
index 7dc10d989..35e1a4fb3 100644
--- a/user/sg3_utils/APKBUILD
+++ b/user/sg3_utils/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev $pkgname-doc"
source="http://sg.danny.cz/sg/p/sg3_utils-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/showfont/APKBUILD b/user/showfont/APKBUILD
index 63af1593b..45168cabb 100644
--- a/user/showfont/APKBUILD
+++ b/user/showfont/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/showfont-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/shunit2/APKBUILD b/user/shunit2/APKBUILD
index baa658cf8..499f9a53e 100644
--- a/user/shunit2/APKBUILD
+++ b/user/shunit2/APKBUILD
@@ -8,23 +8,18 @@ url="https://github.com/kward/shunit2"
arch="noarch"
license="Apache-2.0"
depends="/bin/sh"
-makedepends=""
checkdepends="cmd:which bash dash zsh"
+makedepends=""
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/kward/shunit2/archive/v$pkgver.tar.gz
- dash-negative-lineno.patch"
-
-build() {
- cd "$builddir"
-}
+ dash-negative-lineno.patch
+ "
check() {
- cd "$builddir"
./test_runner
}
package() {
- cd "$builddir"
install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
install -Dm644 "doc/$pkgname.txt" "$pkgdir/usr/share/doc/$pkgname/$pkgname.rst"
}
diff --git a/user/skanlite/APKBUILD b/user/skanlite/APKBUILD
index 77c06dc04..b639bc7a8 100644
--- a/user/skanlite/APKBUILD
+++ b/user/skanlite/APKBUILD
@@ -17,7 +17,6 @@ source="https://download.kde.org/stable/skanlite/2.1/skanlite-$pkgver.tar.xz
"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,17 +27,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/slang/APKBUILD b/user/slang/APKBUILD
index 12929ac2b..430996243 100644
--- a/user/slang/APKBUILD
+++ b/user/slang/APKBUILD
@@ -8,7 +8,7 @@ url="http://www.jedsoft.org/slang/"
arch="all"
license="GPL-2.0+ AND NTP"
depends=""
-makedepends="pcre-dev"
+makedepends="pcre-dev zlib-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://www.jedsoft.org/releases/slang/slang-$pkgver.tar.bz2"
@@ -19,7 +19,10 @@ build() {
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
- --localstatedir=/var
+ --localstatedir=/var \
+ --with-zlib=/ \
+ --with-zinc=/usr/include \
+ --with-pcre=/usr
make -j1
}
diff --git a/user/smartmontools/APKBUILD b/user/smartmontools/APKBUILD
index 9125db241..d8ce1221e 100644
--- a/user/smartmontools/APKBUILD
+++ b/user/smartmontools/APKBUILD
@@ -7,16 +7,15 @@ pkgdesc="Control and monitor S.M.A.R.T. enabled hard drives"
url="https://www.smartmontools.org/"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="linux-headers"
subpackages="$pkgname-doc $pkgname-openrc"
-source="http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
smartd.initd
smartd.confd
"
build() {
- cd "$builddir"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,14 +25,10 @@ build() {
}
check() {
- cd "$builddir"
-
make check
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir"/ install
install -Dm755 "$srcdir"/smartd.initd "$pkgdir"/etc/init.d/smartd
diff --git a/user/smproxy/APKBUILD b/user/smproxy/APKBUILD
index 03e3eda4e..95416aa0a 100644
--- a/user/smproxy/APKBUILD
+++ b/user/smproxy/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/smproxy-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/snappy/APKBUILD b/user/snappy/APKBUILD
index 7f9b35e0d..3662d501e 100644
--- a/user/snappy/APKBUILD
+++ b/user/snappy/APKBUILD
@@ -8,12 +8,12 @@ url="https://google.github.io/snappy/"
arch="all"
[ "$CARCH" = "armhf" ] && options="!check" # does not pass testsuite on armhf
license="BSD-3-Clause"
+depends=""
+makedepends="cmake"
subpackages="$pkgname-dbg $pkgname-dev"
-source="snappy-$pkgver.tar.gz::https://github.com/google/snappy/archive/$pkgver.tar.gz
- "
+source="snappy-$pkgver.tar.gz::https://github.com/google/snappy/archive/$pkgver.tar.gz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -24,17 +24,15 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD
index e5257103e..e421c558e 100644
--- a/user/socat/APKBUILD
+++ b/user/socat/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=socat
pkgver=1.7.3.3
pkgrel=0
@@ -12,10 +12,10 @@ depends=""
makedepends="openssl-dev"
subpackages="$pkgname-doc"
source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.gz
- netdb-internal.patch"
+ netdb-internal.patch
+ "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,7 +27,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD
index a6728e91d..c918dbcfc 100644
--- a/user/solid/APKBUILD
+++ b/user/solid/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=solid
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Platform-independent hardware discovery and access"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6594f919f5c26c844f0c5e4ef5f6bb375915fdcba744c173765270eb569a5623311c6e86cf4278a19479c3ec7c24210945828d59956135000dbe6f72bf799018 solid-5.65.0.tar.xz"
+sha512sums="df00bb300a3d5cc3f11fb2fe9c1f64ebff1f7e906097ddf5586b1005299877e17d41529abb2d06510973ab80585084250cec81e89b6cb45291716b20ead0da5d solid-5.66.0.tar.xz"
diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD
index d6f6c4d1e..69289c4c9 100644
--- a/user/sonnet/APKBUILD
+++ b/user/sonnet/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=sonnet
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for implementing portable spell check functionality"
url="https://www.kde.org/"
@@ -47,4 +47,4 @@ aspell() {
"$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so
}
-sha512sums="37c459d6de59d974fc8a0812d3ce55661a1c85eefa551f8c7a7d2a4b2c37f55b163f7bcea4334f6467cca65cdd7a4dd67b6217c8f167eefc56d9dbac2223e2fa sonnet-5.65.0.tar.xz"
+sha512sums="17fee80d64762941f2f7d0d1b349d2b1cb9be440499209ea40ec38332c6cb12a246d5614053e8b0428ce113fef0765e577ca9ef44b2ddb216e33e6a2e947af3b sonnet-5.66.0.tar.xz"
diff --git a/user/sound-theme-freedesktop/APKBUILD b/user/sound-theme-freedesktop/APKBUILD
index ad1f9c0e4..eaf320db8 100644
--- a/user/sound-theme-freedesktop/APKBUILD
+++ b/user/sound-theme-freedesktop/APKBUILD
@@ -13,7 +13,6 @@ subpackages=""
source="https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/sox/APKBUILD b/user/sox/APKBUILD
index efcdeba1e..31a5d4b1e 100644
--- a/user/sox/APKBUILD
+++ b/user/sox/APKBUILD
@@ -20,13 +20,11 @@ source="https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.
"
prepare() {
- cd "$builddir"
default_prepare
autoreconf -vif
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -38,7 +36,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
ln -sf play "$pkgdir"/usr/bin/rec
ln -sf ../man1/sox.1.gz "$pkgdir"/usr/share/man/man7/soxeffect.7
diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD
index 0eab09c31..adf8eb446 100644
--- a/user/spectacle/APKBUILD
+++ b/user/spectacle/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=spectacle
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Application for capturing desktop screenshots"
url="https://www.kde.org/applications/graphics/spectacle/"
@@ -14,9 +14,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kdoctools-dev kdeclarative-dev xcb-util-image-dev xcb-util-cursor-dev
libxcb-dev xcb-util-renderutil-dev knewstuff-dev libkipi-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz
+source="https://download.kde.org/stable/release-service/$pkgver/src/spectacle-$pkgver.tar.xz
no-wayland.patch
- qt5.9.patch
"
build() {
@@ -31,7 +30,7 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DBUILD_TESTING=OFF \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -43,6 +42,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="a03dbe13aa0e0cea07b6505ead130946233574863fc5994d42a971d8a9ae0a24be5e4dfab38640857d5bb89f33dc3736bad7e87a3a76aa83b450156e8db96723 spectacle-19.08.2.tar.xz
-36665d1b7d8b7c8004e457179f03fff1eed3865ee3e558f44f19022b80e39bbb2659de3e7b9affe654d5dbc5077890b38b6b4351f3a43324733749fbd36880ac no-wayland.patch
-781e1611026a45232fa117b90a1520bed380e512ae2e0690785a960f897342284ce0c553d8fb22caf10fd34c3823ee7dacb770815c871808345c1bb05126b74f qt5.9.patch"
+sha512sums="cf1a40fef44ddd7eaa516e47df8781cb1ff73287e2b1a579d92053b6ee73671a2c95526f8a5e54621216fe6072de376f9d87745dd5502f7136e0ed4f0adcc65a spectacle-19.12.1.tar.xz
+36665d1b7d8b7c8004e457179f03fff1eed3865ee3e558f44f19022b80e39bbb2659de3e7b9affe654d5dbc5077890b38b6b4351f3a43324733749fbd36880ac no-wayland.patch"
diff --git a/user/spectacle/qt5.9.patch b/user/spectacle/qt5.9.patch
deleted file mode 100644
index aa830f86b..000000000
--- a/user/spectacle/qt5.9.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- spectacle-19.04.0/CMakeLists.txt.old 2019-04-12 00:06:23.000000000 +0000
-+++ spectacle-19.04.0/CMakeLists.txt 2019-04-18 22:57:10.598054362 +0000
-@@ -11,7 +11,7 @@
- # Spectacle project
- project(Spectacle VERSION ${SPECTACLE_VERSION})
-
--set(QT_MIN_VERSION "5.10.0")
-+set(QT_MIN_VERSION "5.9.0")
- set(KF5_MIN_VERSION "5.53.0")
- set(PLASMA_MIN_VERSION "5.12.0")
-
---- spectacle-19.04.0/src/SpectacleCore.cpp.old 2019-04-11 07:37:14.000000000 +0000
-+++ spectacle-19.04.0/src/SpectacleCore.cpp 2019-04-18 22:57:46.694193923 +0000
-@@ -165,8 +165,7 @@
- break;
- case Actions::StartNewInstance:
- QProcess newInstance;
-- newInstance.setProgram(QStringLiteral("spectacle"));
-- newInstance.startDetached();
-+ newInstance.startDetached(QStringLiteral("spectacle"));
- break;
- }
- }
diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD
index 7699adf7d..651311cdf 100644
--- a/user/spectrwm/APKBUILD
+++ b/user/spectrwm/APKBUILD
@@ -1,13 +1,13 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=spectrwm
-pkgver=3.2.0
+pkgver=3.3.0
_pkgver=$(printf '%s' "$pkgver" | tr . _)
pkgrel=0
pkgdesc="Small dynamic tiling window manager"
url="https://github.com/conformal/spectrwm"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="ISC AND MIT"
depends=""
makedepends="libx11-dev libxcursor-dev libxcb-dev xcb-util-keysyms-dev
@@ -17,14 +17,11 @@ source="spectrwm-$pkgver.tar.gz::https://github.com/conformal/spectrwm/archive/S
builddir="$srcdir/spectrwm-SPECTRWM_$_pkgver"
build() {
- cd "$builddir"/linux
- CFLAGS="-DSWM_LIB=libswmhack.so" make PREFIX=/usr
+ CFLAGS="-DSWM_LIB=libswmhack.so" make -C linux PREFIX=/usr
}
package() {
- cd "$builddir"/linux
- make PREFIX=/usr DESTDIR="$pkgdir" install
- cd ..
+ make PREFIX=/usr DESTDIR="$pkgdir" -C linux install
for i in screenshot.sh baraction.sh; do
install -Dm755 $i "$pkgdir"/usr/share/spectrwm/$i
done
@@ -35,4 +32,4 @@ package() {
done
}
-sha512sums="038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039 spectrwm-3.2.0.tar.gz"
+sha512sums="743affffd0437641a760ae29ccbd0084baee3354dadc48f3fc9ab70bffa2413ffe3af67f1223413aa1bbf8c679fbae1fbbdd71a840b3e44f5df83b527f63c1cc spectrwm-3.3.0.tar.gz"
diff --git a/user/spice/APKBUILD b/user/spice/APKBUILD
index 03b4f65f9..ef57a810c 100644
--- a/user/spice/APKBUILD
+++ b/user/spice/APKBUILD
@@ -20,7 +20,6 @@ source="https://www.spice-space.org/download/releases/spice-server/spice-$pkgver
# - CVE-2018-10873
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/spleen/APKBUILD b/user/spleen/APKBUILD
index 2f4eb4f6b..aa902f9bc 100644
--- a/user/spleen/APKBUILD
+++ b/user/spleen/APKBUILD
@@ -14,8 +14,7 @@ subpackages=""
source="https://github.com/fcambus/spleen/releases/download/$pkgver/spleen-$pkgver.tar.gz"
package() {
- local _font
- for _font in *.pcf; do
+ for _font in "$builddir"/*.pcf; do
gzip -9 $_font
install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/misc/ $_font.gz
done
diff --git a/user/sprunge/APKBUILD b/user/sprunge/APKBUILD
index bc7a3e2df..85003c4b9 100644
--- a/user/sprunge/APKBUILD
+++ b/user/sprunge/APKBUILD
@@ -11,10 +11,8 @@ depends="curl"
makedepends=""
subpackages="tpaste dpaste ix"
source=""
-builddir="$srcdir"
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/usr/bin
printf "#!/bin/sh\n\nexec curl -F 'sprunge=<-' http://sprunge.us" > \
"$pkgdir"/usr/bin/sprunge
@@ -22,7 +20,6 @@ package() {
}
tpaste() {
- cd "$builddir"
url="http://tpaste.us"
pkgdesc="Helper script to paste things to $url"
mkdir -p "$subpkgdir"/usr/bin
@@ -32,7 +29,6 @@ tpaste() {
}
dpaste() {
- cd "$builddir"
url="http://dpaste.com"
pkgdesc="Helper script to paste things to $url"
mkdir -p "$subpkgdir"/usr/bin
@@ -42,7 +38,6 @@ dpaste() {
}
ix() {
- cd "$builddir"
url="http://ix.io"
pkgdesc="Helper script to paste things to $url"
mkdir -p "$subpkgdir"/usr/bin
diff --git a/user/sshfs/APKBUILD b/user/sshfs/APKBUILD
index 0bf08fdb1..c6fe305e9 100644
--- a/user/sshfs/APKBUILD
+++ b/user/sshfs/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=sshfs
-pkgver=3.5.2
+pkgver=3.6.0
pkgrel=0
pkgdesc="FUSE client based on the SSH File Transfer Protocol"
url="https://github.com/libfuse/sshfs"
@@ -9,8 +9,8 @@ arch="all"
options="!check" # Requires fuse kernel module to be loaded and local ssh server
license="GPL-2.0-only AND GPL-2.0+ AND LGPL-2.1-only"
depends="openssh-client"
-makedepends="fuse3-dev glib-dev meson coreutils py3-docutils"
#checkdepends="py3-pytest cmd:which"
+makedepends="fuse3-dev glib-dev meson coreutils py3-docutils"
subpackages="$pkgname-doc"
source="https://github.com/libfuse/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz"
@@ -40,4 +40,4 @@ package() {
DESTDIR="$pkgdir" ninja -C output install
}
-sha512sums="52f874196eef2327dfb11c7f6a9771c1837a89a9208e6503dd7bb839e63d65b3f42d61c2d9140c8100041794923c1bea1f6917ff04b3c1d0236071ff4811c272 sshfs-3.5.2.tar.xz"
+sha512sums="fe34d7bbb76bea6aedf96b4ce7500ad6d81230cca9a43b831302159e5926797a243b7d1675d23ba101057ef247f64ad7df18a73d20578e84b9524218d9ff97bd sshfs-3.6.0.tar.xz"
diff --git a/user/startup-notification/APKBUILD b/user/startup-notification/APKBUILD
index a52e6b549..6cc59febc 100644
--- a/user/startup-notification/APKBUILD
+++ b/user/startup-notification/APKBUILD
@@ -13,12 +13,11 @@ makedepends="libsm-dev libx11-dev xcb-util-dev"
source="https://www.freedesktop.org/software/$pkgname/releases/$pkgname-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
+ default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,12 +28,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/step/APKBUILD b/user/step/APKBUILD
index 23abb6735..18e226bcb 100644
--- a/user/step/APKBUILD
+++ b/user/step/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=step
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Interactive physics simulation"
url="https://www.kde.org/applications/education/step/"
@@ -13,10 +13,9 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev
kdelibs4support-dev knewstuff-dev kplotting-dev gsl-dev
libqalculate-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/step-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/step-$pkgver.tar.xz"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -28,18 +27,16 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DEIGEN3_INCLUDE_DIR=/usr/include/eigen3 \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="8f2a90ef74bad6a3b73470f0342269da2dc6d53f2ce05a14e13762c02e2ff28f621d821f31fdba9733cb0a7cbe0b3ad099e3c36cdfe2198dd50106eaea63b8a6 step-19.08.2.tar.xz"
+sha512sums="70c127544f816b11db25457a18bdc114275c79c867228c6e1e7749b8e89217df329f67690ce4fd7a3a6c27a0f9d9309276820b17f0f8b1506b48c18bc8f0a2b6 step-19.12.1.tar.xz"
diff --git a/user/stow/APKBUILD b/user/stow/APKBUILD
index 0fa11db7f..4f203e91f 100644
--- a/user/stow/APKBUILD
+++ b/user/stow/APKBUILD
@@ -8,8 +8,8 @@ url="https://www.gnu.org/software/stow/"
arch="noarch"
license="GPL-3.0+"
depends="perl"
-makedepends="perl-test-output"
checkdepends="perl-io-stringy"
+makedepends="perl-test-output"
subpackages="$pkgname-doc"
source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
diff --git a/user/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch b/user/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch
deleted file mode 100644
index cc14dab02..000000000
--- a/user/strongswan/0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 5a5b26a7dce4c112f62882cfe16dc37659d766e8 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Fri, 17 Jul 2015 11:53:58 +0200
-Subject: [PATCH 1/5] ike: Adhere to IKE_SA limit when checking out by config
-
-This prevents new SAs from getting created if we hit the global IKE_SA
-limit (we still allow checkout_new(), which is used for rekeying).
----
- src/libcharon/sa/ike_sa_manager.c | 71 ++++++++++++++++++++-------------------
- 1 file changed, 37 insertions(+), 34 deletions(-)
-
-diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
-index ce44207..37d49da 100644
---- a/src/libcharon/sa/ike_sa_manager.c
-+++ b/src/libcharon/sa/ike_sa_manager.c
-@@ -1419,48 +1419,51 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
-
- DBG2(DBG_MGR, "checkout IKE_SA by config");
-
-- if (!this->reuse_ikesa && peer_cfg->get_ike_version(peer_cfg) != IKEV1)
-- { /* IKE_SA reuse disabled by config (not possible for IKEv1) */
-- ike_sa = checkout_new(this, peer_cfg->get_ike_version(peer_cfg), TRUE);
-- charon->bus->set_sa(charon->bus, ike_sa);
-- goto out;
-- }
--
-- enumerator = create_table_enumerator(this);
-- while (enumerator->enumerate(enumerator, &entry, &segment))
-+ if (this->reuse_ikesa || peer_cfg->get_ike_version(peer_cfg) == IKEV1)
- {
-- if (!wait_for_entry(this, entry, segment))
-+ enumerator = create_table_enumerator(this);
-+ while (enumerator->enumerate(enumerator, &entry, &segment))
- {
-- continue;
-- }
-- if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING ||
-- entry->ike_sa->get_state(entry->ike_sa) == IKE_REKEYED)
-- { /* skip IKE_SAs which are not usable, wake other waiting threads */
-- entry->condvar->signal(entry->condvar);
-- continue;
-- }
--
-- current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa);
-- if (current_peer && current_peer->equals(current_peer, peer_cfg))
-- {
-- current_ike = current_peer->get_ike_cfg(current_peer);
-- if (current_ike->equals(current_ike, peer_cfg->get_ike_cfg(peer_cfg)))
-+ if (!wait_for_entry(this, entry, segment))
- {
-- entry->checked_out = thread_current();
-- ike_sa = entry->ike_sa;
-- DBG2(DBG_MGR, "found existing IKE_SA %u with a '%s' config",
-- ike_sa->get_unique_id(ike_sa),
-- current_peer->get_name(current_peer));
-- break;
-+ continue;
- }
-+ if (entry->ike_sa->get_state(entry->ike_sa) == IKE_DELETING ||
-+ entry->ike_sa->get_state(entry->ike_sa) == IKE_REKEYED)
-+ { /* skip IKE_SAs which are not usable, wake other waiting threads */
-+ entry->condvar->signal(entry->condvar);
-+ continue;
-+ }
-+ current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa);
-+ if (current_peer && current_peer->equals(current_peer, peer_cfg))
-+ {
-+ current_ike = current_peer->get_ike_cfg(current_peer);
-+ if (current_ike->equals(current_ike,
-+ peer_cfg->get_ike_cfg(peer_cfg)))
-+ {
-+ entry->checked_out = thread_current();
-+ ike_sa = entry->ike_sa;
-+ DBG2(DBG_MGR, "found existing IKE_SA %u with a '%s' config",
-+ ike_sa->get_unique_id(ike_sa),
-+ current_peer->get_name(current_peer));
-+ break;
-+ }
-+ }
-+ /* other threads might be waiting for this entry */
-+ entry->condvar->signal(entry->condvar);
- }
-- /* other threads might be waiting for this entry */
-- entry->condvar->signal(entry->condvar);
-+ enumerator->destroy(enumerator);
- }
-- enumerator->destroy(enumerator);
-
- if (!ike_sa)
-- { /* no IKE_SA using such a config, hand out a new */
-+ { /* no IKE_SA using such a config, or reuse disabled, hand out a new */
-+ if (this->ikesa_limit &&
-+ this->public.get_count(&this->public) >= this->ikesa_limit)
-+ {
-+ DBG1(DBG_MGR, "IKE_SA creation failed, hitting IKE_SA limit (%u)",
-+ this->ikesa_limit);
-+ return NULL;
-+ }
- ike_sa = checkout_new(this, peer_cfg->get_ike_version(peer_cfg), TRUE);
- }
- charon->bus->set_sa(charon->bus, ike_sa);
---
-2.5.0
-
diff --git a/user/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch b/user/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch
deleted file mode 100644
index d9aea3c4d..000000000
--- a/user/strongswan/1001-charon-add-optional-source-and-remote-overrides-for-.patch
+++ /dev/null
@@ -1,597 +0,0 @@
-From 460e0f52d88433071b27603e47995517514ef8b9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 21 Sep 2015 13:41:58 +0300
-Subject: [PATCH] charon: add optional source and remote overrides for initiate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This introduces support for specifying optional IKE SA specific
-source and remote address for child sa initiation. This allows
-to initiate wildcard connection for known address via vici.
-
-In addition this allows impler implementation of trap-any patches
-and is a prerequisite for dmvpn support.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- src/charon-cmd/cmd/cmd_connection.c | 2 +-
- src/charon-nm/nm/nm_service.c | 2 +-
- src/libcharon/control/controller.c | 43 +++++++++++++++-
- src/libcharon/control/controller.h | 3 ++
- src/libcharon/plugins/stroke/stroke_control.c | 5 +-
- src/libcharon/plugins/vici/vici_config.c | 2 +-
- src/libcharon/plugins/vici/vici_control.c | 63 ++++++++++++++++++++----
- src/libcharon/processing/jobs/start_action_job.c | 2 +-
- src/libcharon/sa/ike_sa_manager.c | 51 ++++++++++++++++++-
- src/libcharon/sa/ike_sa_manager.h | 8 ++-
- src/libcharon/sa/trap_manager.c | 45 +++++++----------
- src/swanctl/commands/initiate.c | 40 ++++++++++++++-
- 12 files changed, 218 insertions(+), 48 deletions(-)
-
-diff --git a/src/charon-cmd/cmd/cmd_connection.c b/src/charon-cmd/cmd/cmd_connection.c
-index 71df92f7e..13b31de8a 100644
---- a/src/charon-cmd/cmd/cmd_connection.c
-+++ b/src/charon-cmd/cmd/cmd_connection.c
-@@ -436,7 +436,7 @@ static job_requeue_t initiate(private_cmd_connection_t *this)
- child_cfg = create_child_cfg(this, peer_cfg);
-
- if (charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
-- controller_cb_empty, NULL, 0, FALSE) != SUCCESS)
-+ NULL, NULL, controller_cb_empty, NULL, 0, FALSE) != SUCCESS)
- {
- terminate(pid);
- }
-diff --git a/src/charon-nm/nm/nm_service.c b/src/charon-nm/nm/nm_service.c
-index 571c0edba..e7922cf4d 100644
---- a/src/charon-nm/nm/nm_service.c
-+++ b/src/charon-nm/nm/nm_service.c
-@@ 6220,7 +622,7 @@ static gboolean connect_(NMVPNPlugin *plugin, NMConnection *connection,
- * Prepare IKE_SA
- */
- ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager,
-- peer_cfg);
-+ peer_cfg, NULL, NULL);
- if (!ike_sa)
- {
- peer_cfg->destroy(peer_cfg);
-diff --git a/src/libcharon/control/controller.c b/src/libcharon/control/controller.c
-index 8e7816b39..7d7b3bcbc 100644
---- a/src/libcharon/control/controller.c
-+++ b/src/libcharon/control/controller.c
-@@ -15,6 +15,28 @@
- * for more details.
- */
-
-+/*
-+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
- #include "controller.h"
-
- #include <sys/types.h>
-@@ -103,6 +125,16 @@ struct interface_listener_t {
- ike_sa_t *ike_sa;
-
- /**
-+ * Our host hint.
-+ */
-+ host_t *my_host;
-+
-+ /**
-+ * Other host hint.
-+ */
-+ host_t *other_host;
-+
-+ /**
- * unique ID, used for various methods
- */
- uint32_t id;
-@@ -409,9 +441,14 @@ METHOD(job_t, initiate_execute, job_requeue_t,
- ike_sa_t *ike_sa;
- interface_listener_t *listener = &job->listener;
- peer_cfg_t *peer_cfg = listener->peer_cfg;
-+ host_t *my_host = listener->my_host;
-+ host_t *other_host = listener->other_host;
-
- ike_sa = charon->ike_sa_manager->checkout_by_config(charon->ike_sa_manager,
-- peer_cfg);
-+ peer_cfg, my_host, other_host);
-+ DESTROY_IF(my_host);
-+ DESTROY_IF(other_host);
-+
- if (!ike_sa)
- {
- listener->child_cfg->destroy(listener->child_cfg);
-@@ -420,6 +457,7 @@ METHOD(job_t, initiate_execute, job_requeue_t,
- listener_done(listener);
- return JOB_REQUEUE_NONE;
- }
-+
- listener->lock->lock(listener->lock);
- listener->ike_sa = ike_sa;
- listener->lock->unlock(listener->lock);
-@@ -492,6 +530,7 @@ METHOD(job_t, initiate_execute, job_requeue_t,
-
- METHOD(controller_t, initiate, status_t,
- private_controller_t *this, peer_cfg_t *peer_cfg, child_cfg_t *child_cfg,
-+ host_t *my_host, host_t *other_host,
- controller_cb_t callback, void *param, u_int timeout, bool limits)
- {
- interface_job_t *job;
-@@ -514,6 +553,8 @@ METHOD(controller_t, initiate, status_t,
- .status = FAILED,
- .child_cfg = child_cfg,
- .peer_cfg = peer_cfg,
-+ .my_host = my_host ? my_host->clone(my_host) : NULL,
-+ .other_host = other_host ? other_host->clone(other_host) : NULL,
- .lock = spinlock_create(),
- .limits = limits,
- },
-diff --git a/src/libcharon/control/controller.h b/src/libcharon/control/controller.h
-index 9524f53b9..7c51ba4ca 100644
---- a/src/libcharon/control/controller.h
-+++ b/src/libcharon/control/controller.h
-@@ -79,6 +79,8 @@ struct controller_t {
- *
- * @param peer_cfg peer_cfg to use for IKE_SA setup
- * @param child_cfg child_cfg to set up CHILD_SA from
-+ * @param my_host optional address hint for source
-+ * @param other_host optional address hint for destination
- * @param cb logging callback
- * @param param parameter to include in each call of cb
- * @param timeout timeout in ms to wait for callbacks, 0 to disable
-@@ -92,6 +94,7 @@ struct controller_t {
- */
- status_t (*initiate)(controller_t *this,
- peer_cfg_t *peer_cfg, child_cfg_t *child_cfg,
-+ host_t *my_host, host_t *other_host,
- controller_cb_t callback, void *param, u_int timeout,
- bool limits);
-
-diff --git a/src/libcharon/plugins/stroke/stroke_control.c b/src/libcharon/plugins/stroke/stroke_control.c
-index ee8306772..0736a6427 100644
---- a/src/libcharon/plugins/stroke/stroke_control.c
-+++ b/src/libcharon/plugins/stroke/stroke_control.c
-@@ -108,7 +108,7 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
- if (msg->output_verbosity < 0)
- {
- charon->controller->initiate(charon->controller, peer_cfg, child_cfg,
-- NULL, NULL, 0, FALSE);
-+ NULL, NULL, NULL, NULL, 0, FALSE);
- }
- else
- {
-@@ -116,7 +116,8 @@ static void charon_initiate(private_stroke_control_t *this, peer_cfg_t *peer_cfg
- status_t status;
-
- status = charon->controller->initiate(charon->controller,
-- peer_cfg, child_cfg, (controller_cb_t)stroke_log,
-+ peer_cfg, child_cfg, NULL, NULL,
-+ (controller_cb_t)stroke_log,
- &info, this->timeout, FALSE);
- switch (status)
- {
-diff --git a/src/libcharon/plugins/vici/vici_config.c b/src/libcharon/plugins/vici/vici_config.c
-index 12497ec5e..ba954e5cb 100644
---- a/src/libcharon/plugins/vici/vici_config.c
-+++ b/src/libcharon/plugins/vici/vici_config.c
-@@ -1978,7 +1978,7 @@ static void run_start_action(private_vici_config_t *this, peer_cfg_t *peer_cfg,
- DBG1(DBG_CFG, "initiating '%s'", child_cfg->get_name(child_cfg));
- charon->controller->initiate(charon->controller,
- peer_cfg->get_ref(peer_cfg), child_cfg->get_ref(child_cfg),
-- NULL, NULL, 0, FALSE);
-+ NULL, NULL, NULL, NULL, 0, FALSE);
- break;
- case ACTION_ROUTE:
- DBG1(DBG_CFG, "installing '%s'", child_cfg->get_name(child_cfg));
-diff --git a/src/libcharon/plugins/vici/vici_control.c b/src/libcharon/plugins/vici/vici_control.c
-index afee649f7..94bb2eecb 100644
---- a/src/libcharon/plugins/vici/vici_control.c
-+++ b/src/libcharon/plugins/vici/vici_control.c
-@@ -16,6 +16,28 @@
- * for more details.
- */
-
-+/*
-+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
- #include "vici_control.h"
- #include "vici_builder.h"
-
-@@ -169,9 +191,11 @@ static child_cfg_t* find_child_cfg(char *name, char *pname, peer_cfg_t **out)
- CALLBACK(initiate, vici_message_t*,
- private_vici_control_t *this, char *name, u_int id, vici_message_t *request)
- {
-+ vici_message_t* msg;
- child_cfg_t *child_cfg = NULL;
- peer_cfg_t *peer_cfg;
-- char *child, *ike;
-+ host_t *my_host = NULL, *other_host = NULL;
-+ char *child, *ike, *my_host_str, *other_host_str;
- int timeout;
- bool limits;
- controller_cb_t log_cb = NULL;
-@@ -185,6 +209,8 @@ CALLBACK(initiate, vici_message_t*,
- timeout = request->get_int(request, 0, "timeout");
- limits = request->get_bool(request, FALSE, "init-limits");
- log.level = request->get_int(request, 1, "loglevel");
-+ my_host_str = request->get_str(request, NULL, "my-host");
-+ other_host_str = request->get_str(request, NULL, "other-host");
-
- if (!child)
- {
-@@ -195,28 +221,47 @@ CALLBACK(initiate, vici_message_t*,
- log_cb = (controller_cb_t)log_vici;
- }
-
-- DBG1(DBG_CFG, "vici initiate '%s'", child);
-+ if (my_host_str)
-+ {
-+ my_host = host_create_from_string(my_host_str, 0);
-+ }
-+ if (other_host_str)
-+ {
-+ other_host = host_create_from_string(other_host_str, 0);
-+ }
-+
-+ DBG1(DBG_CFG, "vici initiate '%s', me %H, other %H, limits %d", child, my_host, other_host, limits);
-
- child_cfg = find_child_cfg(child, ike, &peer_cfg);
- if (!child_cfg)
- {
-- return send_reply(this, "CHILD_SA config '%s' not found", child);
-+ msg = send_reply(this, "CHILD_SA config '%s' not found", child);
-+ goto ret;
- }
-- switch (charon->controller->initiate(charon->controller, peer_cfg,
-- child_cfg, log_cb, &log, timeout, limits))
-+ switch (charon->controller->initiate(charon->controller,
-+ peer_cfg, child_cfg, my_host, other_host,
-+ log_cb, &log, timeout, limits))
- {
- case SUCCESS:
-- return send_reply(this, NULL);
-+ msg = send_reply(this, NULL);
-+ break;
- case OUT_OF_RES:
-- return send_reply(this, "CHILD_SA '%s' not established after %dms",
-+ msg = send_reply(this, "CHILD_SA '%s' not established after %dms",
- child, timeout);
-+ break;
- case INVALID_STATE:
-- return send_reply(this, "establishing CHILD_SA '%s' not possible "
-+ msg = send_reply(this, "establishing CHILD_SA '%s' not possible "
- "at the moment due to limits", child);
-+ break;
- case FAILED:
- default:
-- return send_reply(this, "establishing CHILD_SA '%s' failed", child);
-+ msg = send_reply(this, "establishing CHILD_SA '%s' failed", child);
-+ break;
- }
-+ret:
-+ if (my_host) my_host->destroy(my_host);
-+ if (other_host) other_host->destroy(other_host);
-+ return msg;
- }
-
- CALLBACK(terminate, vici_message_t*,
-diff --git a/src/libcharon/processing/jobs/start_action_job.c b/src/libcharon/processing/jobs/start_action_job.c
-index 654ec6abe..3d5a48cb8 100644
---- a/src/libcharon/processing/jobs/start_action_job.c
-+++ b/src/libcharon/processing/jobs/start_action_job.c
-@@ -61,7 +61,7 @@ METHOD(job_t, execute, job_requeue_t,
- charon->controller->initiate(charon->controller,
- peer_cfg->get_ref(peer_cfg),
- child_cfg->get_ref(child_cfg),
-- NULL, NULL, 0, FALSE);
-+ NULL, NULL, NULL, NULL, 0, FALSE);
- break;
- case ACTION_ROUTE:
- DBG1(DBG_JOB, "start action: route '%s'", name);
-diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
-index 3ee233c1f..def2a6f1b 100644
---- a/src/libcharon/sa/ike_sa_manager.c
-+++ b/src/libcharon/sa/ike_sa_manager.c
-@@ -17,6 +17,28 @@
- * for more details.
- */
-
-+/*
-+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
- #include <string.h>
- #include <inttypes.h>
-
-@@ -1408,7 +1430,8 @@ out:
- }
-
- METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
-- private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg)
-+ private_ike_sa_manager_t *this, peer_cfg_t *peer_cfg,
-+ host_t *my_host, host_t *other_host)
- {
- enumerator_t *enumerator;
- entry_t *entry;
-@@ -1417,7 +1440,17 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
- ike_cfg_t *current_ike;
- u_int segment;
-
-- DBG2(DBG_MGR, "checkout IKE_SA by config");
-+ if (my_host && my_host->get_port(my_host) == 0)
-+ {
-+ my_host->set_port(my_host, IKEV2_UDP_PORT);
-+ }
-+ if (other_host && other_host->get_port(other_host) == 0)
-+ {
-+ other_host->set_port(other_host, IKEV2_UDP_PORT);
-+ }
-+
-+ DBG2(DBG_MGR, "checkout IKE_SA by config '%s', me %H, other %H",
-+ peer_cfg->get_name(peer_cfg), my_host, other_host);
-
- if (this->reuse_ikesa || peer_cfg->get_ike_version(peer_cfg) == IKEV1)
- {
-@@ -1434,6 +1457,16 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
- entry->condvar->signal(entry->condvar);
- continue;
- }
-+
-+ if (my_host && !my_host->ip_equals(my_host, entry->ike_sa->get_my_host(entry->ike_sa)))
-+ {
-+ continue;
-+ }
-+ if (other_host && !other_host->ip_equals(other_host, entry->ike_sa->get_other_host(entry->ike_sa)))
-+ {
-+ continue;
-+ }
-+
- current_peer = entry->ike_sa->get_peer_cfg(entry->ike_sa);
- if (current_peer && current_peer->equals(current_peer, peer_cfg))
- {
-@@ -1465,6 +1508,10 @@ METHOD(ike_sa_manager_t, checkout_by_config, ike_sa_t*,
- return NULL;
- }
- ike_sa = checkout_new(this, peer_cfg->get_ike_version(peer_cfg), TRUE);
-+ if (my_host || other_host)
-+ {
-+ ike_sa->update_hosts(ike_sa, my_host, other_host, TRUE);
-+ }
- }
- charon->bus->set_sa(charon->bus, ike_sa);
-
-diff --git a/src/libcharon/sa/ike_sa_manager.h b/src/libcharon/sa/ike_sa_manager.h
-index 4298c54e2..47d6e6a37 100644
---- a/src/libcharon/sa/ike_sa_manager.h
-+++ b/src/libcharon/sa/ike_sa_manager.h
-@@ -93,7 +93,8 @@ struct ike_sa_manager_t {
- ike_sa_t* (*checkout_by_message) (ike_sa_manager_t* this, message_t *message);
-
- /**
-- * Checkout an IKE_SA for initiation by a peer_config.
-+ * Checkout an IKE_SA for initiation by a peer_config and optional
-+ * source and remote host addresses.
- *
- * To initiate, a CHILD_SA may be established within an existing IKE_SA.
- * This call checks for an existing IKE_SA by comparing the configuration.
-@@ -103,10 +104,13 @@ struct ike_sa_manager_t {
- * the found IKE_SA is in the DELETING state.
- *
- * @param peer_cfg configuration used to find an existing IKE_SA
-+ * @param my_host source host address for wildcard peer_cfg
-+ * @param other_host remote host address for wildcard peer_cfg
- * @return checked out/created IKE_SA
- */
- ike_sa_t* (*checkout_by_config) (ike_sa_manager_t* this,
-- peer_cfg_t *peer_cfg);
-+ peer_cfg_t *peer_cfg,
-+ host_t *my_host, host_t *other_host);
-
- /**
- * Check for duplicates of the given IKE_SA.
-diff --git a/src/libcharon/sa/trap_manager.c b/src/libcharon/sa/trap_manager.c
-index 40a0682f2..ea79d95ae 100644
---- a/src/libcharon/sa/trap_manager.c
-+++ b/src/libcharon/sa/trap_manager.c
-@@ -421,7 +421,7 @@ METHOD(trap_manager_t, acquire, void,
- peer_cfg_t *peer;
- child_cfg_t *child;
- ike_sa_t *ike_sa;
-- host_t *host;
-+ host_t *host, *my_host = NULL, *other_host = NULL;
- bool wildcard, ignore = FALSE;
-
- this->lock->read_lock(this->lock);
-@@ -497,36 +497,27 @@ METHOD(trap_manager_t, acquire, void,
- this->lock->unlock(this->lock);
-
- if (wildcard)
-- { /* the peer config would match IKE_SAs with other peers */
-- ike_sa = charon->ike_sa_manager->checkout_new(charon->ike_sa_manager,
-- peer->get_ike_version(peer), TRUE);
-- if (ike_sa)
-- {
-- ike_cfg_t *ike_cfg;
-- uint16_t port;
-- uint8_t mask;
--
-- ike_sa->set_peer_cfg(ike_sa, peer);
-- ike_cfg = ike_sa->get_ike_cfg(ike_sa);
-+ {
-+ ike_cfg_t *ike_cfg;
-+ uint16_t port;
-+ uint8_t mask;
-
-- port = ike_cfg->get_other_port(ike_cfg);
-- dst->to_subnet(dst, &host, &mask);
-- host->set_port(host, port);
-- ike_sa->set_other_host(ike_sa, host);
-+ ike_cfg = peer->get_ike_cfg(peer);
-
-- port = ike_cfg->get_my_port(ike_cfg);
-- src->to_subnet(src, &host, &mask);
-- host->set_port(host, port);
-- ike_sa->set_my_host(ike_sa, host);
-+ port = ike_cfg->get_other_port(ike_cfg);
-+ dst->to_subnet(dst, &other_host, &mask);
-+ other_host->set_port(other_host, port);
-
-- charon->bus->set_sa(charon->bus, ike_sa);
-- }
-- }
-- else
-- {
-- ike_sa = charon->ike_sa_manager->checkout_by_config(
-- charon->ike_sa_manager, peer);
-+ port = ike_cfg->get_my_port(ike_cfg);
-+ src->to_subnet(src, &my_host, &mask);
-+ my_host->set_port(my_host, port);
- }
-+ ike_sa = charon->ike_sa_manager->checkout_by_config(
-+ charon->ike_sa_manager, peer,
-+ my_host, other_host);
-+ DESTROY_IF(my_host);
-+ DESTROY_IF(other_host);
-+
- if (ike_sa)
- {
- if (ike_sa->get_peer_cfg(ike_sa) == NULL)
-diff --git a/src/swanctl/commands/initiate.c b/src/swanctl/commands/initiate.c
-index 8e452a6f6..b27bb8194 100644
---- a/src/swanctl/commands/initiate.c
-+++ b/src/swanctl/commands/initiate.c
-@@ -13,6 +13,28 @@
- * for more details.
- */
-
-+/*
-+ * Copyright (C) 2014 Timo Teräs <timo.teras@iki.fi>
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a copy
-+ * of this software and associated documentation files (the "Software"), to deal
-+ * in the Software without restriction, including without limitation the rights
-+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+ * copies of the Software, and to permit persons to whom the Software is
-+ * furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice shall be included in
-+ * all copies or substantial portions of the Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+ * THE SOFTWARE.
-+ */
-+
- #include "command.h"
-
- #include <errno.h>
-@@ -37,7 +59,7 @@ static int initiate(vici_conn_t *conn)
- vici_req_t *req;
- vici_res_t *res;
- command_format_options_t format = COMMAND_FORMAT_NONE;
-- char *arg, *child = NULL, *ike = NULL;
-+ char *arg, *child = NULL, *ike = NULL, *my_host = NULL, *other_host = NULL;
- int ret = 0, timeout = 0, level = 1;
-
- while (TRUE)
-@@ -64,6 +86,12 @@ static int initiate(vici_conn_t *conn)
- case 'l':
- level = atoi(arg);
- continue;
-+ case 'S':
-+ my_host = arg;
-+ continue;
-+ case 'R':
-+ other_host = arg;
-+ continue;
- case EOF:
- break;
- default:
-@@ -87,6 +115,14 @@ static int initiate(vici_conn_t *conn)
- {
- vici_add_key_valuef(req, "ike", "%s", ike);
- }
-+ if (my_host)
-+ {
-+ vici_add_key_valuef(req, "my-host", "%s", my_host);
-+ }
-+ if (other_host)
-+ {
-+ vici_add_key_valuef(req, "other-host", "%s", other_host);
-+ }
- if (timeout)
- {
- vici_add_key_valuef(req, "timeout", "%d", timeout * 1000);
-@@ -133,6 +169,8 @@ static void __attribute__ ((constructor))reg()
- {"help", 'h', 0, "show usage information"},
- {"child", 'c', 1, "initate a CHILD_SA configuration"},
- {"ike", 'i', 1, "name of the connection to which the child belongs"},
-+ {"source", 'S', 1, "override source address"},
-+ {"remote", 'R', 1, "override remote address"},
- {"timeout", 't', 1, "timeout in seconds before detaching"},
- {"raw", 'r', 0, "dump raw response message"},
- {"pretty", 'P', 0, "dump raw response message in pretty print"},
---
-2.12.1
-
diff --git a/user/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch b/user/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch
deleted file mode 100644
index 94814e13d..000000000
--- a/user/strongswan/1002-vici-send-certificates-for-ike-sa-events.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 61556ac61b9d7c564dfe13d5cf549a53f889ae36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 21 Sep 2015 13:42:05 +0300
-Subject: [PATCH] vici: send certificates for ike-sa events
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- src/libcharon/plugins/vici/vici_query.c | 48 ++++++++++++++++++++++++++++-----
- 1 file changed, 41 insertions(+), 7 deletions(-)
-
-diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
-index c0f4e2de9..309a11c03 100644
---- a/src/libcharon/plugins/vici/vici_query.c
-+++ b/src/libcharon/plugins/vici/vici_query.c
-@@ -337,7 +337,7 @@ static void list_vips(private_vici_query_t *this, vici_builder_t *b,
- * List details of an IKE_SA
- */
- static void list_ike(private_vici_query_t *this, vici_builder_t *b,
-- ike_sa_t *ike_sa, time_t now)
-+ ike_sa_t *ike_sa, time_t now, bool add_certs)
- {
- time_t t;
- ike_sa_id_t *id;
-@@ -345,6 +345,8 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
- proposal_t *proposal;
- uint16_t alg, ks;
- host_t *host;
-+ auth_cfg_t *auth_cfg;
-+ enumerator_t *enumerator;
-
- b->add_kv(b, "uniqueid", "%u", ike_sa->get_unique_id(ike_sa));
- b->add_kv(b, "version", "%u", ike_sa->get_version(ike_sa));
-@@ -354,11 +356,43 @@ static void list_ike(private_vici_query_t *this, vici_builder_t *b,
- b->add_kv(b, "local-host", "%H", host);
- b->add_kv(b, "local-port", "%d", host->get_port(host));
- b->add_kv(b, "local-id", "%Y", ike_sa->get_my_id(ike_sa));
-+ if (add_certs)
-+ {
-+ enumerator = ike_sa->create_auth_cfg_enumerator(ike_sa, TRUE);
-+ if (enumerator->enumerate(enumerator, &auth_cfg))
-+ {
-+ certificate_t *cert = auth_cfg->get(auth_cfg, AUTH_RULE_SUBJECT_CERT);
-+ chunk_t encoding;
-+
-+ if (cert && cert->get_encoding(cert, CERT_ASN1_DER, &encoding))
-+ {
-+ b->add(b, VICI_KEY_VALUE, "local-cert-data", encoding);
-+ free(encoding.ptr);
-+ }
-+ }
-+ enumerator->destroy(enumerator);
-+ }
-
- host = ike_sa->get_other_host(ike_sa);
- b->add_kv(b, "remote-host", "%H", host);
- b->add_kv(b, "remote-port", "%d", host->get_port(host));
- b->add_kv(b, "remote-id", "%Y", ike_sa->get_other_id(ike_sa));
-+ if (add_certs)
-+ {
-+ enumerator = ike_sa->create_auth_cfg_enumerator(ike_sa, FALSE);
-+ if (enumerator->enumerate(enumerator, &auth_cfg))
-+ {
-+ certificate_t *cert = auth_cfg->get(auth_cfg, AUTH_RULE_SUBJECT_CERT);
-+ chunk_t encoding;
-+
-+ if (cert && cert->get_encoding(cert, CERT_ASN1_DER, &encoding))
-+ {
-+ b->add(b, VICI_KEY_VALUE, "remote-cert-data", encoding);
-+ free(encoding.ptr);
-+ }
-+ }
-+ enumerator->destroy(enumerator);
-+ }
-
- eap = ike_sa->get_other_eap_id(ike_sa);
-
-@@ -476,7 +510,7 @@ CALLBACK(list_sas, vici_message_t*,
- b = vici_builder_create();
- b->begin_section(b, ike_sa->get_name(ike_sa));
-
-- list_ike(this, b, ike_sa, now);
-+ list_ike(this, b, ike_sa, now, TRUE);
-
- b->begin_section(b, "child-sas");
- csas = ike_sa->create_child_sa_enumerator(ike_sa);
-@@ -1624,7 +1658,7 @@ METHOD(listener_t, ike_updown, bool,
- }
-
- b->begin_section(b, ike_sa->get_name(ike_sa));
-- list_ike(this, b, ike_sa, now);
-+ list_ike(this, b, ike_sa, now, up);
- b->end_section(b);
-
- this->dispatcher->raise_event(this->dispatcher,
-@@ -1649,10 +1683,10 @@ METHOD(listener_t, ike_rekey, bool,
- b = vici_builder_create();
- b->begin_section(b, old->get_name(old));
- b->begin_section(b, "old");
-- list_ike(this, b, old, now);
-+ list_ike(this, b, old, now, TRUE);
- b->end_section(b);
- b->begin_section(b, "new");
-- list_ike(this, b, new, now);
-+ list_ike(this, b, new, now, TRUE);
- b->end_section(b);
- b->end_section(b);
-
-@@ -1682,7 +1716,7 @@ METHOD(listener_t, child_updown, bool,
- }
-
- b->begin_section(b, ike_sa->get_name(ike_sa));
-- list_ike(this, b, ike_sa, now);
-+ list_ike(this, b, ike_sa, now, up);
- b->begin_section(b, "child-sas");
-
- b->begin_section(b, child_sa->get_name(child_sa));
-@@ -1714,7 +1748,7 @@ METHOD(listener_t, child_rekey, bool,
- b = vici_builder_create();
-
- b->begin_section(b, ike_sa->get_name(ike_sa));
-- list_ike(this, b, ike_sa, now);
-+ list_ike(this, b, ike_sa, now, TRUE);
- b->begin_section(b, "child-sas");
-
- b->begin_section(b, old->get_name(old));
---
-2.12.1
-
diff --git a/user/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch b/user/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch
deleted file mode 100644
index 06dc121e8..000000000
--- a/user/strongswan/1003-vici-add-support-for-individual-sa-state-changes.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 0e4f1118e68736bb96ae23f4c6cb85f2ebbc998d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 21 Sep 2015 13:42:11 +0300
-Subject: [PATCH] vici: add support for individual sa state changes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Useful for monitoring and tracking full SA.
-
-Signed-off-by: Timo Teräs <timo.teras@iki.fi>
----
- src/libcharon/plugins/vici/vici_query.c | 105 ++++++++++++++++++++++++++++++++
- 1 file changed, 105 insertions(+)
-
-diff --git a/src/libcharon/plugins/vici/vici_query.c b/src/libcharon/plugins/vici/vici_query.c
-index 309a11c03..83a5daaa7 100644
---- a/src/libcharon/plugins/vici/vici_query.c
-+++ b/src/libcharon/plugins/vici/vici_query.c
-@@ -1624,8 +1624,16 @@ static void manage_commands(private_vici_query_t *this, bool reg)
- this->dispatcher->manage_event(this->dispatcher, "list-cert", reg);
- this->dispatcher->manage_event(this->dispatcher, "ike-updown", reg);
- this->dispatcher->manage_event(this->dispatcher, "ike-rekey", reg);
-+ this->dispatcher->manage_event(this->dispatcher, "ike-state-established", reg);
-+ this->dispatcher->manage_event(this->dispatcher, "ike-state-destroying", reg);
- this->dispatcher->manage_event(this->dispatcher, "child-updown", reg);
- this->dispatcher->manage_event(this->dispatcher, "child-rekey", reg);
-+ this->dispatcher->manage_event(this->dispatcher, "child-state-installing", reg);
-+ this->dispatcher->manage_event(this->dispatcher, "child-state-installed", reg);
-+ this->dispatcher->manage_event(this->dispatcher, "child-state-updating", reg);
-+ this->dispatcher->manage_event(this->dispatcher, "child-state-rekeying", reg);
-+ this->dispatcher->manage_event(this->dispatcher, "child-state-rekeyed", reg);
-+ this->dispatcher->manage_event(this->dispatcher, "child-state-destroying", reg);
- manage_command(this, "list-sas", list_sas, reg);
- manage_command(this, "list-policies", list_policies, reg);
- manage_command(this, "list-conns", list_conns, reg);
-@@ -1696,6 +1704,45 @@ METHOD(listener_t, ike_rekey, bool,
- return TRUE;
- }
-
-+METHOD(listener_t, ike_state_change, bool,
-+ private_vici_query_t *this, ike_sa_t *ike_sa, ike_sa_state_t state)
-+{
-+ char *event;
-+ vici_builder_t *b;
-+ time_t now;
-+
-+ switch (state)
-+ {
-+ case IKE_ESTABLISHED:
-+ event = "ike-state-established";
-+ break;
-+ case IKE_DESTROYING:
-+ event = "ike-state-destroying";
-+ break;
-+ default:
-+ return TRUE;
-+ }
-+
-+ if (!this->dispatcher->has_event_listeners(this->dispatcher, event))
-+ {
-+ return TRUE;
-+ }
-+
-+ now = time_monotonic(NULL);
-+
-+ b = vici_builder_create();
-+ b->begin_section(b, ike_sa->get_name(ike_sa));
-+ list_ike(this, b, ike_sa, now, state != IKE_DESTROYING);
-+ b->begin_section(b, "child-sas");
-+ b->end_section(b);
-+ b->end_section(b);
-+
-+ this->dispatcher->raise_event(this->dispatcher,
-+ event, 0, b->finalize(b));
-+
-+ return TRUE;
-+}
-+
- METHOD(listener_t, child_updown, bool,
- private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, bool up)
- {
-@@ -1771,6 +1818,62 @@ METHOD(listener_t, child_rekey, bool,
- return TRUE;
- }
-
-+METHOD(listener_t, child_state_change, bool,
-+ private_vici_query_t *this, ike_sa_t *ike_sa, child_sa_t *child_sa, child_sa_state_t state)
-+{
-+ char *event;
-+ vici_builder_t *b;
-+ time_t now;
-+
-+ switch (state)
-+ {
-+ case CHILD_INSTALLING:
-+ event = "child-state-installing";
-+ break;
-+ case CHILD_INSTALLED:
-+ event = "child-state-installed";
-+ break;
-+ case CHILD_UPDATING:
-+ event = "child-state-updating";
-+ break;
-+ case CHILD_REKEYING:
-+ event = "child-state-rekeying";
-+ break;
-+ case CHILD_REKEYED:
-+ event = "child-state-rekeyed";
-+ break;
-+ case CHILD_DESTROYING:
-+ event = "child-state-destroying";
-+ break;
-+ default:
-+ return TRUE;
-+ }
-+
-+ if (!this->dispatcher->has_event_listeners(this->dispatcher, event))
-+ {
-+ return TRUE;
-+ }
-+
-+ now = time_monotonic(NULL);
-+
-+ b = vici_builder_create();
-+ b->begin_section(b, ike_sa->get_name(ike_sa));
-+ list_ike(this, b, ike_sa, now, state != CHILD_DESTROYING);
-+ b->begin_section(b, "child-sas");
-+
-+ b->begin_section(b, child_sa->get_name(child_sa));
-+ list_child(this, b, child_sa, now);
-+ b->end_section(b);
-+
-+ b->end_section(b);
-+ b->end_section(b);
-+
-+ this->dispatcher->raise_event(this->dispatcher,
-+ event, 0, b->finalize(b));
-+
-+ return TRUE;
-+}
-+
- METHOD(vici_query_t, destroy, void,
- private_vici_query_t *this)
- {
-@@ -1790,8 +1893,10 @@ vici_query_t *vici_query_create(vici_dispatcher_t *dispatcher)
- .listener = {
- .ike_updown = _ike_updown,
- .ike_rekey = _ike_rekey,
-+ .ike_state_change = _ike_state_change,
- .child_updown = _child_updown,
- .child_rekey = _child_rekey,
-+ .child_state_change = _child_state_change,
- },
- .destroy = _destroy,
- },
---
-2.12.1
-
diff --git a/user/strongswan/APKBUILD b/user/strongswan/APKBUILD
index 6c895911a..d933c0639 100644
--- a/user/strongswan/APKBUILD
+++ b/user/strongswan/APKBUILD
@@ -2,8 +2,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Lee Starnes <lee@canned-death.us>
pkgname=strongswan
-pkgver=5.7.1
-pkgrel=2
+pkgver=5.8.2
+pkgrel=0
pkgdesc="IPsec-based VPN solution focused on security and ease of use, supporting IKEv1/IKEv2 and MOBIKE"
url="https://www.strongswan.org/"
arch="all"
@@ -14,13 +14,9 @@ depends="iproute2"
depends_dev=""
makedepends="$depends_dev linux-headers python3 sqlite-dev openssl-dev curl-dev
gmp-dev libcap-dev"
-install="$pkgname.pre-install"
subpackages="$pkgname-doc $pkgname-dbg $pkgname-openrc"
+install="$pkgname.pre-install"
source="https://download.strongswan.org/$pkgname-$pkgver.tar.bz2
- 0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch
- 1001-charon-add-optional-source-and-remote-overrides-for-.patch
- 1002-vici-send-certificates-for-ike-sa-events.patch
- 1003-vici-add-support-for-individual-sa-state-changes.patch
strongswan.initd
charon.initd
@@ -31,8 +27,6 @@ source="https://download.strongswan.org/$pkgname-$pkgver.tar.bz2
# - CVE-2018-17540
build() {
- cd "$builddir"
-
# notes about configuration:
# - try to keep options in ./configure --help order
# - apk depends on openssl, so we use that
@@ -86,21 +80,15 @@ build() {
}
check() {
- cd "$builddir"
- env TESTS_SUITES_EXCLUDE=printf make check
+ make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -m755 -D "$srcdir/$pkgname.initd" "$pkgdir/etc/init.d/$pkgname"
install -m755 -D "$srcdir/charon.initd" "$pkgdir/etc/init.d/charon"
}
-sha512sums="43102814434bee7c27a5956be59099cc4ffb9bb5b0d6382ce4c6a80d1d82ed6639f698f5f5544b9ca563554a344638c953525b0e2d39bc6b71b19055c80e07fc strongswan-5.7.1.tar.bz2
-193d845e2751c23d98cdf84134c7803f2e412197669c6d6c1c9974041608d154b85594ed3d9ffb923ca22a4d5926c7f2373787ddc7da47b52019e284a1d13211 0205-ike-Adhere-to-IKE_SA-limit-when-checking-out-by-conf.patch
-21db8f153f535ef13cc7c9c011f9b90b8c794e0072bd93fda6a0a56dc00d32d04e186b1a72a87a85613b7e511eed5cb96623abf0721c67dd5c96446db969a185 1001-charon-add-optional-source-and-remote-overrides-for-.patch
-f7d98fb99b4855e8bfbb7369292c170536b1987e717feeda71f64ab71b35538e7d462609a773c6a6ed08c8e6ee7a186df12e1ea7d64b9dac0b17d4c7af17dab3 1002-vici-send-certificates-for-ike-sa-events.patch
-a4235cd07e17ad3441dc391ded11ee9f4debdffa1e8218809731e73a545ca6fcdc0bb87239d41b1102b0b6719a4d31d43758972d2193ebe298b275285de2ce54 1003-vici-add-support-for-individual-sa-state-changes.patch
+sha512sums="423e7924acfe8a03ad7d4359ae9086fd516798fcf5eb948a27b52ea719f4d8954b83ea30ce94191ea1647616611df8a1215cb4d5c7ec48676624df6c41853e1d strongswan-5.8.2.tar.bz2
8b61e3ffbb39b837733e602ec329e626dc519bf7308d3d4192b497d18f38176789d23ef5afec51f8463ee1ddaf4d74546b965c03184132e217cbc27017e886c9 strongswan.initd
7182bed917585bce9749b4495ad64d3052d2999dbb505c34d568acd6df7b151232ec10c8efe12f0a07d0555ddfe01aad4e3b767b08f17a55ffcbedc57dc9d934 charon.initd"
diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD
index 7e1940785..4e8c89514 100644
--- a/user/subversion/APKBUILD
+++ b/user/subversion/APKBUILD
@@ -14,7 +14,7 @@ depends_dev="apr-dev apr-util-dev linux-headers"
makedepends="apr-dev apr-util-dev cyrus-sasl-dev db-dev dbus-dev file-dev
kdelibs4support-dev kwallet-dev libsecret-dev lz4-dev openssl-dev
serf-dev sqlite-dev utf8proc-dev zlib-dev autoconf automake python3
- perl-dev swig"
+ perl-dev swig libtool"
subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet
$pkgname-pl $pkgname-lang"
source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2
diff --git a/user/sword/APKBUILD b/user/sword/APKBUILD
index db3e5574f..ca43371fa 100644
--- a/user/sword/APKBUILD
+++ b/user/sword/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-dev"
source="http://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-$pkgver.tar.gz"
build() {
- cd "$builddir"
CPPFLAGS="$CPPFLAGS -DU_USING_ICU_NAMESPACE" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
make DESTDIR="$pkgdir" install_config
}
diff --git a/user/symboleditor/APKBUILD b/user/symboleditor/APKBUILD
index 4491afae5..bba7e7115 100644
--- a/user/symboleditor/APKBUILD
+++ b/user/symboleditor/APKBUILD
@@ -24,7 +24,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD
index 4a3daea82..8e0ea3d26 100644
--- a/user/syntax-highlighting/APKBUILD
+++ b/user/syntax-highlighting/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=syntax-highlighting
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="Framework for rendering programming code with formatting"
url="https://www.kde.org/"
@@ -39,4 +39,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="6d47024cc3851c11c9fa774fd2bca0ff8180e0a48e6b08b50e3cdb62d289d688b5736572253b96af62789181df906c9d0642ccdd4d06c545928a342c0d19e5fb syntax-highlighting-5.65.0.tar.xz"
+sha512sums="7cc68e9eaa3b12f2a5a436115cdc05443640bf1ca1a92c7b66a168605fcafc0e19174a8b28ee0683932e0c097970439e9235a5d55c584ffe56e4cf71e77f2cce syntax-highlighting-5.66.0.tar.xz"
diff --git a/user/sysfsutils/APKBUILD b/user/sysfsutils/APKBUILD
index da5f74618..99fde3f4e 100644
--- a/user/sysfsutils/APKBUILD
+++ b/user/sysfsutils/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-dev $pkgname-doc"
source="https://downloads.sourceforge.net/sourceforge/linux-diag/$pkgname-$pkgver.tar.gz"
prepare() {
- cd "$builddir"
- update_config_sub
default_prepare
+ update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,7 +27,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir"/ install
}
diff --git a/user/systemsettings/APKBUILD b/user/systemsettings/APKBUILD
index 3fa213be7..74bcde3af 100644
--- a/user/systemsettings/APKBUILD
+++ b/user/systemsettings/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=systemsettings
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="KDE system settings configuration utility"
url="https://www.kde.org/"
@@ -12,9 +12,10 @@ depends_dev="qt5-qtbase-dev kitemviews-dev kservice-dev kwidgetsaddons-dev"
makedepends="$depends_dev cmake extra-cmake-modules kactivities-stats-dev
kactivities-dev kauth-dev kcmutils-dev kcompletion-dev kconfig-dev
kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev khtml-dev ki18n-dev
- kiconthemes-dev kio-dev kirigami2-dev kwindowsystem-dev kxmlgui-dev"
+ kiconthemes-dev kitemmodels-dev kio-dev kirigami2-dev kwindowsystem-dev
+ kxmlgui-dev libkworkspace-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/systemsettings-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/systemsettings-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -27,7 +28,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -39,4 +40,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="00dc0c39004bfd8938610ef6e0c08dc1d0c8738e7b3f7f4044586c0628d5a574c07f9a69bfa288ab8c3dd7beced4d5fa4b8ba34ace35668a53b364534d929d78 systemsettings-5.12.8.tar.xz"
+sha512sums="cd6f8df1eba6252e229044bc5275fbd15dfef0e30c17db63d2331540c4ee3fb4b6adc8f73db502343699259f2b062dcc9332f1f037131c55ef7ae0080618b2a1 systemsettings-5.17.90.tar.xz"
diff --git a/user/talloc/APKBUILD b/user/talloc/APKBUILD
index 4ed262975..58ff19a60 100644
--- a/user/talloc/APKBUILD
+++ b/user/talloc/APKBUILD
@@ -1,15 +1,15 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=talloc
-pkgver=2.3.0
+pkgver=2.3.1
pkgrel=0
pkgdesc="Memory pool management library"
url="https://talloc.samba.org"
arch="all"
license="LGPL-3.0+ AND GPL-3.0+ AND ISC AND LGPL-2.1+ AND BSD-3-Clause AND PostgreSQL"
-replaces="samba-common"
depends=""
makedepends="cmd:which docbook-xsl libxslt python3-dev"
+replaces="samba-common"
subpackages="$pkgname-dev py3-$pkgname:py3 $pkgname-doc"
source="https://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz"
@@ -45,4 +45,4 @@ py3() {
"$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
}
-sha512sums="f0020d83520ea24711040c44600180fabae7b0e0668a961a66f5d4f77d89b09d799ddadf781ee2d044ad059b2d6a2e5232068fd77b300a8366592c0ce2289837 talloc-2.3.0.tar.gz"
+sha512sums="064fc39a9aaace6e0209f3251c8ff198d8a318b4cf4198006ff9892ca6e15e7d817b2fda43e0444fbbf04d2c3e70d06523dff5d57cbb796d27317ef4759e062e talloc-2.3.1.tar.gz"
diff --git a/user/tcsh/APKBUILD b/user/tcsh/APKBUILD
index ee876adff..41b8a2e25 100644
--- a/user/tcsh/APKBUILD
+++ b/user/tcsh/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Dan Theisen <djt@hxx.in>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=tcsh
-pkgver=6.21.00
+pkgver=6.22.02
_pkgver=${pkgver%.*.*}_${pkgver#*.}
_pkgver=${_pkgver%.*}_${_pkgver#*.}
pkgrel=0
@@ -12,15 +12,13 @@ license="BSD-3-Clause"
depends=""
checkdepends="diffutils autoconf"
makedepends="ncurses-dev ncurses-terminfo utmps-dev gettext-tiny-dev"
-install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
subpackages="$pkgname-doc"
-options="!checkroot"
+install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
source="$pkgname-$pkgver.tar.gz::https://github.com/tcsh-org/tcsh/archive/TCSH${_pkgver}.tar.gz
001-sysmalloc.patch"
-
builddir="$srcdir/${pkgname}-TCSH${_pkgver}"
+
build() {
- cd "$builddir"
LIBS="-lutmps -lskarnet -ltinfo" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,14 +33,12 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="305380fd065ca4703ffba002358b41727056481573a78301cb8c2390d5fe1a4107af5d482db5abf26f0ce9f7193c8aeb0e34fedcc40971499be2e6dc13bf3405 tcsh-6.21.00.tar.gz
+sha512sums="8b0bd11c8c297d155ed386fd9552d4d4da79375b1d7801edf20a8cdc8ad797f10e1c28b3f6527a657dc2f38704ba4cea51612aefa0987ee968b385ad8dea5199 tcsh-6.22.02.tar.gz
40149d8eb2fc0fe5184f3c24c7a1b728e881cc0048ccd37a986c3b2d2094499ec1c37ae2bae4c209fb8a847aa943e83e81f79e3d2f55c59990bc00d9d07f5a94 001-sysmalloc.patch"
diff --git a/user/telegram/APKBUILD b/user/telegram/APKBUILD
new file mode 100644
index 000000000..1f36cb942
--- /dev/null
+++ b/user/telegram/APKBUILD
@@ -0,0 +1,63 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=telegram
+pkgver=1.9.6
+pkgrel=0
+pkgdesc="Telegram messaging app"
+url="https://telegram.org/"
+arch="all"
+options="!check" # No test suite.
+license="GPL-3.0-only WITH OpenSSL-exception"
+depends=""
+makedepends="cmake enchant-dev ffmpeg-dev lz4-dev minizip-dev openal-soft-dev openssl-dev opus-dev pulseaudio-dev python3 qt5-qtbase-dev range-v3 xxhash-dev xz-dev zlib-dev"
+subpackages=""
+source="https://github.com/telegramdesktop/tdesktop/releases/download/v1.9.6/tdesktop-$pkgver-full.tar.gz
+ endian.patch
+ headers.patch
+ ppc.patch
+ "
+builddir="$srcdir/tdesktop-$pkgver-full"
+
+build() {
+ [ -f "$HOME/telegram_credentials.sh" ] || die "You need to have a Telegram API ID."
+
+ . $HOME/telegram_credentials.sh
+
+ if [ "$CBUILD" != "$CHOST" ]; then
+ CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+ fi
+ # Can't use packaged rlottie, API mismatch.
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DBUILD_SHARED_LIBS=True \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+ -DCMAKE_C_FLAGS="$CFLAGS" \
+ -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \
+ -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF \
+ -DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF \
+ -DTDESKTOP_API_ID="${TELEGRAM_API_ID}" \
+ -DTDESKTOP_API_HASH="${TELEGRAM_API_HASH}" \
+ -DTDESKTOP_DISABLE_GTK_INTEGRATION=ON \
+ -DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop \
+ -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF \
+ -Ddisable_autoupdate=1 \
+ ${CMAKE_CROSSOPTS} \
+ .
+ make
+}
+
+package() {
+ install -D -m755 "$builddir"/bin/Telegram "$pkgdir"/usr/bin/telegram-desktop
+ install -D -m644 "$builddir"/lib/xdg/telegramdesktop.desktop "$pkgdir"/usr/share/applications/telegramdesktop.desktop
+ install -D -m644 "$builddir"/lib/xdg/tg.protocol "$pkgdir"/usr/share/kservices5/tg.protocol
+ for _icon in 16 32 48 64 128 256 512; do
+ install -D -m644 "$builddir"/Telegram/Resources/art/icon$_icon.png \
+ "$pkgdir"/usr/share/icons/hicolor/${_icon}x${_icon}/apps/telegram.png
+ done
+}
+
+sha512sums="12446b8c467226b7ebfb96d3e8cdc77fbaeb9de6065e43e2de727564735f3047f2810d20bb12649eaffb41c09d2295a7918d041058ab1f96ba3dcdcf019d857e tdesktop-1.9.6-full.tar.gz
+f39b541c915830adf359d864e197f773822f9925817664a596b595ef31b0c2d0d7f073284c45fb1236b61565e2d7959e030783b7a8350399513ff13f9c27aa2a endian.patch
+9b9a9b623edcce37339e52e3e306a7106b6289749fca1b2dc7450c299da1a6f8d3f3f12b4973ecfbf3797f75ba88cf7f644adee896b053a683df4e4754d5d057 headers.patch
+685142055710f5a499d1f7c72a57c9c979dedce91c078204a6880080473db989e690d1bd1cce916e0a2cebb285741570665b4940ca7a5a36eecdd54eb39e8003 ppc.patch"
diff --git a/user/telegram/endian.patch b/user/telegram/endian.patch
new file mode 100644
index 000000000..81cfd8859
--- /dev/null
+++ b/user/telegram/endian.patch
@@ -0,0 +1,25 @@
+From d4c11502175e2a7821dbd92e029a90d54498e3e8 Mon Sep 17 00:00:00 2001
+From: John Zimmermann <johnz@posteo.net>
+Date: Thu, 2 Jan 2020 12:57:33 +0100
+Subject: [PATCH] Build on big endian
+
+---
+ Telegram/SourceFiles/config.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git Telegram/SourceFiles/config.h Telegram/SourceFiles/config.h
+index fb7b54e4d..6a873fbd7 100644
+--- a/Telegram/SourceFiles/config.h
++++ b/Telegram/SourceFiles/config.h
+@@ -177,7 +177,7 @@ constexpr auto ApiHash = "344583e45741c457fe1862106095a5eb";
+ #endif // TDESKTOP_API_ID && TDESKTOP_API_HASH
+
+ #if Q_BYTE_ORDER == Q_BIG_ENDIAN
+-#error "Only little endian is supported!"
++#warning "Only little endian is supported!"
+ #endif // Q_BYTE_ORDER == Q_BIG_ENDIAN
+
+ #if (TDESKTOP_ALPHA_VERSION != 0)
+--
+2.24.1
+
diff --git a/user/telegram/headers.patch b/user/telegram/headers.patch
new file mode 100644
index 000000000..dece8ec21
--- /dev/null
+++ b/user/telegram/headers.patch
@@ -0,0 +1,12 @@
+Should send this one upstream; it would work with glibc as well.
+
+--- tdesktop-1.9.6-full/Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp.old 2020-01-21 12:16:27.000000000 +0000
++++ tdesktop-1.9.6-full/Telegram/ThirdParty/libtgvoip/os/linux/AudioPulse.cpp 2020-01-22 17:44:42.185530350 +0000
+@@ -6,6 +6,7 @@
+
+ #include "AudioPulse.h"
+ #include <dlfcn.h>
++#include <libgen.h>
+ #include "../../logging.h"
+
+ #define DECLARE_DL_FUNCTION(name) typeof(name)* AudioPulse::_import_##name=NULL
diff --git a/user/telegram/ppc.patch b/user/telegram/ppc.patch
new file mode 100644
index 000000000..0a09150eb
--- /dev/null
+++ b/user/telegram/ppc.patch
@@ -0,0 +1,28 @@
+From af5f8d19f0fdded987beee4568f02cc8dcbd20f4 Mon Sep 17 00:00:00 2001
+From: John Zimmermann <johnz@posteo.net>
+Date: Thu, 2 Jan 2020 12:58:45 +0100
+Subject: [PATCH] PowerPC support
+
+---
+ base/build_config.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git Telegram/lib_base/base/build_config.h Telegram/lib_base/base/build_config.h
+index a02c9b0..b3f4860 100644
+--- a/Telegram/lib_base/base/build_config.h
++++ b/Telegram/lib_base/base/build_config.h
+@@ -46,9 +46,9 @@
+ #define ARCH_CPU_X86_FAMILY 1
+ #define ARCH_CPU_X86 1
+ #define ARCH_CPU_32_BITS 1
+-#elif defined(__aarch64__)
++#elif defined(__aarch64__) || defined(__powerpc64__)
+ #define ARCH_CPU_64_BITS 1
+-#elif defined(_M_ARM) || defined(__arm__)
++#elif defined(_M_ARM) || defined(__arm__) || defined(__powerpc__)
+ #define ARCH_CPU_32_BITS 1
+ #else
+ #error Please add support for your architecture in base/build_config.h
+--
+2.24.1
+
diff --git a/user/telegram/rlottie.patch b/user/telegram/rlottie.patch
new file mode 100644
index 000000000..6bd2ff6c3
--- /dev/null
+++ b/user/telegram/rlottie.patch
@@ -0,0 +1,16 @@
+No CMake config exists for rlottie; use pkgconf instead.
+
+--- a/cmake/external/rlottie/CMakeLists.txt 2020-01-17 18:21:17.000000000 +0100
++++ b/cmake/external/rlottie/CMakeLists.txt 2020-01-18 00:37:40.280438388 +0100
+@@ -8,8 +8,9 @@
+ add_library(external_rlottie INTERFACE IMPORTED GLOBAL)
+ add_library(desktop-app::external_rlottie ALIAS external_rlottie)
+
+- find_package(rlottie REQUIRED)
+- target_link_libraries(external_rlottie INTERFACE rlottie::rlottie)
++ find_package(PkgConfig REQUIRED)
++ pkg_check_modules(RLOTTIE REQUIRED rlottie)
++ target_link_libraries(external_rlottie INTERFACE ${RLOTTIE_LIBRARIES})
+ else()
+ add_library(external_rlottie OBJECT)
+ add_library(desktop-app::external_rlottie ALIAS external_rlottie)
diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD
index 6aae4aa93..bfca90ccc 100644
--- a/user/tellico/APKBUILD
+++ b/user/tellico/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=tellico
-pkgver=3.2.2
+pkgver=3.2.3
pkgrel=0
pkgdesc="Collection manager"
url="http://tellico-project.org/"
@@ -32,7 +32,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS -std=gnu99" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -48,5 +48,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="20af0a3017054c371dbeae7412d66b7f3cc7f0ab5119079c2da4373c23bd2eaa2f457955f8ace7448cbe69d8f0f4971f87127b25e06e3e26b07cfe47cf93b34b tellico-3.2.2.tar.xz
+sha512sums="4b2e524607d79638730b86d67e4af0e69294ae0e5e87ca971cf5319e32eee9597b0825149babbf7e0c9a78fd42a1e34fa82eff64c4e22ca61dd478afa95b58a7 tellico-3.2.3.tar.xz
4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a btparse-strcasecmp.patch"
diff --git a/user/tf/APKBUILD b/user/tf/APKBUILD
index 65f205fb7..fe0609d9c 100644
--- a/user/tf/APKBUILD
+++ b/user/tf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=tf
pkgver=5.0b8
_pkgver=${pkgver%.*}${pkgver#*.}
@@ -7,7 +7,7 @@ pkgrel=0
pkgdesc="Powerful curses-based MUD client"
url="http://tinyfugue.sourceforge.net/"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0+"
depends=""
makedepends="openssl-dev ncurses-dev pcre-dev"
@@ -22,7 +22,6 @@ source="https://sourceforge.net/projects/tinyfugue/files/tinyfugue/5.0%20beta%20
builddir="$srcdir/tf-$_pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,7 +33,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/the_silver_searcher/APKBUILD b/user/the_silver_searcher/APKBUILD
index c9f324a69..e906445e6 100644
--- a/user/the_silver_searcher/APKBUILD
+++ b/user/the_silver_searcher/APKBUILD
@@ -9,14 +9,13 @@ arch="all"
options="!check" # Tests are not shipped in the release tarball...
license="Apache-2.0"
depends=""
-makedepends="pcre-dev xz-dev zlib-dev"
checkdepends="cram"
+makedepends="pcre-dev xz-dev zlib-dev"
subpackages="$pkgname-doc"
source="https://geoff.greer.fm/ag/releases/the_silver_searcher-$pkgver.tar.gz"
builddir="$srcdir/the_silver_searcher-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD
index 41d37c9ea..c65e46f9f 100644
--- a/user/threadweaver/APKBUILD
+++ b/user/threadweaver/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=threadweaver
-pkgver=5.65.0
+pkgver=5.66.0
pkgrel=0
pkgdesc="High-level threading framework"
url="https://www.kde.org/"
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="7c3c3f37ebadcdfe53b11517a077438f6d86192626937912e551aa198a56a2f95c007f0ae55a70da900d17c97d5e504b6f8e5b3d256a3920f0b2245abd89db1a threadweaver-5.65.0.tar.xz"
+sha512sums="6600ae23dbb258612aa1a3f3f1f2f243d60571d9b47ffeb8ade14a785c788e0823e2e84f54df65eb17423a7507f8c9aea812956015423c59e0ddb89703815816 threadweaver-5.66.0.tar.xz"
diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD
index 6a2984dc6..bfbc5a1ce 100644
--- a/user/thunar-volman/APKBUILD
+++ b/user/thunar-volman/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=thunar-volman
pkgver=0.9.5
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Volume manager for Thunar"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="exo-dev intltool libgudev-dev libnotify-dev libxfce4ui-dev
thunar-dev"
subpackages="$pkgname-lang"
diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD
index f18601085..d958f69da 100644
--- a/user/thunar/APKBUILD
+++ b/user/thunar/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=thunar
pkgver=1.8.11
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="File manager for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="LGPL-2.0+ AND GPL-2.0+"
+depends=""
makedepends="intltool gtk+3.0-dev exo-dev libxfce4ui-dev vala-dev
gobject-introspection-dev libsm-dev libgudev-dev libnotify-dev
libexif-dev"
diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD
index 1e9912cfd..72656527c 100644
--- a/user/thunderbird/APKBUILD
+++ b/user/thunderbird/APKBUILD
@@ -1,6 +1,6 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=thunderbird
-pkgver=68.0
+pkgver=68.4.1
pkgrel=0
pkgdesc="Email client from Mozilla"
url="https://www.thunderbird.net/"
@@ -14,7 +14,7 @@ depends=""
# actual deps
makedepends="
autoconf2.13 cargo cbindgen clang llvm8-dev node ncurses-dev
- perl rust rust-stdlib cmd:which
+ perl rust cmd:which
ncurses-dev openssl-dev
@@ -27,7 +27,7 @@ makedepends="
startup-notification-dev unzip yasm zip gtk+2.0-dev
"
_py2ver="2.7.16"
-source="https://archive.mozilla.org/pub/thunderbird/candidates/$pkgver-candidates/build2/source/thunderbird-$pkgver.source.tar.xz
+source="https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz
https://www.python.org/ftp/python/$_py2ver/Python-$_py2ver.tar.xz
mozconfig
@@ -40,7 +40,6 @@ source="https://archive.mozilla.org/pub/thunderbird/candidates/$pkgver-candidate
shut-up-warning.patch
stackwalk-x86-ppc.patch
webrtc-broken.patch
- yuv-be.patch
thunderbird.desktop
"
@@ -81,22 +80,20 @@ unpack() {
}
prepare() {
- cd "$builddir"
default_prepare
cp "$srcdir"/mozconfig "$builddir"/mozconfig
echo "ac_add_options --enable-optimize=\"$CFLAGS\"" >> "$builddir"/mozconfig
echo "ac_add_options --host=\"$CHOST\"" >> "$builddir"/mozconfig
echo "ac_add_options --target=\"$CTARGET\"" >> "$builddir"/mozconfig
- # too much memory
- if [ -z "$JOBS" ] || [ $JOBS -ge 16 ]; then
- JOBS=16
- fi
echo "mk_add_options MOZ_MAKE_FLAGS=\"-j$JOBS\"" >> "$builddir"/mozconfig
case "$CARCH" in
pmmx|x86*)
echo "ac_add_options --disable-elf-hack" >> "$builddir"/mozconfig
;;
+ s390x)
+ echo "ac_add_options --disable-startupcache" >> "$builddir"/mozconfig
+ ;;
esac
rm "$builddir"/third_party/python/virtualenv/virtualenv_support/pip*.whl
@@ -106,8 +103,6 @@ prepare() {
}
build() {
- cd "$builddir"
-
export SHELL=/bin/sh
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
@@ -120,9 +115,6 @@ build() {
export UNIXCONFDIR="$srcdir"
- local extra_flags=""
- [ "$CARCH" = "s390x" ] && extra_flags="--disable-startupcache"
-
export PATH="$srcdir/python/bin:$PATH"
./mach build
}
@@ -130,18 +122,16 @@ build() {
run() {
cd "$builddir"/obj-$CHOST/dist/bin
export LD_LIBRARY_PATH=.
- ./firefox -no-remote -profile "$builddir"/obj-$CHOST/tmp/profile-default
+ ./thunderbird -no-remote -profile "$builddir"/obj-$CHOST/tmp/profile-default
}
package() {
- cd "$builddir"
export PATH="$srcdir/python/bin:$PATH"
DESTDIR="$pkgdir" ./mach install
install -m755 -d ${pkgdir}/usr/share/applications
install -m755 -d ${pkgdir}/usr/share/pixmaps
- local png
for png in comm/mail/branding/thunderbird/default*.png; do
local i="${_png%.png}"
i=${i##*/default}
@@ -155,7 +145,7 @@ package() {
${pkgdir}/usr/share/applications/thunderbird.desktop
}
-sha512sums="5177c11e841f6aa704634ce66fa9f1af02703d8c04dfeabf19829551f997cd80b60e8fa32af71ea64cf27af2be3956971bb6b75645dfc68417bb257a41872e3e thunderbird-68.0.source.tar.xz
+sha512sums="16cccbc2313472e6312e842a28079782238cb22e72b324bebaffefa4a2fe68fec9f2173f2c83f1caccc5522ab9145884b2e2a58e97e236f7aefa4c61764e08b7 thunderbird-68.4.1.source.tar.xz
16e814e8dcffc707b595ca2919bd2fa3db0d15794c63d977364652c4a5b92e90e72b8c9e1cc83b5020398bd90a1b397dbdd7cb931c49f1aa4af6ef95414b43e0 Python-2.7.16.tar.xz
5519234df2934ac2f3d76c8cad7e4f0fe15cf83ea4beb32c6489d8b7839b3ebea88bdb342e0d2a9c1c7c95e9455d234b0a5aa0e73446fd8027b520f080a2bb5b mozconfig
ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch
@@ -167,5 +157,4 @@ e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb1
39ddb15d1453a8412275c36fc8db3befc69dffd4a362e932d280fb7fd1190db595a2af9b468ee49e0714f5e9df6e48eb5794122a64fa9f30d689de8693acbb15 shut-up-warning.patch
452b47b825294779f98ed46bc1065dad76b79ff453521ef049934a120f349c84a1c863b16af1828fe053059823da9690ec917c055ae02dcc5c80c54cad732448 stackwalk-x86-ppc.patch
be68f1387aa6677875a67106e2d6a9db470c934c943056d3b53391a63034235108e41945c53957db427d9cdc59f0aa2f9e6f2f8cd862e090e512a3ab9cbcc9a8 webrtc-broken.patch
-2dfb986089c9afcd6a895302c8a5a1d299cffa4cc3c73fce784c29d348f362c1e7570109c4f09d328275d8549a96531736dd976411c15956b385d7fb211b8af2 yuv-be.patch
95a2b1deb4f6c90750fdd2bfe8ca0a7879a5b267965091705a6beb0a0a4b1ccad75d11df7b9885543ca4232ff704e975c6946f4c11804cb71c471e06f9576001 thunderbird.desktop"
diff --git a/user/thunderbird/yuv-be.patch b/user/thunderbird/yuv-be.patch
deleted file mode 100644
index ccb0c2fd8..000000000
--- a/user/thunderbird/yuv-be.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-# HG changeset patch
-# User A. Wilcox <AWilcox@Wilcox-Tech.com>
-# Date 1543674229 0
-# Sat Dec 01 14:23:49 2018 +0000
-# Node ID 0309ff19e46b126c527e633518d7de8570442114
-# Parent 53107afbc21ec78e7ac46d37af212505f2032d5d
-Bug 1511604 - Swizzle YCbCr->RGB data on big-endian machines
-
-diff -r 53107afbc21e -r 0309ff19e46b gfx/ycbcr/YCbCrUtils.cpp
---- a/gfx/ycbcr/YCbCrUtils.cpp Wed Nov 07 04:50:21 2018 +0000
-+++ b/gfx/ycbcr/YCbCrUtils.cpp Sat Dec 01 14:23:49 2018 +0000
-@@ -3,7 +3,9 @@
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-+#include "mozilla/EndianUtils.h"
- #include "gfx2DGlue.h"
-+#include "mozilla/gfx/Swizzle.h"
-
- #include "YCbCrUtils.h"
- #include "yuv_convert.h"
-@@ -236,6 +238,13 @@
- yuvtype,
- srcData.mYUVColorSpace);
- }
-+#if MOZ_BIG_ENDIAN
-+ // libyuv makes endian-correct result, which needs to be swapped to BGRX
-+ if (aDestFormat != SurfaceFormat::R5G6B5_UINT16)
-+ gfx::SwizzleData(aDestBuffer, aStride, gfx::SurfaceFormat::X8R8G8B8,
-+ aDestBuffer, aStride, gfx::SurfaceFormat::B8G8R8X8,
-+ srcData.mPicSize);
-+#endif
- }
-
- void
-@@ -257,6 +266,12 @@
- aSrcStrideYA,
- aSrcStrideUV,
- aDstStrideARGB);
-+#if MOZ_BIG_ENDIAN
-+ // libyuv makes endian-correct result, which needs to be swapped to BGRA
-+ gfx::SwizzleData(aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::A8R8G8B8,
-+ aDstARGB, aDstStrideARGB, gfx::SurfaceFormat::B8G8R8A8,
-+ IntSize(aWidth, aHeight));
-+#endif
- }
-
- } // namespace gfx
diff --git a/user/tigervnc/APKBUILD b/user/tigervnc/APKBUILD
index 3acea2e2d..7e088b1eb 100644
--- a/user/tigervnc/APKBUILD
+++ b/user/tigervnc/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=tigervnc
-pkgver=1.9.0
-pkgrel=4
+pkgver=1.10.1
+pkgrel=0
pkgdesc="High-performance, platform-neutral VNC remote desktop application"
url="https://tigervnc.org/"
arch="all"
@@ -15,15 +15,10 @@ makedepends="cmake fltk-dev fontconfig-dev gnutls-dev intltool
subpackages="$pkgname-lang $pkgname-doc"
source="tigervnc-$pkgver.tar.gz::https://github.com/TigerVNC/tigervnc/archive/v$pkgver.tar.gz
use-intltool.patch
- endian.patch
0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch
- null-termination.patch
- initialise-var.patch
- ensure-throw.patch
"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -34,19 +29,14 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS -faligned-new -Wno-c++11-compat -Wno-maybe-uninitialized" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-Wno-dev \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d tigervnc-1.9.0.tar.gz
+sha512sums="3486ff772d39217feb8c075860cae58e1021bdb8095443d8b5c383929cc6c622b57ea61c31d06ff0bd48c7e6889db4b6a99d0742bdd60edf323fb2a3ad328705 tigervnc-1.10.1.tar.gz
5c1cee98b7ba41c7cf121480fdfe16d5ef17c9562ff2ba3ea4e74235161fc63e2e3ed63e788c0aa999610b660b394c1269d6fdcc9716c5563651fd67d723f619 use-intltool.patch
-189a51a542b368e4db22174d09f5b656848e94577bbf93b2388f54529f1c7c2d32e5b5283551b3fb067ba21f6464f60989e22d4cd11ed3d87d5c931301555b49 endian.patch
-f95328f6b669e6608b9971de3db25d5eb26a733fbe32f13291c309ed57eacba6c86461a516c3b8cdc12ff7482ee0249a45189864d473d52df81df0a3541d95b9 0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch
-82566734e5288e899048b918ce47f5abc3b94196e88d54fa0b0ef68c20d1fcd9d5854f36a0043d28f81dc6213c9ee8cf55fb187aeeb8add5fc31765f6a5b23bb null-termination.patch
-a7fb612d7e3625b66db66ffc7e3f28f2e47f79b858ff1fd9e403576ef2b8ff7bc8cf83a6f67439de6242e4a11a0144119d040f8f9e917e17a8af512b47067360 initialise-var.patch
-4656a617dcb2bd28b653932fa034b7d46c49a08be4ba90501a9d1ddfad2130209664abf7bf5227f0afc926a568eb83e8e5f25e73887bf2561b2077fb1dab84c9 ensure-throw.patch"
+f95328f6b669e6608b9971de3db25d5eb26a733fbe32f13291c309ed57eacba6c86461a516c3b8cdc12ff7482ee0249a45189864d473d52df81df0a3541d95b9 0001-CSecurityTLS-Use-size_t-as-argument-for-new.patch"
diff --git a/user/tigervnc/endian.patch b/user/tigervnc/endian.patch
deleted file mode 100644
index e09edf9c5..000000000
--- a/user/tigervnc/endian.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/vncviewer/Surface_X11.cxx b/vncviewer/Surface_X11.cxx
-index 3523da3d..6562634d 100644
---- a/vncviewer/Surface_X11.cxx
-+++ b/vncviewer/Surface_X11.cxx
-@@ -109,6 +109,7 @@ void Surface::blend(Surface* dst, int src_x, int src_y, int x, int y, int w, int
-
- void Surface::alloc()
- {
-+ XRenderPictFormat templ;
- XRenderPictFormat* format;
-
- // Might not be open at this point
-@@ -117,7 +118,37 @@ void Surface::alloc()
- pixmap = XCreatePixmap(fl_display, XDefaultRootWindow(fl_display),
- width(), height(), 32);
-
-- format = XRenderFindStandardFormat(fl_display, PictStandardARGB32);
-+ // Our code assumes a BGRA byte order, regardless of what the endian
-+ // of the machine is or the native byte order of XImage, so make sure
-+ // we find such a format
-+ templ.type = PictTypeDirect;
-+ templ.depth = 32;
-+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
-+ templ.direct.alpha = 0;
-+ templ.direct.red = 8;
-+ templ.direct.green = 16;
-+ templ.direct.blue = 24;
-+#else
-+ templ.direct.alpha = 24;
-+ templ.direct.red = 16;
-+ templ.direct.green = 8;
-+ templ.direct.blue = 0;
-+#endif
-+ templ.direct.alphaMask = 0xff;
-+ templ.direct.redMask = 0xff;
-+ templ.direct.greenMask = 0xff;
-+ templ.direct.blueMask = 0xff;
-+
-+ format = XRenderFindFormat(fl_display, PictFormatType | PictFormatDepth |
-+ PictFormatRed | PictFormatRedMask |
-+ PictFormatGreen | PictFormatGreenMask |
-+ PictFormatBlue | PictFormatBlueMask |
-+ PictFormatAlpha | PictFormatAlphaMask,
-+ &templ, 0);
-+
-+ if (!format)
-+ throw rdr::Exception("XRenderFindFormat");
-+
- picture = XRenderCreatePicture(fl_display, pixmap, format, 0, NULL);
-
- visFormat = XRenderFindVisualFormat(fl_display, fl_visual->visual);
diff --git a/user/tigervnc/ensure-throw.patch b/user/tigervnc/ensure-throw.patch
deleted file mode 100644
index da873fe21..000000000
--- a/user/tigervnc/ensure-throw.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 78bdd1700c4e42b492286a2af25bea0825848f99 Mon Sep 17 00:00:00 2001
-From: Pierre Ossman <ossman@cendio.se>
-Date: Tue, 26 Mar 2019 11:10:28 +0100
-Subject: [PATCH] Add missing throws for exception
-
-It is not enough to create an exception object, you need to throw
-it as well.
----
- common/rfb/CSecurityTLS.cxx | 10 +++++-----
- win/rfb_win32/Registry.cxx | 2 +-
- 2 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx
-index c6d1e3103..aa1910909 100644
---- a/common/rfb/CSecurityTLS.cxx
-+++ b/common/rfb/CSecurityTLS.cxx
-@@ -391,7 +391,7 @@ void CSecurityTLS::checkSession()
- "authority:\n\n%s\n\nDo you want to save it and "
- "continue?\n ", info.data);
- if (len < 0)
-- AuthFailureException("certificate decoding error");
-+ throw AuthFailureException("certificate decoding error");
-
- vlog.debug("%s", info.data);
-
-@@ -417,16 +417,16 @@ void CSecurityTLS::checkSession()
-
- if (gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM, NULL, &out_size)
- == GNUTLS_E_SHORT_MEMORY_BUFFER)
-- AuthFailureException("Out of memory");
-+ throw AuthFailureException("Out of memory");
-
- // Save cert
- out_buf = new char[out_size];
- if (out_buf == NULL)
-- AuthFailureException("Out of memory");
-+ throw AuthFailureException("Out of memory");
-
- if (gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM, out_buf, &out_size) < 0)
-- AuthFailureException("certificate issuer unknown, and certificate "
-- "export failed");
-+ throw AuthFailureException("certificate issuer unknown, and certificate "
-+ "export failed");
-
- char *homeDir = NULL;
- if (getvnchomedir(&homeDir) == -1)
-diff --git a/win/rfb_win32/Registry.cxx b/win/rfb_win32/Registry.cxx
-index 963a36a29..9cd501842 100644
---- a/win/rfb_win32/Registry.cxx
-+++ b/win/rfb_win32/Registry.cxx
-@@ -254,7 +254,7 @@ TCHAR* RegKey::getRepresentation(const TCHAR* valname) const {
- TCharArray result(required);
- length = ExpandEnvironmentStrings(str.buf, result.buf, required);
- if (required<length)
-- rdr::Exception("unable to expand environment strings");
-+ throw rdr::Exception("unable to expand environment strings");
- return result.takeBuf();
- } else {
- return tstrDup(_T(""));
diff --git a/user/tigervnc/initialise-var.patch b/user/tigervnc/initialise-var.patch
deleted file mode 100644
index f58a4dadc..000000000
--- a/user/tigervnc/initialise-var.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 44cf1d64ecf80c061c0a2b0f0167094e58782102 Mon Sep 17 00:00:00 2001
-From: Pierre Ossman <ossman@cendio.se>
-Date: Mon, 25 Mar 2019 16:14:49 +0100
-Subject: [PATCH] Don't use un-initialized stride to base constructor
-
-We can use a dummy value here as we set up the buffer and stride
-further down in the constructor.
----
- vncviewer/PlatformPixelBuffer.cxx | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/vncviewer/PlatformPixelBuffer.cxx b/vncviewer/PlatformPixelBuffer.cxx
-index 1e9803eb2..ff1935e74 100644
---- a/vncviewer/PlatformPixelBuffer.cxx
-+++ b/vncviewer/PlatformPixelBuffer.cxx
-@@ -36,7 +36,7 @@ static rfb::LogWriter vlog("PlatformPixelBuffer");
- PlatformPixelBuffer::PlatformPixelBuffer(int width, int height) :
- FullFramePixelBuffer(rfb::PixelFormat(32, 24, false, true,
- 255, 255, 255, 16, 8, 0),
-- width, height, 0, stride),
-+ width, height, NULL, 0),
- Surface(width, height)
- #if !defined(WIN32) && !defined(__APPLE__)
- , shminfo(NULL), xim(NULL)
diff --git a/user/tigervnc/null-termination.patch b/user/tigervnc/null-termination.patch
deleted file mode 100644
index e80a4f62d..000000000
--- a/user/tigervnc/null-termination.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7240f62ddc06643f982456c05c11d8afe5422069 Mon Sep 17 00:00:00 2001
-From: Pierre Ossman <ossman@cendio.se>
-Date: Tue, 26 Mar 2019 11:11:20 +0100
-Subject: [PATCH] Handle server name overflow properly
-
-We need to make sure it is null terminated on truncation. We also
-need to avoid giving a too large size argument or modern gcc will
-complain.
----
- vncviewer/vncviewer.cxx | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
-index d7cbd6e36..4a8370b95 100644
---- a/vncviewer/vncviewer.cxx
-+++ b/vncviewer/vncviewer.cxx
-@@ -411,7 +411,8 @@ potentiallyLoadConfigurationFile(char *vncServerName)
- newServerName = loadViewerParameters(vncServerName);
- // This might be empty, but we still need to clear it so we
- // don't try to connect to the filename
-- strncpy(vncServerName, newServerName, VNCSERVERNAMELEN);
-+ strncpy(vncServerName, newServerName, VNCSERVERNAMELEN-1);
-+ vncServerName[VNCSERVERNAMELEN-1] = '\0';
- } catch (rfb::Exception& e) {
- vlog.error("%s", e.str());
- if (alertOnFatalError)
-@@ -541,8 +542,10 @@ int main(int argc, char** argv)
- try {
- const char* configServerName;
- configServerName = loadViewerParameters(NULL);
-- if (configServerName != NULL)
-- strncpy(defaultServerName, configServerName, VNCSERVERNAMELEN);
-+ if (configServerName != NULL) {
-+ strncpy(defaultServerName, configServerName, VNCSERVERNAMELEN-1);
-+ defaultServerName[VNCSERVERNAMELEN-1] = '\0';
-+ }
- } catch (rfb::Exception& e) {
- vlog.error("%s", e.str());
- if (alertOnFatalError)
diff --git a/user/tint2/APKBUILD b/user/tint2/APKBUILD
index 5650d304f..ebc94463f 100644
--- a/user/tint2/APKBUILD
+++ b/user/tint2/APKBUILD
@@ -8,8 +8,8 @@ pkgrel=0
pkgdesc="Simple, unintrusive panel/taskbar"
url="https://gitlab.com/o9000/tint2"
arch="all"
-license="GPL-2.0-only AND GPL-2.0+ AND MIT AND Custom:zlib-optional-acknowledgement"
options="!check" # No test suite.
+license="GPL-2.0-only AND GPL-2.0+ AND MIT AND Custom:zlib-optional-acknowledgement"
depends=""
makedepends="cmake imlib2-dev glib-dev pango-dev cairo-dev
libxcomposite-dev libxdamage-dev libxinerama-dev libxrandr-dev
@@ -19,11 +19,10 @@ source="$pkgname-$pkgver.tar.bz2::https://gitlab.com/o9000/$pkgname/repository/v
prepare() {
mv "$srcdir/$pkgname-v$pkgver"-* "$builddir"
- mkdir "$builddir"/build
+ default_prepare
}
build() {
- cd "$builddir"/build
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_SYSCONFDIR=/etc \
@@ -31,13 +30,12 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ..
- make
+ -Bbuild
+ make -C build
}
package() {
- cd "$builddir"/build
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" -C build install
}
sha512sums="bd5cc461199d38028b81d84f30e896e658274e166e344f4bc98bc6e43c4e25790bc80a7d4aac48d4e9e8284137fd31e4019f0c1b956149222e67a66b42379f1d tint2-16.7.tar.bz2"
diff --git a/user/tinyxml2/APKBUILD b/user/tinyxml2/APKBUILD
index 1fb564d19..4b096d670 100644
--- a/user/tinyxml2/APKBUILD
+++ b/user/tinyxml2/APKBUILD
@@ -8,7 +8,7 @@ url=" "
arch="all"
license="Zlib"
depends=""
-makedepends=""
+makedepends="cmake"
subpackages="$pkgname-dev"
source="tinyxml2-$pkgver.tar.gz::https://github.com/leethomason/tinyxml2/archive/$pkgver.tar.gz"
@@ -23,7 +23,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/tk/APKBUILD b/user/tk/APKBUILD
index 8295ec4fc..007ff7b69 100644
--- a/user/tk/APKBUILD
+++ b/user/tk/APKBUILD
@@ -7,17 +7,15 @@ url="http://tcl.sourceforge.net/"
arch="all"
options="!check" # Requires a running X11 server.
license="TCL"
-depends=
+depends=""
depends_dev="tcl-dev libx11-dev libxft-dev fontconfig-dev"
makedepends="$depends_dev libpng-dev"
subpackages="$pkgname-doc $pkgname-dev"
-source="https://downloads.sourceforge.net/sourceforge/tcl/$pkgname$pkgver-src.tar.gz
- "
+source="https://downloads.sourceforge.net/sourceforge/tcl/$pkgname$pkgver-src.tar.gz"
_major=8.6
builddir="$srcdir"/tk8.6.9/unix
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
export LD_LIBRARY_PATH="$builddir"
make -j1 INSTALL_ROOT="${pkgdir}" install install-private-headers
diff --git a/user/tlp/APKBUILD b/user/tlp/APKBUILD
index 1b1398c9a..40613efd9 100644
--- a/user/tlp/APKBUILD
+++ b/user/tlp/APKBUILD
@@ -33,8 +33,7 @@ rdw() {
pkgdesc="Linux Advanced Power Management - Radio Device Wizard"
depends="tlp"
- cd "$builddir"
- make DESTDIR="$subpkgdir" TLP_WITH_SYSTEMD=0 install-rdw
+ make DESTDIR="$subpkgdir" TLP_WITH_SYSTEMD=0 -C "$builddir" install-rdw
}
bashcomp() {
diff --git a/user/tmux-bash-completion/APKBUILD b/user/tmux-bash-completion/APKBUILD
index 8ddbcc875..fe35c7d11 100644
--- a/user/tmux-bash-completion/APKBUILD
+++ b/user/tmux-bash-completion/APKBUILD
@@ -7,17 +7,18 @@ pkgrel=0
pkgdesc="bash-completion files for tmux"
url="https://github.com/imomaliev/tmux-bash-completion"
arch="noarch"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0-only"
depends="bash-completion tmux"
makedepends=""
subpackages=""
+install_if="tmux bash-completion"
source="$pkgname-$pkgver.tar.gz::https://github.com/imomaliev/tmux-bash-completion/archive/$_commit.tar.gz"
builddir="$srcdir/$pkgname-$_commit"
package() {
- cd "$builddir"
- install -Dm644 ./completions/tmux "$pkgdir"/usr/share/bash-completion/completions/tmux
+ install -Dm644 "$builddir"/completions/tmux \
+ "$pkgdir"/usr/share/bash-completion/completions/tmux
}
sha512sums="6c4c761aa152d1352a575c91e2c375d3f19ad01263b603b9e0cde4bdd95ce478c93bb55bfcd9fa5332cde12399e1e1e1c062e6be2ed7403b96e808275401effa tmux-bash-completion-1.0.0_git20170805.tar.gz"
diff --git a/user/tmux/APKBUILD b/user/tmux/APKBUILD
index eed2ea5e2..b39d4a3b6 100644
--- a/user/tmux/APKBUILD
+++ b/user/tmux/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer:
pkgname=tmux
-pkgver=2.9a
-pkgrel=1
+pkgver=3.0a
+pkgrel=0
pkgdesc="Tool to control multiple terminals from a single terminal"
url="https://tmux.github.io/"
arch="all"
@@ -10,8 +10,7 @@ license="MIT"
depends="ncurses-terminfo"
makedepends="bsd-compat-headers libevent-dev libutempter-dev ncurses-dev"
subpackages="$pkgname-doc"
-source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz
- xterm-DECLRMM.patch"
+source="https://github.com/tmux/tmux/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
build() {
./configure \
@@ -33,10 +32,8 @@ package() {
install -Dm644 example_tmux.conf \
"$pkgdir"/usr/share/doc/$pkgname/examples/$pkgname.conf
- for file in CHANGES README TODO; do
- install -m644 "$file" "$pkgdir"/usr/share/doc/$pkgname/
- done
+ install -m644 "CHANGES" "$pkgdir"/usr/share/doc/$pkgname/
+ install -m644 "README" "$pkgdir"/usr/share/doc/$pkgname/
}
-sha512sums="aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713 tmux-2.9a.tar.gz
-7fb006f8f24d60614fcaeadace933c2ad6674d2476980736a830f63a40d7110638942478322336849d47707c99ab7de0cb01ff39806a4c9144650daf2f666773 xterm-DECLRMM.patch"
+sha512sums="f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b tmux-3.0a.tar.gz"
diff --git a/user/tmux/xterm-DECLRMM.patch b/user/tmux/xterm-DECLRMM.patch
deleted file mode 100644
index b9bef3455..000000000
--- a/user/tmux/xterm-DECLRMM.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 26f274011096b9eacfd2753d8f7afcb63e796ab9 Mon Sep 17 00:00:00 2001
-From: nicm <nicm>
-Date: Thu, 1 Aug 2019 11:45:34 +0000
-Subject: [PATCH] xterm 348 now disables margins when resized, so send DECLRMM
- again.
-
----
- tty.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tty.c b/tty.c
-index ab1da9fd3..024aef271 100644
---- a/tty.c
-+++ b/tty.c
-@@ -1879,6 +1879,8 @@ tty_invalidate(struct tty *tty)
- tty->rlower = tty->rright = UINT_MAX;
-
- if (tty->flags & TTY_STARTED) {
-+ if (tty_use_margin(tty))
-+ tty_puts(tty, "\033[?69h"); /* DECLRMM */
- tty_putcode(tty, TTYC_SGR0);
-
- tty->mode = ALL_MODES;
diff --git a/user/torcs/APKBUILD b/user/torcs/APKBUILD
index ef7c3cb23..d8470bf18 100644
--- a/user/torcs/APKBUILD
+++ b/user/torcs/APKBUILD
@@ -11,7 +11,7 @@ license="GPL-2.0+"
depends=""
makedepends="freealut-dev freeglut-dev libogg-dev libpng-dev libsm-dev
libvorbis-dev libxmu-dev libxrandr-dev libxrender-dev libxt-dev mesa-dev
- openal-soft-dev plib-dev zlib-dev"
+ openal-soft-dev plib-dev zlib-dev autoconf automake"
subpackages="$pkgname-data::noarch"
source="https://sourceforge.net/projects/torcs/files/all-in-one/$pkgver/torcs-$pkgver.tar.bz2
torcs-1.3.6-as-needed.patch
@@ -22,7 +22,6 @@ source="https://sourceforge.net/projects/torcs/files/all-in-one/$pkgver/torcs-$p
"
build() {
- cd "$builddir"
export CXXFLAGS="$CXXFLAGS -fpermissive" # GCC 8
autoreconf
./configure \
@@ -36,16 +35,14 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
data() {
pkgdesc="Data files for TORCS"
- cd "$builddir"
mkdir -p "$subpkgdir"/usr/share/games
chgrp games "$subpkgdir"/usr/share/games
- make DESTDIR="$subpkgdir" datainstall
+ make DESTDIR="$subpkgdir" -C "$builddir" datainstall
}
sha512sums="14b88624803c746b2f356fa185aca5be56b7d7e5192fede11307474100328bfaa67eafa61e84987bbad04590ae5740127e015707723df6d2c3197bb867818101 torcs-1.3.7.tar.bz2
diff --git a/user/traceroute/APKBUILD b/user/traceroute/APKBUILD
index 8eac94eb9..278a1d1c8 100644
--- a/user/traceroute/APKBUILD
+++ b/user/traceroute/APKBUILD
@@ -6,21 +6,18 @@ pkgrel=0
pkgdesc="Utility to trace the network route of packets"
url="http://traceroute.sourceforge.net/"
arch="all"
+options="!check" # No test suite.
license="GPL-2.0"
depends=""
makedepends=""
-install=""
-options="!check"
subpackages="$pkgname-doc"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" prefix="/usr" install
ln -s traceroute "$pkgdir"/usr/bin/traceroute6
}
diff --git a/user/transmission/APKBUILD b/user/transmission/APKBUILD
index d7eb95544..9f2a97963 100644
--- a/user/transmission/APKBUILD
+++ b/user/transmission/APKBUILD
@@ -46,16 +46,14 @@ check() {
# check for Qt - this historically has no tests
msg "Checking for Transmission Qt"
- cd qt
- make check
+ make -C qt check
}
package() {
make DESTDIR="$pkgdir" install
# install for Qt
- cd "$builddir"/qt
- make INSTALL_ROOT="$pkgdir/usr" install
+ make INSTALL_ROOT="$pkgdir/usr" -C qt install
}
qt() {
diff --git a/user/transset/APKBUILD b/user/transset/APKBUILD
index 8b063867c..f5b9ba519 100644
--- a/user/transset/APKBUILD
+++ b/user/transset/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/transset-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/trigger-rally/APKBUILD b/user/trigger-rally/APKBUILD
index 07e4de092..9e71972d1 100644
--- a/user/trigger-rally/APKBUILD
+++ b/user/trigger-rally/APKBUILD
@@ -14,19 +14,16 @@ makedepends="freealut-dev glew-dev glu-dev openal-soft-dev physfs-dev sdl2-dev
subpackages="$pkgname-doc"
source="https://downloads.sourceforge.net/trigger-rally/trigger-rally-$pkgver.tar.gz
dont-strip.patch
+ sdl2-compat.patch
trigger-rally.desktop
"
build() {
- cd "$builddir"/src
- make OPTIMS="$CXXFLAGS -Wno-deprecated-declarations" DESTDIR="$pkgdir" prefix=/usr build
+ make OPTIMS="$CXXFLAGS -Wno-deprecated-declarations" DESTDIR="$pkgdir" prefix=/usr -C src build
}
package() {
- local _icon=""
-
- cd "$builddir"/src
- make OPTIMS="$CXXFLAGS" DESTDIR="$pkgdir" prefix=/usr install
+ make OPTIMS="$CXXFLAGS" DESTDIR="$pkgdir" prefix=/usr -C src install
install -D -m644 "$srcdir"/trigger-rally.desktop \
"$pkgdir"/usr/share/applications/trigger-rally.desktop
@@ -41,4 +38,5 @@ package() {
sha512sums="feed805858ef63907bb10088761f1219b22fe55ead268511ef73b18aa0f18d79e87d4e2cbfb76361b1dec3949b59464af33efe31e81f06ae7e163430f3336669 trigger-rally-0.6.6.1.tar.gz
a81781058177e012daaad58d72e4bdbdbc2730b1df76941ba03f06367545b213ba82a33bab46deba31570973deb1802a3d459704c3a963c38eec69ef82f228d5 dont-strip.patch
+e16fa74f1554cf8202f1ae5994c8f65eb311bf85ec9e89989911975db54d22c8e7dff559952e730972011b7dfabfd6aedb8c9f1d6292839734bfee54796b743a sdl2-compat.patch
ddaf7d89353280f7952d6cffd06182ea28640473e18eff06809c48477349248f57922eaff9bf816261c32f8fdc167d933f345422f9885638041dd9f5e5ac0524 trigger-rally.desktop"
diff --git a/user/trigger-rally/sdl2-compat.patch b/user/trigger-rally/sdl2-compat.patch
new file mode 100644
index 000000000..ae3f7c609
--- /dev/null
+++ b/user/trigger-rally/sdl2-compat.patch
@@ -0,0 +1,11 @@
+--- trigger-rally-0.6.6.1/src/GNUmakefile.old 2020-01-12 09:46:17.392027213 +0000
++++ trigger-rally-0.6.6.1/src/GNUmakefile 2020-01-12 09:56:43.744640443 +0000
+@@ -26,7 +26,7 @@
+ INCDIRS := -I'./include'
+ CXXFLAGS += -std=c++11 $(WARNINGS) $(OPTIMS)
+ CPPFLAGS += $(DMACROS) $(INCDIRS)
+-EXTRA_LIBS := -lSDL2main -lGL -lGLU -lGLEW -lSDL2 -lSDL2_image -lphysfs -lopenal -lalut -lpthread -ltinyxml2
++EXTRA_LIBS := -lSDL2main -lGL -lGLU -lGLEW -lSDL2-2.0 -lSDL2_image -lphysfs -lopenal -lalut -lpthread -ltinyxml2
+ LDFLAGS += $(EXTRA_LIBS)
+ INSTALL_PROGRAM := install --mode=0755
+ INSTALL_DATA := install --mode=0644
diff --git a/user/trojita/APKBUILD b/user/trojita/APKBUILD
index 429226f42..c55e5453c 100644
--- a/user/trojita/APKBUILD
+++ b/user/trojita/APKBUILD
@@ -1,25 +1,23 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=trojita
pkgver=0.7
pkgrel=0
pkgdesc="Qt-based IMAP email client"
url="http://trojita.flaska.net/"
arch="all"
-options="!check"
license="(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1 WITH Nokia-Qt-exception-1.1 OR GPL-3.0-only) AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0+ AND LGPL-2.0-only AND LGPL-2.0+ AND LGPL-2.1+"
depends=""
-depends_dev=""
+# Font required: https://github.com/qtwebkit/qtwebkit/issues/933
+checkdepends="ttf-liberation"
makedepends="cmake extra-cmake-modules zlib-dev qt5-qtbase-dev qt5-qtwebkit-dev
qt5-qttools-dev qt5-qtsvg-dev ragel mimetic-dev gpgme-dev
- qtkeychain-dev $depends_dev"
-install=""
+ qtkeychain-dev"
source="https://sourceforge.net/projects/trojita/files/src/trojita-$pkgver.tar.xz
use-qgpgme.patch
fix-gpg.patch"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -31,22 +29,15 @@ build() {
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
-DWITH_GPGMEPP=ON \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
-check() {
- cd "$builddir"
- make check
-}
-
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/ttc-iosevka/APKBUILD b/user/ttc-iosevka/APKBUILD
index 48fe3e10d..11366476e 100644
--- a/user/ttc-iosevka/APKBUILD
+++ b/user/ttc-iosevka/APKBUILD
@@ -13,10 +13,9 @@ makedepends=""
subpackages=""
source="https://github.com/be5invis/Iosevka/releases/download/v$pkgver/ttc-iosevka-$pkgver.zip
https://github.com/be5invis/Iosevka/releases/download/v$pkgver/ttc-iosevka-slab-$pkgver.zip"
-builddir="$srcdir"
package() {
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttc
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$srcdir"/*.ttc
}
sha512sums="8943c1f8018469091d56adb731337c194e3b0c348a6c8b06a61f53410220aa505aeb03d6afc207c056a31f8e138c326b67595d79475d162bb172f8a812a3fbdb ttc-iosevka-2.3.3.zip
diff --git a/user/ttf-alee/APKBUILD b/user/ttf-alee/APKBUILD
index ffbf879a2..05d3333bc 100644
--- a/user/ttf-alee/APKBUILD
+++ b/user/ttf-alee/APKBUILD
@@ -15,8 +15,7 @@ source="http://deb.debian.org/debian/pool/main/f/fonts-alee/fonts-alee_$pkgver.t
builddir="$srcdir"/fonts-alee-$pkgver
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF "$builddir"/*.ttf
}
sha512sums="fc91a018c0757fce1b899ecf736260b96c7acc9c8ec626fb8d53f8e002d89ca23bdaf3a5712e747cfa63f53463c5471da292af715968a5612a17d7499222bc45 fonts-alee_13.3.tar.xz"
diff --git a/user/ttf-freefont/APKBUILD b/user/ttf-freefont/APKBUILD
index d4a67e4a0..e6251fcda 100644
--- a/user/ttf-freefont/APKBUILD
+++ b/user/ttf-freefont/APKBUILD
@@ -13,11 +13,10 @@ source="https://ftp.gnu.org/gnu/freefont/freefont-ttf-$pkgver.zip"
builddir="$srcdir/freefont-$pkgver"
package() {
- cd "$builddir"
install -d "$pkgdir/usr/share/fonts/$pkgname/"
- install -m644 *.ttf "$pkgdir/usr/share/fonts/$pkgname/"
+ install -m644 "$builddir"/*.ttf "$pkgdir/usr/share/fonts/$pkgname/"
# Licensing exception is discussed in README in pkgver==20120503
- install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README"
+ install -Dm644 "$builddir"/README "$pkgdir/usr/share/licenses/$pkgname/README"
}
sha512sums="dcd6f525e8f97631c6f84ab4cc2a31af4614dcdb9a4d434bd890baf18e0c2934032f2915384fc27fbecf60d259d792e48f52d357b07e3ed2616d3c8c3544268e freefont-ttf-20120503.zip"
diff --git a/user/ttf-hack/APKBUILD b/user/ttf-hack/APKBUILD
index 433d1c1f4..d5fbf1b07 100644
--- a/user/ttf-hack/APKBUILD
+++ b/user/ttf-hack/APKBUILD
@@ -11,12 +11,10 @@ license="OFL-2.0"
depends=""
makedepends=""
source="https://github.com/source-foundry/Hack/releases/download/v$pkgver/Hack-v$pkgver-ttf.zip"
-builddir="$srcdir"/ttf
package() {
- cd "$builddir"
for variant in Regular Bold BoldItalic Italic; do
- install -m644 -D Hack-$variant.ttf \
+ install -m644 -D "$srcdir"/ttf/Hack-$variant.ttf \
"$pkgdir"/usr/share/fonts/truetype/Hack-$variant.ttf
done
}
diff --git a/user/ttf-sinhala-lklug/APKBUILD b/user/ttf-sinhala-lklug/APKBUILD
index c487c96f4..dae2dfe1e 100644
--- a/user/ttf-sinhala-lklug/APKBUILD
+++ b/user/ttf-sinhala-lklug/APKBUILD
@@ -14,8 +14,8 @@ subpackages=""
source="http://sinhala.sourceforge.net/files/ttf-sinhala-lklug-$pkgver.tar.gz"
package() {
- cd "$builddir"
- install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ lklug.ttf
+ install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ \
+ "$builddir"/lklug.ttf
}
sha512sums="d1b1459981f1d80acd17aa09a2171e17ad246d98e00035c9592a6c93d89423ccb20f440c3eaccb21b9bb5fae2ac8eca5458715fe8a60e7294f75f9fffe3417aa ttf-sinhala-lklug-0.6.tar.gz"
diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD
index 3524e7a01..23d44cdb2 100644
--- a/user/ttf-sudo/APKBUILD
+++ b/user/ttf-sudo/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ttf-sudo
pkgver=0.40
pkgrel=0
pkgdesc="Monospaced font family for programming and console users"
url="https://www.kutilek.de/sudo-font/"
arch="noarch"
-options="!check" # No tests
+options="!check" # No test suite.
license="OFL-1.1"
depends="fontconfig"
makedepends=""
@@ -14,7 +14,6 @@ source="https://github.com/jenskutilek/sudo-font/releases/download/v$pkgver/sudo
builddir="$srcdir/sudo"
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-}
for i in *.ttf; do
install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-}
diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD
index ebb4f09f4..fd1543413 100644
--- a/user/ttf-terminus/APKBUILD
+++ b/user/ttf-terminus/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ttf-terminus
pkgver=4.47.0
pkgrel=0
pkgdesc="TrueType variant of Terminus Font"
url="https://files.ax86.net/terminus-ttf/"
arch="noarch"
-options="!check" # No tests
+options="!check" # No test suite.
license="OFL-1.1"
depends="fontconfig"
makedepends=""
@@ -14,7 +14,6 @@ source="https://files.ax86.net/terminus-ttf/files/$pkgver/terminus-ttf-$pkgver.z
builddir="$srcdir/terminus-ttf-$pkgver"
package() {
- cd "$builddir"
mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-}
for i in *.ttf; do
install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-}
diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD
index 98adfba5d..723a1b2ff 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>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=tumbler
-pkgver=0.2.7
-pkgrel=1
+pkgver=0.2.8
+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="d5121da67bc2b1bf115980b6c9ef9fcaf71cdf52976227dd360afa44ac477c305a774a29be876e4fd0874f71bae3682b28c2429864283dd14b9e9bd1790a9083 tumbler-0.2.7.tar.bz2"
+sha512sums="cfb322fb960b4f4d25c6dc68db5087c46845592fd0af839269598dc22930f5d460aae5df7c852024de3733fad9b0e53a8906700cb4ba43ab60883a6104f3e7cb tumbler-0.2.8.tar.bz2"
diff --git a/user/twm/APKBUILD b/user/twm/APKBUILD
index fad37c996..de08c9b46 100644
--- a/user/twm/APKBUILD
+++ b/user/twm/APKBUILD
@@ -16,7 +16,6 @@ subpackages="$pkgname-doc"
source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/uchardet/APKBUILD b/user/uchardet/APKBUILD
index 08770a326..153dfc63b 100644
--- a/user/uchardet/APKBUILD
+++ b/user/uchardet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=uchardet
pkgver=0.0.6
pkgrel=0
@@ -7,14 +7,12 @@ pkgdesc="Universal character encoding detection library"
url="https://www.freedesktop.org/wiki/Software/uchardet/"
arch="all"
license="MPL-1.1 OR GPL-2.0+ OR LGPL-2.1+"
+depends=""
makedepends="cmake"
subpackages="$pkgname-dev $pkgname-doc"
source="https://www.freedesktop.org/software/uchardet/releases/uchardet-$pkgver.tar.xz"
-sha512sums="eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 uchardet-0.0.6.tar.xz"
-builddir="$srcdir/uchardet-$pkgver"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -25,17 +23,16 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
+sha512sums="eceeadae060bf277e298d709856609dde32921271140dc1fb0a33c7b6e1381033fc2960d616ebbd82c92815936864d2c0743b1b5ea1b7d4a200df87df80d6de5 uchardet-0.0.6.tar.xz"
diff --git a/user/ucpp/APKBUILD b/user/ucpp/APKBUILD
index 9d45b1d0a..59f118c41 100644
--- a/user/ucpp/APKBUILD
+++ b/user/ucpp/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
source="https://gitlab.com/scarabeusiv/ucpp/uploads/79f08e39c676f15ed8a59335f6c9b924/ucpp-1.3.5.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -23,7 +22,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/ufw/APKBUILD b/user/ufw/APKBUILD
new file mode 100644
index 000000000..10ea2ab5e
--- /dev/null
+++ b/user/ufw/APKBUILD
@@ -0,0 +1,42 @@
+# Contributor:
+# Maintainer:
+pkgname=ufw
+pkgver=0.36
+pkgrel=0
+pkgdesc="Uncomplicated Firewall"
+url="https://launchpad.net/ufw"
+arch="noarch"
+options="!check" # No test suite.
+license="GPL-3.0-only AND GPL-2.0-only"
+depends="python3 iptables"
+makedepends="python3-dev gettext-tiny-dev"
+subpackages="ufw-doc
+ ufw-openrc
+ "
+source="http://launchpad.net/ufw/$pkgver/$pkgver/+download/$pkgname-$pkgver.tar.gz
+ ufw-0.36-bash-completion.patch
+ ufw-0.36-move-path.patch
+
+ ufw.initd
+ ufw.confd
+ "
+
+build() {
+ python3 setup.py build
+}
+
+package() {
+ python3 setup.py install --root="$pkgdir"
+ gzip "$pkgdir"/usr/share/man/man8/ufw.8
+ gzip "$pkgdir"/usr/share/man/man8/ufw-framework.8
+ install -D -m755 "$srcdir"/ufw.initd \
+ "$pkgdir"/etc/init.d/ufw
+ install -D -m644 "$srcdir"/ufw.confd \
+ "$pkgdir"/etc/conf.d/ufw
+}
+
+sha512sums="b32d7f79f43c203149c48b090ee0d063df78fcf654344ee11066a7363e799a62b046758ffe02b8bd15121545ac2a6b61df21fe56f8b810319fe4dd562cbdadb3 ufw-0.36.tar.gz
+11a9cf4906fa0bd677e745615b3c4d663512a1d05f9c21149d09624237a88938b9ed83b8ca876dbcf9bbac41a4bf7155eba76ec32778e025f013e1ffb07e4abb ufw-0.36-bash-completion.patch
+228ed40f800b8ed4bbc217df9478c1c0be5eb1ec154abd2d3a3cd6c92902632f07ef70c3ca3f2478bfe501735a0f6f0b7fa8d8f4991fdaead4332e4c65bad0c9 ufw-0.36-move-path.patch
+f6cb7f6f7713d6f2c78c0b0254f385701f28b997931007997f0702af0dcd0d1b1bf08617dbb3abd21219c23a63ec3286e019896253ff7e9bdbb218a5bb17dd80 ufw.initd
+a010532c97b9cf83f1fb5fa707228e0542a8b109c76e5942aaf2d6552c63e033d32e39e5a6ac87cb9e2ed4c3fdbc5d03c75127e6378665e592b143bc1eda52c7 ufw.confd"
diff --git a/user/ufw/ufw-0.36-bash-completion.patch b/user/ufw/ufw-0.36-bash-completion.patch
new file mode 100644
index 000000000..927af244e
--- /dev/null
+++ b/user/ufw/ufw-0.36-bash-completion.patch
@@ -0,0 +1,16 @@
+--- a/shell-completion/bash 2018-12-14 21:25:55.000000000 +0300
++++ b/shell-completion/bash 2019-03-21 01:26:46.152181981 +0300
+@@ -57,7 +57,6 @@
+ echo "numbered verbose"
+ }
+
+-_have ufw &&
+ _ufw()
+ {
+ cur=${COMP_WORDS[COMP_CWORD]}
+@@ -91,4 +90,4 @@
+ fi
+ }
+
+-_have ufw && complete -F _ufw ufw
++complete -F _ufw ufw
diff --git a/user/ufw/ufw-0.36-move-path.patch b/user/ufw/ufw-0.36-move-path.patch
new file mode 100644
index 000000000..1ba9d117b
--- /dev/null
+++ b/user/ufw/ufw-0.36-move-path.patch
@@ -0,0 +1,174 @@
+--- a/doc/ufw-framework.8 2018-12-14 21:25:55.000000000 +0300
++++ b/doc/ufw-framework.8 2019-03-21 00:12:37.852104313 +0300
+@@ -18,7 +18,7 @@
+ parameters and configuration of IPv6. The framework consists of the following
+ files:
+ .TP
+-#STATE_PREFIX#/ufw\-init
++#SHARE_DIR#/ufw\-init
+ initialization script
+ .TP
+ #CONFIG_PREFIX#/ufw/before.init
+@@ -47,7 +47,7 @@
+
+ .SH "BOOT INITIALIZATION"
+ .PP
+-\fBufw\fR is started on boot with #STATE_PREFIX#/ufw\-init. This script is a
++\fBufw\fR is started on boot with #SHARE_DIR#/ufw\-init. This script is a
+ standard SysV style initscript used by the \fBufw\fR command and should not be
+ modified. The #CONFIG_PREFIX#/before.init and #CONFIG_PREFIX#/after.init
+ scripts may be used to perform any additional firewall configuration that is
+--- a/README 2018-07-24 16:42:38.000000000 +0300
++++ b/README 2019-03-21 00:18:18.253205303 +0300
+@@ -60,7 +60,7 @@
+ on your needs, this can be as simple as adding the following to a startup
+ script (eg rc.local for systems that use it):
+
+-# /lib/ufw/ufw-init start
++# /usr/share/ufw/ufw-init start
+
+ For systems that use SysV initscripts, an example script is provided in
+ doc/initscript.example. See doc/upstart.example for an Upstart example and
+@@ -74,10 +74,9 @@
+ /etc/defaults/ufw high level configuration
+ /etc/ufw/before[6].rules rules evaluated before UI added rules
+ /etc/ufw/after[6].rules rules evaluated after UI added rules
+-/lib/ufw/user[6].rules UI added rules (not to be modified)
++/etc/ufw/user/user[6].rules UI added rules (not to be modified)
+ /etc/ufw/sysctl.conf kernel network tunables
+-/lib/ufw/ufw-init start script
+-
++/usr/share/ufw/ufw-init start script
+
+ Usage
+ -----
+@@ -152,7 +151,7 @@
+ that the primary chains don't move around other non-ufw rules and chains. To
+ completely flush the built-in chains with this configuration, you can use:
+
+-# /lib/ufw/ufw-init flush-all
++# /usr/share/ufw/ufw-init flush-all
+
+ Alternately, ufw may also take full control of the firewall by setting
+ MANAGE_BUILTINS=yes in /etc/defaults/ufw. This will flush all the built-in
+@@ -260,7 +259,7 @@
+
+ Remote Management
+ -----------------
+-On /lib/ufw/ufw-init start and 'ufw enable' the chains are flushed, so
++On /usr/share/ufw/ufw-init start and 'ufw enable' the chains are flushed, so
+ ssh may drop. This is needed so ufw is in a consistent state. Once the ufw is
+ 'enabled' it will insert rules into the existing chains, and therefore not
+ flush the chains (but will when modifying a rule or changing the default
+@@ -303,7 +302,7 @@
+
+ Distributions
+ -------------
+-While it certainly ok to use /lib/ufw/ufw-init as the initscript for
++While it certainly ok to use /usr/share/ufw/ufw-init as the initscript for
+ ufw, this script is meant to be used by ufw itself, and therefore not
+ particularly user friendly. See doc/initscript.example for a simple
+ implementation that can be adapted to your distribution.
+--- a/setup.py 2018-12-14 21:25:55.000000000 +0300
++++ b/setup.py 2019-03-21 00:44:49.603002503 +0300
+@@ -55,7 +55,7 @@
+ return
+
+ real_confdir = os.path.join('/etc')
+- real_statedir = os.path.join('/lib', 'ufw')
++ real_statedir = os.path.join('/etc', 'ufw', 'user')
+ real_prefix = self.prefix
+ if self.home != None:
+ real_confdir = self.home + real_confdir
+@@ -132,14 +132,20 @@
+ self.copy_file('doc/ufw.8', manpage)
+ self.copy_file('doc/ufw-framework.8', manpage_f)
+
+- # Install state files and helper scripts
++ # Install state files
+ statedir = real_statedir
+ if self.root != None:
+ statedir = self.root + real_statedir
+ self.mkpath(statedir)
+
+- init_helper = os.path.join(statedir, 'ufw-init')
+- init_helper_functions = os.path.join(statedir, 'ufw-init-functions')
++ # Install helper scripts
++ sharedir = real_sharedir
++ if self.root != None:
++ sharedir = self.root + real_sharedir
++ self.mkpath(sharedir)
++
++ init_helper = os.path.join(sharedir, 'ufw-init')
++ init_helper_functions = os.path.join(sharedir, 'ufw-init-functions')
+ self.copy_file('src/ufw-init', init_helper)
+ self.copy_file('src/ufw-init-functions', init_helper_functions)
+
+@@ -220,14 +226,19 @@
+ f])
+
+ subprocess.call(["sed",
++ "-i",
++ "s%#SHARE_DIR#%" + real_sharedir + "%g",
++ f])
++
++ subprocess.call(["sed",
+ "-i",
+ "s%#VERSION#%" + ufw_version + "%g",
+ f])
+
+ # Install pristine copies of rules files
+- sharedir = real_sharedir
+- if self.root != None:
+- sharedir = self.root + real_sharedir
++ #sharedir = real_sharedir
++ #if self.root != None:
++ # sharedir = self.root + real_sharedir
+ rulesdir = os.path.join(sharedir, 'iptables')
+ self.mkpath(rulesdir)
+ for f in [ before_rules, after_rules, \
+--- a/src/backend_iptables.py 2018-12-14 21:25:55.000000000 +0300
++++ b/src/backend_iptables.py 2019-03-21 00:52:10.416829220 +0300
+@@ -38,6 +38,7 @@
+ files = {}
+ config_dir = _findpath(ufw.common.config_dir, datadir)
+ state_dir = _findpath(ufw.common.state_dir, datadir)
++ share_dir = _findpath(ufw.common.share_dir, datadir)
+
+ files['rules'] = os.path.join(config_dir, 'ufw/user.rules')
+ files['before_rules'] = os.path.join(config_dir, 'ufw/before.rules')
+@@ -45,7 +46,7 @@
+ files['rules6'] = os.path.join(config_dir, 'ufw/user6.rules')
+ files['before6_rules'] = os.path.join(config_dir, 'ufw/before6.rules')
+ files['after6_rules'] = os.path.join(config_dir, 'ufw/after6.rules')
+- files['init'] = os.path.join(state_dir, 'ufw-init')
++ files['init'] = os.path.join(share_dir, 'ufw-init')
+
+ ufw.backend.UFWBackend.__init__(self, "iptables", dryrun, files,
+ rootdir=rootdir, datadir=datadir)
+--- a/src/ufw-init 2018-03-30 22:45:52.000000000 +0300
++++ b/src/ufw-init 2019-03-21 01:06:32.720483789 +0300
+@@ -31,10 +31,11 @@
+ fi
+ export DATA_DIR="$datadir"
+
+-if [ -s "${rootdir}#STATE_PREFIX#/ufw-init-functions" ]; then
+- . "${rootdir}#STATE_PREFIX#/ufw-init-functions"
++if [ -s "${rootdir}#SHARE_DIR#/ufw-init-functions" ]; then
++ . "${rootdir}#SHARE_DIR#/ufw-init-functions"
++
+ else
+- echo "Could not find ${rootdir}#STATE_PREFIX#/ufw-init-functions (aborting)"
++ echo "Could not find ${rootdir}#SHARE_DIR#/ufw-init-functions (aborting)"
+ exit 1
+ fi
+
+@@ -83,7 +84,7 @@
+ fi
+ ;;
+ *)
+- echo "Usage: #STATE_PREFIX#/ufw-init {start|stop|restart|force-reload|force-stop|flush-all|status}"
++ echo "Usage: #SHARE_DIR#/ufw-init {start|stop|restart|force-reload|force-stop|flush-all|status}"
+ exit 1
+ ;;
+ esac
diff --git a/user/ufw/ufw.confd b/user/ufw/ufw.confd
new file mode 100644
index 000000000..900d3bf67
--- /dev/null
+++ b/user/ufw/ufw.confd
@@ -0,0 +1,5 @@
+# If equals to "yes", warnings that firewall is disabled
+# (using `ufw disable') will be suppressed and the service
+# will be considered started.
+# Default if unset or another value is "no".
+ufw_nonfatal_if_disabled=no
diff --git a/user/ufw/ufw.initd b/user/ufw/ufw.initd
new file mode 100644
index 000000000..bccd83ddb
--- /dev/null
+++ b/user/ufw/ufw.initd
@@ -0,0 +1,136 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+depend() {
+ before net
+ provide firewall
+}
+
+start() {
+ ebegin "Starting ufw"
+ _source_file || { eend $?; return $?; }
+
+ local enabled_in_cfg ret
+ _check_if_enabled_in_cfg
+ enabled_in_cfg=$?
+
+ # Avoid "Firewall already started, use 'force-reload'" message that
+ # appears if `ufw enable' had been run before start().
+ if _status_quiet; then
+ eend 0
+ return
+ fi
+
+ # The ufw_start function does the same: if ufw is disabled using `ufw disable',
+ # ufw_start would not start ufw and return 0, so let's handle this case.
+ case $enabled_in_cfg in
+ 0)
+ ufw_start
+ ret=$?
+ eend $ret "Failed to start ufw."
+ ;;
+ 1)
+ # see /etc/conf.d/<name>
+ if [ "${ufw_nonfatal_if_disabled:-no}" != "yes" ]; then
+ ret=1
+ eend $ret "Not starting firewall (not enabled), use \"ufw enable\" first."
+ else
+ ret=0
+ eend 0
+ fi
+ ;;
+ 2)
+ ret=1
+ eend $ret "Failed to start ufw."
+ ;;
+ esac
+
+ return $ret
+}
+
+stop() {
+ ebegin "Stopping ufw"
+ _source_file || { eend $?; return $?; }
+ local enabled_in_cfg ret
+ _check_if_enabled_in_cfg
+ enabled_in_cfg=$?
+
+ # Same as above (unless --force is passed to ufw_stop).
+ case $enabled_in_cfg in
+ 0)
+ ufw_stop
+ ret=$?
+ ;;
+ 1)
+ einfo "INFO: ufw is configured to be disabled"
+ ufw_stop --force
+ ret=$?
+ ;;
+ 2)
+ ret=1
+ ;;
+ esac
+
+ eend $ret "Failed to stop ufw."
+ return $ret
+}
+
+_status_quiet() {
+ # return values: 0 - started, 1 - stopped, 2 - error
+ # Does not execute _source_file.
+ local ret
+ ufw_status > /dev/null
+ ret=$?
+ # Return values for ufw_status come from /usr/share/ufw/ufw-init-functions.
+ case $ret in
+ 0) return 0 ;;
+ 3) return 1 ;;
+ *) return 2 ;;
+ esac
+}
+
+_source_file() {
+ local sourced_f="/usr/share/ufw/ufw-init-functions"
+ if [ ! -f "$sourced_f" ]; then
+ eerror "Cannot find file $sourced_f!"
+ return 1
+ fi
+
+ local _path=$PATH
+ if ! . "$sourced_f"; then
+ # PATH can be broken here, fix it...
+ PATH=$_path
+ eerror "Error sourcing file $sourced_f"
+ return 1
+ fi
+
+ if [ -z "$PATH" ]; then
+ PATH=$_path
+ else
+ PATH="${PATH}:${_path}"
+ fi
+ return 0
+}
+
+_check_if_enabled_in_cfg() {
+ # Check if user has enabled the firewall with "ufw enable".
+ # Return 0 if firewall enabled in configuration file, 1 otherwise, 2 on error.
+
+ local sourced_f="/etc/ufw/ufw.conf"
+ if [ ! -f "$sourced_f" ]; then
+ eerror "Cannot find file $sourced_f!"
+ return 2
+ fi
+
+ if ! . "$sourced_f"; then
+ eerror "Error sourcing file $sourced_f"
+ return 2
+ fi
+
+ if [ "$ENABLED" = "yes" ] || [ "$ENABLED" = "YES" ]; then
+ return 0
+ else
+ return 1
+ fi
+}
diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD
index 67f2fa698..5e7f26ddc 100644
--- a/user/umbrello/APKBUILD
+++ b/user/umbrello/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=umbrello
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Software modelling tool and code generator"
url="https://umbrello.kde.org/"
@@ -14,12 +14,11 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev
kcrash-dev kdoctools-dev kiconthemes-dev kdelibs4support-dev kio-dev
ktexteditor-dev kwindowsystem-dev kwidgetsaddons-dev kxmlgui-dev"
subpackages="$pkgname-doc $pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/umbrello-$pkgver.tar.xz
+source="https://download.kde.org/stable/release-service/$pkgver/src/umbrello-$pkgver.tar.xz
hax.patch
"
build() {
- cd "$builddir"
if [ "$CBUILD" != "$CHOST" ]; then
CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
fi
@@ -30,19 +29,17 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
check() {
- cd "$builddir"
CTEST_OUTPUT_ON_FAILURE=TRUE ctest
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="a251d6e65cb0b177fee88cadaea1cc9105ac5a0b0b8ab09b31a279c4e473fdeea3acf9a7b54b66178b4d77460bc1406caf4bb03844f8c57f46175bff6c587525 umbrello-19.08.2.tar.xz
+sha512sums="230552328e4f9f2ee05c76e1995781a436ed7637d8a9c397080e6b51694524d7396a565d620ea79c8387c857a18d5817a8bd2b6ff0be3a7004d69710096e2c23 umbrello-19.12.1.tar.xz
fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch"
diff --git a/user/umbrello/assertion-fix.patch b/user/umbrello/assertion-fix.patch
deleted file mode 100644
index ef86e6546..000000000
--- a/user/umbrello/assertion-fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From af72e059f728d70e43ac3ea03653865585818e66 Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Fri, 2 Nov 2018 11:38:37 +0100
-Subject: Fix 'Umbrello fails to start due to ASSERT failure in QVector<T>::at
- "index out of range"'
-
-The backtrace shows that Qt wants to access tree view items that
-have already been deleted. To avoid this, graphical updates are
-disabled when creating the new document.
-
-BUG:400501
-FIXED-IN:2.26.3 (KDE Applications 18.08.3)
----
- umbrello/umldoc.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/umbrello/umldoc.cpp b/umbrello/umldoc.cpp
-index d4099bb..af5c889 100644
---- a/umbrello/umldoc.cpp
-+++ b/umbrello/umldoc.cpp
-@@ -442,6 +442,9 @@ void UMLDoc::closeDocument()
- */
- bool UMLDoc::newDocument()
- {
-+ bool state = UMLApp::app()->document()->loading();
-+ UMLApp::app()->document()->setLoading(false);
-+
- closeDocument();
- UMLApp::app()->setCurrentView(0);
- setUrlUntitled();
-@@ -465,6 +468,7 @@ bool UMLDoc::newDocument()
- UMLApp::app()->enableUndoAction(false);
- UMLApp::app()->clearUndoStack();
-
-+ UMLApp::app()->document()->setLoading(state);
- return true;
- }
-
---
-cgit v0.11.2
-
diff --git a/user/unicode-data/APKBUILD b/user/unicode-data/APKBUILD
index 310ed9347..799b9fd2c 100644
--- a/user/unicode-data/APKBUILD
+++ b/user/unicode-data/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=unicode-data
pkgver=12.1.0
pkgrel=0
@@ -19,20 +19,19 @@ source="https://unicode.org/Public/$pkgver/ucd/Blocks.txt
"
package() {
- cd "$srcdir"
mkdir -p "$pkgdir"/usr/share/unicode/$pkgver
install -m644 -t "$pkgdir"/usr/share/unicode/$pkgver \
- Blocks.txt \
- DerivedAge.txt \
- NamesList.txt \
- Scripts.txt \
- UnicodeData.txt \
- Unihan.zip
+ "$srcdir"/Blocks.txt \
+ "$srcdir"/DerivedAge.txt \
+ "$srcdir"/NamesList.txt \
+ "$srcdir"/Scripts.txt \
+ "$srcdir"/UnicodeData.txt \
+ "$srcdir"/Unihan.zip
}
-sha512sums="e3ead1233c29a13d46ffcc4b1c8b685144444579fb9231189f2724d9161adcdba39e9dd468c2d791af32538aa6d3f39f1e3f19c6d73eab432ac006526dc6c3ae Blocks.txt
-2cfe840bd5c72a7a47a15123e936cf96677ad66e2caecb7f580b98de83054a17cf49cd26b6470084979bdb3cf8818ea9799dab220108b7bf3a813f65bb1ed86e DerivedAge.txt
-de087e89be129928de87ebb9370f95ab9964c491a41f306791884c6d0452407b8530b7d47804cb3f0442e29d4c98d84867c82c90b46f3fbc1a7ee3fb6ce97005 NamesList.txt
-d25c87b58df3096d1dc26a81edc01eb1d08c62510b38854683ca91978a2a4df12ca0b29731c8d0211555387da604b5e8da7d5f5a5f9d57052f1bc502ecd2154e Scripts.txt
-be1844662041d022c57c2f81b971d395a0ba3a5824de4a5c1c8076ed66955f590a9d624d8abc189a66b7d35ba7fa7d63be727e8bdd9c3dff01251a34f2b84729 UnicodeData.txt
+sha512sums="2cd8a92ec3feabd77ddd48f7553287c057b9ff968244a91a29754837fe4e02175a0fd9d848bdab946fc44bd249442fe5862bb892d0e714ee3dadd571f1f7b77c Blocks.txt
+999db016b6a0bc3628cbdff22f027019f88f00383eff77a6ee0a1eeb92ddc29a30a2c9ab0568f22b412e11598b5953d3d91bd5dadea457d1721b9bf79f637264 DerivedAge.txt
+feed2bc6c95042c480ddca92ad2515277314e1937a15603f8a3e816e021adad0662e1fe0d5149d7dbb14f54b13ef9bf433a0306dd63daf7c2fc0907ba4ae4bbd NamesList.txt
+17678d900ac545641c214436b36489962be3566d355e2fe08ac30be5759bf68851e34c44100bf3d5dc72833a9a679745829c7772f48a59786cbd87973acfd4ef Scripts.txt
+09be79ddcc2e019584522635f7c134bcd0ca50baf3517b6eb8ef76e5ce8109a6a8b20f3af593e7e8ab94e5bec1b98ebf43d79de53890d6bac3f33b9abb0e35c6 UnicodeData.txt
7fdefad078284c14a9105655d1cb4d2b0dc1c89c56effe92ffcbd5a30b325559a56d97574b6077144d7a4ed02df6e6a402a2a5360e4abc0c84bae5c589044375 Unihan.zip"
diff --git a/user/unittest-cpp/APKBUILD b/user/unittest-cpp/APKBUILD
index 62a54662c..647b16973 100644
--- a/user/unittest-cpp/APKBUILD
+++ b/user/unittest-cpp/APKBUILD
@@ -8,12 +8,12 @@ url=" "
arch="all"
license="MIT"
depends=""
-makedepends=""
+makedepends="bash"
subpackages="$pkgname-dev"
source="https://github.com/unittest-cpp/unittest-cpp/releases/download/v$pkgver/unittest-cpp-$pkgver.tar.gz"
build() {
- ./configure \
+ bash ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
diff --git a/user/uptimed/APKBUILD b/user/uptimed/APKBUILD
index e92be5366..22e1b57c6 100644
--- a/user/uptimed/APKBUILD
+++ b/user/uptimed/APKBUILD
@@ -1,21 +1,22 @@
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=uptimed
pkgver=0.4.2
pkgrel=0
-pkgdesc='System uptime record daemon'
+pkgdesc="System uptime record daemon"
arch="all"
-options="!check" # No tests
+options="!check" # No test suite.
url="https://github.com/rpodgorny/uptimed"
license="GPL-2.0-only"
-subpackages="$pkgname-doc $pkgname-openrc"
+depends=""
makedepends="autoconf automake libtool"
+subpackages="$pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/rpodgorny/uptimed/archive/v$pkgver.tar.gz
- uptimed.init"
+ uptimed.init
+ "
build() {
- cd "$builddir"
autoreconf -vif
./configure \
--build=$CBUILD \
@@ -27,7 +28,6 @@ build() {
}
package() {
- cd "$builddir"
make install DESTDIR="$pkgdir"
mv "$pkgdir"/etc/uptimed.conf-dist \
"$pkgdir"/etc/uptimed.conf
diff --git a/user/urw-base35-fonts/APKBUILD b/user/urw-base35-fonts/APKBUILD
index f15189502..3d1388740 100644
--- a/user/urw-base35-fonts/APKBUILD
+++ b/user/urw-base35-fonts/APKBUILD
@@ -10,11 +10,10 @@ options="!check" # No tests provided.
license="AGPL-3.0-only WITH font-exception"
depends=""
makedepends=""
+subpackages=""
source="urw-base35-fonts-$pkgver.tar.gz::https://github.com/ArtifexSoftware/urw-base35-fonts/archive/$pkgver.tar.gz"
package() {
- local _fconf
-
mkdir -p "$pkgdir"/usr/share/fonts/ttf-urw-base35
cp -a "$builddir"/fonts/*.otf "$pkgdir"/usr/share/fonts/ttf-urw-base35/
diff --git a/user/usbredir/APKBUILD b/user/usbredir/APKBUILD
index ef23e2697..51b5da16c 100644
--- a/user/usbredir/APKBUILD
+++ b/user/usbredir/APKBUILD
@@ -7,12 +7,12 @@ url="https://www.spice-space.org/usbredir.html"
arch="all"
options="!check" # No test suite.
license="GPL-2.0-or-later AND LGPL-2.1-or-later"
+depends=""
makedepends="libusb-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-server"
source="https://www.spice-space.org/download/usbredir/usbredir-$pkgver.tar.bz2 "
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +26,10 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
check() {
- cd "$builddir"
make check
}
diff --git a/user/usbutils/APKBUILD b/user/usbutils/APKBUILD
index 69a6b1618..71386fa2b 100644
--- a/user/usbutils/APKBUILD
+++ b/user/usbutils/APKBUILD
@@ -6,9 +6,9 @@ pkgdesc="USB utilities"
url="http://linux-usb.sourceforge.net/"
arch="all"
license="GPL-2.0+ AND GPL-2.0-only"
-subpackages="$pkgname-doc"
depends="hwids-udev"
-makedepends="autoconf automake eudev-dev libusb-dev"
+makedepends="autoconf automake eudev-dev libtool libusb-dev"
+subpackages="$pkgname-doc"
source="https://mirrors.kernel.org/pub/linux/utils/usb/usbutils/$pkgname-$pkgver.tar.xz
hwdata.patch
"
diff --git a/user/user-manager/APKBUILD b/user/user-manager/APKBUILD
index cddcb2960..e17b47f01 100644
--- a/user/user-manager/APKBUILD
+++ b/user/user-manager/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox-kde@adelielinux.org>
pkgname=user-manager
-pkgver=5.12.8
+pkgver=5.17.90
pkgrel=0
pkgdesc="Manage user accounts from KDE"
url="https://www.KDE.org/"
@@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev kauth-dev kcmutils-dev
kconfig-dev kconfigwidgets-dev kcoreaddons-dev ki18n-dev kiconthemes-dev
kio-dev kwidgetsaddons-dev libpwquality-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/plasma/$pkgver/user-manager-$pkgver.tar.xz"
+source="https://download.kde.org/unstable/plasma/$pkgver/user-manager-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -25,7 +25,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -37,4 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="2dd6ce318bede7fea7e80e54e1f9432b0dfa5e99e34def28d91c99230de175a9d84acf6c3a4b0c27fb311a34ddd3d98b0d7dbf3cbacd0e030c880b853279430d user-manager-5.12.8.tar.xz"
+sha512sums="c22259a978fa377a87770002463962dc18ae4dc61696671d75bde878280baa9da24f65f416714509fb4275a44d47b9b445e7e9cb59172aa546407f1b954b40dc user-manager-5.17.90.tar.xz"
diff --git a/user/utf8proc/APKBUILD b/user/utf8proc/APKBUILD
index 4b8d6ac3a..459901e02 100644
--- a/user/utf8proc/APKBUILD
+++ b/user/utf8proc/APKBUILD
@@ -8,7 +8,7 @@ url="http://juliastrings.github.io/utf8proc"
arch="all"
license="MIT AND Unicode-DFS-2016"
depends=""
-makedepends=""
+makedepends="cmake"
subpackages="$pkgname-dev"
source="$pkgname-$pkgver.tar.gz::https://github.com/JuliaStrings/utf8proc/archive/v$pkgver.tar.gz
https://dev.sick.bike/dist/$pkgname-testdata-$pkgver.tar.gz"
diff --git a/user/v4l-utils/APKBUILD b/user/v4l-utils/APKBUILD
index 0cc0932ed..2c6857f78 100644
--- a/user/v4l-utils/APKBUILD
+++ b/user/v4l-utils/APKBUILD
@@ -15,6 +15,7 @@ source="https://www.linuxtv.org/downloads/v4l-utils/$pkgname-$pkgver.tar.bz2
qv4l2.svg
qv4l2.desktop
getsubopt.patch
+ time64.patch
types.patch
"
@@ -79,4 +80,5 @@ sha512sums="749c804671f039d907bf782cba5d1c23fff48066f3b6d4a0249fb9b65c493ee3945b
bc18280046c15b19984103f7c2bb44a0aea79715803c64f0c64bc932499c09022c956914c3b15ae59499adc09f6fbff5378be45707fe851250f495a26b63d682 qv4l2.svg
6f74aa524b3de420eeb8de788ff3f717020732a3f1f6530caee50e63aae7eddbe5f551ffc50065c9f5d6078c13bace089948ecdcacf01f8b82c1a44960e06315 qv4l2.desktop
a09554deebd7597355c688e52180e0f4030842ccb26a144d1ac8a426836374237725d7b6b555027ca72e10c11e37bd596c7d69d87ee2f6b6d951daf4e50137f8 getsubopt.patch
+16154d57ea0b2e231217894495ef4ecf55d45e97c936034d4bbb0dab88f2d3e8779073302fbba759bd60e124a2cefe2b83675952cd50c413d957c81c9b0b8b53 time64.patch
ee1228cc06e399923953e5121a683347a7fe881c80c55faae0adf6ed836251da1b2c4d1561454daa6f42220c1171f827ca3e2b72cdac31b379495f23ff6c56bb types.patch"
diff --git a/user/v4l-utils/time64.patch b/user/v4l-utils/time64.patch
new file mode 100644
index 000000000..42092a773
--- /dev/null
+++ b/user/v4l-utils/time64.patch
@@ -0,0 +1,11 @@
+--- v4l-utils-1.18.0/utils/keytable/keytable.c.old 2019-09-22 09:22:54.000000000 +0000
++++ v4l-utils-1.18.0/utils/keytable/keytable.c 2020-01-20 02:38:23.659004998 +0000
+@@ -1533,7 +1533,7 @@
+
+ for (i = 0; i < rd / sizeof(struct input_event); i++) {
+ printf(_("%ld.%06ld: event type %s(0x%02x)"),
+- ev[i].time.tv_sec, ev[i].time.tv_usec,
++ ev[i].input_event_sec, ev[i].input_event_usec,
+ get_event_name(events_type, ev[i].type), ev[i].type);
+
+ switch (ev[i].type) {
diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD
index 5cc2cae14..a6fc4b9a8 100644
--- a/user/vala/APKBUILD
+++ b/user/vala/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=vala
pkgver=0.46.4
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Compiler for the Vala programming language"
url="https://wiki.gnome.org/Projects/Vala"
arch="all"
license="LGPL-2.1+"
+depends=""
makedepends="glib-dev flex byacc graphviz-dev"
subpackages="$pkgname-dev $pkgname-doc"
source="https://download.gnome.org/sources/vala/${pkgver%.*}/vala-$pkgver.tar.xz"
diff --git a/user/valgrind/APKBUILD b/user/valgrind/APKBUILD
index f676d18e8..4bcc705b9 100644
--- a/user/valgrind/APKBUILD
+++ b/user/valgrind/APKBUILD
@@ -5,14 +5,15 @@ pkgrel=0
pkgdesc="A tool to help find memory-management problems in programs"
url="http://valgrind.org/"
arch="all"
-license="GPL-2.0+"
-makedepends="autoconf automake libtool bash perl cmd:which"
# from README_PACKAGERS:
# Don't strip the debug info off lib/valgrind/$platform/vgpreload*.so
# in the installation tree. Either Valgrind won't work at all, or it
# will still work if you do, but will generate less helpful error
# messages.
options="!strip !check"
+license="GPL-2.0+"
+depends=""
+makedepends="autoconf automake libtool bash perl cmd:which"
subpackages="$pkgname-dev $pkgname-doc"
source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2
0001-Ensure-ELFv2-is-supported-on-PPC64.patch
@@ -24,13 +25,11 @@ source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2
prepare() {
default_prepare
- cd "$builddir"
aclocal && autoconf && automake --add-missing
echo '#include <linux/a.out.h>' > include/a.out.h
}
build() {
- cd "$builddir"
# fails to build with ccache
export CC="gcc"
export CFLAGS="$CFLAGS -fno-stack-protector -no-pie"
@@ -47,12 +46,10 @@ build() {
}
check() {
- cd "$buildir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
# we have options=!strip above so we strip the /usr/bin/* manually
diff --git a/user/vamp-sdk/APKBUILD b/user/vamp-sdk/APKBUILD
index b97a8c2df..bfeee2132 100644
--- a/user/vamp-sdk/APKBUILD
+++ b/user/vamp-sdk/APKBUILD
@@ -1,21 +1,20 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=vamp-sdk
pkgver=2.7.1
pkgrel=0
pkgdesc="SDK for developing Vamp audio analysis plugins"
url="https://vamp-plugins.org/develop.html"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="BSD-3-Clause AND MIT"
+depends=""
makedepends="libsndfile-dev"
subpackages="$pkgname-dev"
source="https://code.soundsoftware.ac.uk/attachments/download/2206/vamp-plugin-sdk-$pkgver.tar.gz"
-sha512sums="91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 vamp-plugin-sdk-2.7.1.tar.gz"
builddir="$srcdir/vamp-plugin-sdk-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,7 +26,7 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
+sha512sums="91dd7cae72334718dcbdac06b1ffa3f3ba76e977b82b928ab634d9982aa15ca4e30978a7778215753c61e56831077d7634d24e65e468ab6a8a87a5957fb09bf3 vamp-plugin-sdk-2.7.1.tar.gz"
diff --git a/user/vde2/APKBUILD b/user/vde2/APKBUILD
index b89403bcc..b9a93beb4 100644
--- a/user/vde2/APKBUILD
+++ b/user/vde2/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer:
pkgname=vde2
pkgver=2.3.2
-pkgrel=10
+pkgrel=11
pkgdesc="Virtual Distributed Ethernet - User mode networking for QEMU et al"
url="http://vde.sourceforge.net/"
arch="all"
@@ -14,6 +14,7 @@ install="vde2.pre-install"
source="http://downloads.sourceforge.net/project/vde/vde2/$pkgver/vde2-$pkgver.tar.gz
gcc8.patch
musl-build-fix.patch
+ openssl11.patch
vde2.pre-up
vde2.post-down
"
@@ -52,5 +53,6 @@ libs() {
sha512sums="b502ceac8eebd30694a25d913c1d321b58ec8ae97dec0b09acc40455f7a97c05040ff395242c144580a9d9d5cb19292055bc94133ea1bde66bfdab40844533a8 vde2-2.3.2.tar.gz
abf09ff1f96998b48225dd0b0bb69b72c3c2cbaa3faa96048977083f0a8c72b16f052a71da22c6fb0712dbad531c5fda6f6e5abeea41c8f33edba2bf5a702dc3 gcc8.patch
52d02c3a5a4f5526ed2e653e5720f012501215c0440e26105c585ea0501423da04047f6bad13a71b7378397a9d9274b191007d839876b675e206ed5be0f25372 musl-build-fix.patch
+e24f7728030c1bc89b885c58ecf443d0f7297f6c9f73d87fa37092a691dfac191e65fb07a11ed44b718bbd18011fdb4e034f66ef63a8fbb06dfb06fd51c3826a openssl11.patch
71b29d538bba80b881f239d683215279089c14e8feec05bf27c159ead51094cdfb168281900fa4527f588c624e8f7687df8d3f79377e07d13ad64de613177df3 vde2.pre-up
d1cf18146145dbe608842c694b05d2906e36553b0ba3fa1ec2e53dbf06027b9e4937ea61aee77c1ccbb73b818f19d55787051eb6d5b09a38c7d18a1dad629190 vde2.post-down"
diff --git a/user/vde2/openssl11.patch b/user/vde2/openssl11.patch
new file mode 100644
index 000000000..227312eab
--- /dev/null
+++ b/user/vde2/openssl11.patch
@@ -0,0 +1,92 @@
+--- a/src/vde_cryptcab/cryptcab.c 2011-11-23 16:41:17.000000000 +0000
++++ b/src/vde_cryptcab/cryptcab.c 2017-03-20 22:54:20.452975075 +0000
+@@ -22,7 +22,7 @@
+ exit(1);
+ }
+
+-static EVP_CIPHER_CTX ctx;
++static EVP_CIPHER_CTX *ctx;
+ static int ctx_initialized = 0;
+ static int encryption_disabled = 0;
+ static int nfd;
+@@ -30,6 +30,10 @@
+ static struct vde_open_args open_args={.port=0,.group=NULL,.mode=0700};
+ static int verbose = 0;
+
++#if OPENSSL_VERSION_NUMBER < 0x10100000
++#define EVP_CIPHER_CTX_reset(x) EVP_CIPHER_CTX_cleanup(x)
++#endif
++
+ void vc_printlog(int priority, const char *format, ...)
+ {
+ va_list arg;
+@@ -103,19 +107,21 @@
+ }
+
+ if (!ctx_initialized) {
+- EVP_CIPHER_CTX_init (&ctx);
++ ctx = EVP_CIPHER_CTX_new ();
++ if (!ctx)
++ return -1;
+ ctx_initialized = 1;
+ }
+
+- EVP_EncryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+- if (EVP_EncryptUpdate (&ctx, dst, &olen, src, len) != 1)
++ EVP_EncryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++ if (EVP_EncryptUpdate (ctx, dst, &olen, src, len) != 1)
+ {
+ fprintf (stderr,"error in encrypt update\n");
+ olen = -1;
+ goto cleanup;
+ }
+
+- if (EVP_EncryptFinal (&ctx, dst + olen, &tlen) != 1)
++ if (EVP_EncryptFinal (ctx, dst + olen, &tlen) != 1)
+ {
+ fprintf (stderr,"error in encrypt final\n");
+ olen = -1;
+@@ -124,7 +130,7 @@
+ olen += tlen;
+
+ cleanup:
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_reset(ctx);
+ return olen;
+ }
+
+@@ -138,19 +144,21 @@
+ }
+
+ if (!ctx_initialized) {
+- EVP_CIPHER_CTX_init (&ctx);
++ ctx = EVP_CIPHER_CTX_new ();
++ if (!ctx)
++ return -1;
+ ctx_initialized = 1;
+ }
+
+- EVP_DecryptInit (&ctx, EVP_bf_cbc (), p->key, p->iv);
+- if (EVP_DecryptUpdate (&ctx, dst, &olen, src, len) != 1)
++ EVP_DecryptInit (ctx, EVP_bf_cbc (), p->key, p->iv);
++ if (EVP_DecryptUpdate (ctx, dst, &olen, src, len) != 1)
+ {
+ fprintf (stderr,"error in decrypt update\n");
+ olen = -1;
+ goto cleanup;
+ }
+
+- if (EVP_DecryptFinal (&ctx, dst + olen, &tlen) != 1)
++ if (EVP_DecryptFinal (ctx, dst + olen, &tlen) != 1)
+ {
+ fprintf (stderr,"error in decrypt final\n");
+ olen = -1;
+@@ -159,7 +167,7 @@
+ olen += tlen;
+
+ cleanup:
+- EVP_CIPHER_CTX_cleanup(&ctx);
++ EVP_CIPHER_CTX_reset (ctx);
+ return olen;
+ }
+
diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD
index 59dce1937..708f7336e 100644
--- a/user/vte/APKBUILD
+++ b/user/vte/APKBUILD
@@ -1,7 +1,7 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=vte
-pkgver=0.58.2
+pkgver=0.58.3
pkgrel=0
pkgdesc="Virtual terminal emulator library for Gnome"
url="https://www.gnome.org"
@@ -27,5 +27,5 @@ package() {
DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="29b1855cd38c5c0b83ab92f3419053bedf3ffb423e6b3e2b7edb960fd425dc7010dbac884c8e1630e1be8b27188e2de65831f8deb83e2781aabe8478349cd7e4 vte-0.58.2.tar.xz
+sha512sums="b0a38eb1cd7d923b0431af943dbdb89932833f9a2b0b8fc1fa9ee728c87418c1f5a424b2ccee661721093a80c569f3b41c721b0ba2302ba0c3a42d4c5e31aa9a vte-0.58.3.tar.xz
4987254439a136f66a7b7be1300f5efbf85db74bdb64fdd8d0c9a555173a172b4fd519174f932e73d58a2618ef37273e82fe681bb129891f2792a414025f6c61 exitcode.patch"
diff --git a/user/w3m/APKBUILD b/user/w3m/APKBUILD
index 45fb1c014..702675358 100644
--- a/user/w3m/APKBUILD
+++ b/user/w3m/APKBUILD
@@ -18,7 +18,6 @@ source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v$_pkgverp.tar.g
builddir="$srcdir/$pkgname-$_pkgverm"
build() {
- cd "$builddir"
LIBS="-lX11 -ltinfo" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,7 +30,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD
index d18e9cf69..ddf80a03a 100644
--- a/user/weechat/APKBUILD
+++ b/user/weechat/APKBUILD
@@ -1,23 +1,24 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: zlg <zlg+adelie@zlg.space>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=weechat
-pkgver=2.6
+pkgver=2.7
pkgrel=0
pkgdesc="Fast, light, extensible ncurses-based chat client"
url="https://www.weechat.org"
arch="all"
options="!check" # requires all plugins be built.
license="GPL-3.0+"
+depends=""
depends_dev="cmake aspell-dev curl-dev gnutls-dev libgcrypt-dev lua5.3-dev
- ncurses-dev perl-dev python3-dev zlib-dev"
-makedepends="$depends_dev"
+ ncurses-dev perl-dev python3-dev ruby-dev tcl-dev zlib-dev guile-dev
+ tk-dev"
checkdepends="cpputest"
+makedepends="$depends_dev asciidoctor"
subpackages="$pkgname-dev $pkgname-spell:_plugin $pkgname-lua:_plugin
- $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-lang"
-source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz
- libintl-fix.patch
- "
+ $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-ruby:_plugin
+ $pkgname-tcl:_plugin $pkgname-guile:_plugin $pkgname-doc"
+source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz"
# secfixes:
# 1.7.1-r0:
@@ -26,7 +27,13 @@ source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz
# - CVE-2017-14727
build() {
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MAN=ON -DENABLE_TESTS=ON -DENABLE_PYTHON3=ON -Bbuild .
+ cmake \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DENABLE_JAVASCRIPT=OFF \
+ -DENABLE_MAN=ON \
+ -DENABLE_NLS=OFF \
+ -DENABLE_PHP=OFF \
+ -Bbuild .
make -C build
}
@@ -52,5 +59,4 @@ _plugin() {
mv "$pkgdir"/$_dir/${_name}.so "$subpkgdir"/$_dir
}
-sha512sums="47698f9b275c4fad68cc786cf0739e6f7355428abf57b94e64df84725b001546783f4e6389d0ed51ff5108c50c48dba344c22da9f43bc6f6f90acedacc3e84a5 weechat-2.6.tar.gz
-59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch"
+sha512sums="7a9205b6a3b7e338b14708e1b9aad4f2099506c46b1e86faf4fa94a105bc20b056a53ce3d003ae31ea1cdbab711ddd9dca7258a7d03f0f7af3703ebdbdfeb3d9 weechat-2.7.tar.gz"
diff --git a/user/weechat/libintl-fix.patch b/user/weechat/libintl-fix.patch
deleted file mode 100644
index a67cb37b6..000000000
--- a/user/weechat/libintl-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-libc gettext is never sufficient on musl
-
---- weechat-1.9/CMakeLists.txt.old 2017-06-25 03:20:52.000000000 -0500
-+++ weechat-1.9/CMakeLists.txt 2017-09-13 02:30:43.577284569 -0500
-@@ -162,6 +162,7 @@
- find_package(Gettext)
- if(GETTEXT_FOUND)
- add_definitions(-DENABLE_NLS)
-+ list(APPEND EXTRA_LIBS intl)
- endif()
- endif()
-
diff --git a/user/wine/APKBUILD b/user/wine/APKBUILD
index ea9384603..87590ebb9 100644
--- a/user/wine/APKBUILD
+++ b/user/wine/APKBUILD
@@ -16,27 +16,25 @@ subpackages="$pkgname-libs $pkgname-dev $pkgname-doc"
depends_dev="$pkgname perl"
makedepends="fontconfig-dev openldap-dev libxslt-dev libxxf86dga-dev
libxcursor-dev libxrandr-dev libxdamage-dev mesa-dev flex-dev bison
- libpng-dev libjpeg-turbo-dev freetype-dev ncurses-dev libressl-dev
+ libpng-dev libjpeg-turbo-dev freetype-dev ncurses-dev openssl-dev
libxcomposite-dev libxrender-dev libxinerama-dev zlib-dev
cups-dev alsa-lib-dev libxml2-dev dbus-dev libxi-dev
gnutls-dev tiff-dev v4l-utils-dev udisks2-dev autoconf automake
openal-soft-dev pulseaudio-dev sane-dev eudev-dev mpg123-dev
- "
+ autoconf automake libtool"
source="http://dl.winehq.org/$pkgname/source/${pkgver%.[1-9]}/$pkgname-$pkgver.tar.xz
+ dlclose.patch
no-pie.patch
+ printer.patch
winhlp32-flex.patch
"
prepare() {
- cd "$builddir"
-
default_prepare
aclocal && autoheader && autoreconf
}
build() {
- cd "$builddir"
-
case "$CARCH" in
x86_64) _win64=--enable-win64;;
esac
@@ -70,13 +68,10 @@ build() {
}
check() {
- cd "$builddir"
make test
}
package() {
- local file
- cd "$builddir"
make -j1 DESTDIR="$pkgdir" install
case "$CARCH" in
@@ -88,21 +83,18 @@ package() {
"$pkgdir"/usr/bin/wineapploader
for file in msiexec notepad regedit regsvr32 wineboot \
- winecfg wineconsole winefile winemine winepath
- do
+ winecfg wineconsole winefile winemine winepath; do
rm "$pkgdir"/usr/bin/$file
ln -sf /usr/bin/wineapploader "$pkgdir"/usr/bin/$file
done
}
dev() {
- local file
default_dev
install -d "$subpkgdir"/usr/bin
for file in widl wmc wrc winebuild winedump function_grep.pl \
- winedbg winemaker winegcc winecpp wineg++
- do
+ winedbg winemaker winegcc winecpp wineg++; do
mv "$pkgdir"/usr/bin/$file "$subpkgdir"/usr/bin/
done
@@ -116,7 +108,6 @@ doc() {
}
libs() {
- local file ext
default_libs
install -d "$subpkgdir"/usr/lib/wine/fakedlls
@@ -131,5 +122,7 @@ libs() {
}
sha512sums="dd240525e389f841123a569fd2f9b8da698b7707bc0de408dfd60ae73c5e24d522abb42b76571c840df52c686fdeae56e0a9c69db2cd31f04cdb345feeacf1dc wine-4.0.1.tar.xz
+7e68ffc953f8858538b03d79b78b53b46e33dc01a474cf2eadaa726ff04918eb8675e80da1c82d2d61b12753f10fd6eda9114c5bc263fe373b6900f174bc246f dlclose.patch
a96b1e248447912ba522067b67fc920063f355f326eaf3fec760c79a1c6e46019fbdcfa8b95b9d389959a7e3d3ab794f9aaf78913ad6a73be32b5d34ca8a2267 no-pie.patch
+05dcc931a3bf5569f0314e3ede9df11a6f2a5806ed9ed66da094f3ee811af316046f177d5190c09007227a455e402b4dc747098fc82cd410574fb241cc5d53ba printer.patch
522a94a31fc459e80ea7dd05f7aee64f6ae666ec05236d06614acde118d5c60002e0f253ae75edb5f02164f22937ca89578504b690d1a5611bd60f703c8f0c00 winhlp32-flex.patch"
diff --git a/user/wine/dlclose.patch b/user/wine/dlclose.patch
new file mode 100644
index 000000000..a9844ff68
--- /dev/null
+++ b/user/wine/dlclose.patch
@@ -0,0 +1,66 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1123,6 +1123,12 @@ then
+
+ dnl *** End of X11/Xlib.h check
+
++ dnl Check for the unload_after_dlclose libc
++ AC_RUN_IFELSE(
++ [AC_LANG_PROGRAM([[#include <dlfcn.h>]], [[dlclose(dlopen("./conftest", 0)); return 0;]])],
++ ac_save_CPPFLAGS="$ac_save_CPPFLAGS -DNO_UNLOAD_AFTER_DLCLOSE",
++ [])
++
+ dnl Check for the presence of OpenGL
+ opengl_msg=""
+ if test "x$with_opengl" != "xno"
+--- a/dlls/ntdll/loader.c
++++ b/dlls/ntdll/loader.c
+@@ -2289,6 +2289,13 @@
+ if (mod->Flags & LDR_WINE_INTERNAL && mod->SectionHandle == handle)
+ {
+ info.wm = CONTAINING_RECORD(mod, WINE_MODREF, ldr);
++#ifdef NO_UNLOAD_AFTER_DLCLOSE
++ if (info.wm->ldr.LoadCount == 0) {
++ RtlEnterCriticalSection( &loader_section );
++ info.wm->ldr.LoadCount = 1;
++ RtlLeaveCriticalSection( &loader_section );
++ }
++#endif
+ TRACE( "Found %s at %p for builtin %s\n",
+ debugstr_w(info.wm->ldr.FullDllName.Buffer), info.wm->ldr.BaseAddress, debugstr_w(path) );
+ break;
+@@ -3199,6 +3199,9 @@
+ * LdrShutdownProcess (NTDLL.@)
+ *
+ */
++#ifdef NO_UNLOAD_AFTER_DLCLOSE
++static void MODULE_FlushModrefs(void);
++#endif
+ void WINAPI LdrShutdownProcess(void)
+ {
+ TRACE("()\n");
+@@ -3194,6 +3203,12 @@
+ TRACE("()\n");
++#ifdef NO_UNLOAD_AFTER_DLCLOSE
++ RtlEnterCriticalSection( &loader_section );
++ process_detach();
++ MODULE_FlushModrefs();
++ RtlLeaveCriticalSection( &loader_section );
++#endif
+ process_detaching = TRUE;
+ process_detach();
+ }
+
+
+@@ -3384,7 +3398,11 @@
+ if ( free_lib_count <= 1 )
+ {
++#ifdef NO_UNLOAD_AFTER_DLCLOSE
++ TRACE("apply no-op dlclose hacks on this platform\n");
++#else
+ process_detach();
+ MODULE_FlushModrefs();
++#endif
+ }
+
+ TRACE("END\n");
diff --git a/user/wine/printer.patch b/user/wine/printer.patch
new file mode 100644
index 000000000..4910e4726
--- /dev/null
+++ b/user/wine/printer.patch
@@ -0,0 +1,13 @@
+ dlls/winspool.drv/info.c | 1 +
+ 1 file changed, 1 insertion(+)
+--- a/dlls/winspool.drv/info.c
++++ a/dlls/winspool.drv/info.c
+@@ -1620,6 +1620,7 @@ void WINSPOOL_LoadSystemPrinters(void)
+ #endif
+
+ /* FIXME: The init code should be moved to spoolsv.exe */
++ SetLastError(0);
+ init_mutex = CreateMutexW( NULL, TRUE, winspool_mutex_name );
+ if (!init_mutex)
+ {
+--
diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD
index 614beff16..4088a7817 100644
--- a/user/wireguard-module/APKBUILD
+++ b/user/wireguard-module/APKBUILD
@@ -1,36 +1,34 @@
# Contributor: Luis Ressel <aranea@aixah.de>
# Maintainer: Luis Ressel <aranea@aixah.de>
-# KEEP THIS IN SYNC with the other wireguard-module packages.
-_kflavour=""
_kver="5.4.5-mc0"
-pkgver=0.0.20191226
+pkgver=0.0.20200121
pkgrel=0
-_pkgname="wireguard-module$_kflavour"
+_pkgname="wireguard-module"
pkgname="$_pkgname-$_kver"
_pkgreal="wireguard-linux-compat"
pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel"
url="https://www.wireguard.com/"
arch="all"
-options="!check !dbg !strip" # no test suite
+options="!check !dbg !strip" # No test suite.
license="GPL-2.0-only"
+depends="easy-kernel-modules-$_kver"
+makedepends="easy-kernel-src-$_kver"
provides="$_pkgname=$pkgver"
-depends="easy-kernel$_kflavour-modules-$_kver"
-makedepends="easy-kernel$_kflavour-src-$_kver"
subpackages="wireguard-patch:_patch:noarch"
source="https://git.zx2c4.com/$_pkgreal/snapshot/$_pkgreal-$pkgver.tar.xz"
builddir="$srcdir/$_pkgreal-$pkgver"
build() {
- make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver$_kflavour" module
+ make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kver" module
}
package() {
if [ -f $HOME/kernel_key.pem ]; then
- /usr/src/linux-$_kver$_kflavour/scripts/sign-file sha512 \
+ /usr/src/linux-$_kver/scripts/sign-file sha512 \
$HOME/kernel_key.pem $HOME/kernel_key.pem \
"$builddir"/src/wireguard.ko
fi
- make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver$_kflavour" INSTALL_MOD_PATH="$pkgdir" module-install
+ make -C src DEPMOD=true KERNELDIR="/usr/src/linux-$_kver" INSTALL_MOD_PATH="$pkgdir" module-install
}
_patch() {
@@ -41,4 +39,4 @@ _patch() {
"$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch"
}
-sha512sums="7eba183128555ca5fd8b171179fe8ec7b9a67c618ad000bc9c5475ff74097e0e2c220a1f1dd82393fbde6dbbba5c1114bfd725e733a5f4acfbb23248538f6afb wireguard-linux-compat-0.0.20191226.tar.xz"
+sha512sums="fde9ef09032ad2e2ce69814d42cc0abb3b353d5aa95debd39122b3eb25324c8e707dd9f298f8ee276575d932b1f1bd559b3430da6b8c0a5057911937ed85c726 wireguard-linux-compat-0.0.20200121.tar.xz"
diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD
index 21875f043..5b41e185c 100644
--- a/user/wireguard-tools/APKBUILD
+++ b/user/wireguard-tools/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Luis Ressel <aranea@aixah.de>
# Maintainer: Luis Ressel <aranea@aixah.de>
pkgname=wireguard-tools
-pkgver=1.0.20191226
+pkgver=1.0.20200121
pkgrel=0
pkgdesc="Userland tools for the WireGuard VPN"
url="https://www.wireguard.com/"
@@ -12,15 +12,12 @@ depends="bash iproute2"
makedepends="libmnl-dev"
subpackages="$pkgname-bash-completion:bashcomp:noarch $pkgname-doc"
source="https://git.zx2c4.com/$pkgname/snapshot/$pkgname-$pkgver.tar.xz"
-builddir="$srcdir/$pkgname-$pkgver"
build() {
- cd "$builddir"
make RUNSTATEDIR=/run -C src
}
package() {
- cd "$builddir"
make WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes DESTDIR="$pkgdir" -C src install
}
@@ -32,4 +29,4 @@ bashcomp() {
mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/"
}
-sha512sums="e6b7fc34f9517efc830b751e054e811acdd7f210e8f68b5ad5a503ee0c081bcb1a65e64e82a0b66ddfea9ef3ea0ca3210d5620c278d1b17442e233be1734ef03 wireguard-tools-1.0.20191226.tar.xz"
+sha512sums="cd22467916c59ab53440e072fee6d0b01f2f9ee06fc3b71de4e74bc3aab05caf25519e5f723d9d160c491f917b7f064ee6b491c74edb52d7d2c29a08d86e41c2 wireguard-tools-1.0.20200121.tar.xz"
diff --git a/user/wireless-tools/APKBUILD b/user/wireless-tools/APKBUILD
index 8f327a3e9..e8c000ea5 100644
--- a/user/wireless-tools/APKBUILD
+++ b/user/wireless-tools/APKBUILD
@@ -17,16 +17,13 @@ depends=""
makedepends="linux-headers"
subpackages="$pkgname-dev $pkgname-doc"
source="https://hewlettpackard.github.io/wireless-tools/wireless_tools.$_pkgver.tar.gz"
-
builddir="$srcdir/$_pkgname.$_pkgmaj"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make INSTALL_DIR="$pkgdir"/usr/sbin \
INSTALL_LIB="$pkgdir"/usr/lib \
INSTALL_INC="$pkgdir"/usr/include \
diff --git a/user/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD
index dbd22b8c7..c4ae69a6e 100644
--- a/user/wpa_supplicant/APKBUILD
+++ b/user/wpa_supplicant/APKBUILD
@@ -6,11 +6,11 @@ pkgrel=1
pkgdesc="Utility providing key negotiation for WPA wireless networks"
url="https://w1.fi/wpa_supplicant/"
arch="all"
+options="!check" # No test suite.
license="BSD-3-Clause AND Public-Domain AND (GPL-2.0+ OR BSD-3-Clause)"
-options="!check" # No test suite
-subpackages="$pkgname-dbus::noarch $pkgname-doc $pkgname-openrc wpa_gui"
depends=""
makedepends="linux-headers openssl-dev dbus-dev libnl3-dev qt5-qtbase-dev"
+subpackages="$pkgname-dbus::noarch $pkgname-doc $pkgname-openrc wpa_gui"
source="https://w1.fi/releases/$pkgname-$pkgver.tar.gz
wpa_supplicant.initd
wpa_supplicant.confd
diff --git a/user/wv/APKBUILD b/user/wv/APKBUILD
index 8211b555d..d86534b82 100644
--- a/user/wv/APKBUILD
+++ b/user/wv/APKBUILD
@@ -3,14 +3,14 @@
pkgname=wv
pkgver=1.2.9
pkgrel=0
-pkgdesc="A library that can load and parse Word 2000, 97, 95 and 6 file formats"
+pkgdesc="Library to load and parse Word 2000, 97, 95 and 6 file formats"
url="https://sourceforge.net/projects/wvware"
arch="all"
options="!check" # No test suite.
license="GPL-2.0+ AND RSA-MD5"
-subpackages="$pkgname-dev $pkgname-doc"
depends=""
makedepends="libgsf-dev libpng-dev bzip2-dev"
+subpackages="$pkgname-dev $pkgname-doc"
source="https://www.abisource.com/downloads/wv/$pkgver/wv-$pkgver.tar.gz"
prepare() {
diff --git a/user/wxwidgets/APKBUILD b/user/wxwidgets/APKBUILD
index 192e67cb2..25f20db92 100644
--- a/user/wxwidgets/APKBUILD
+++ b/user/wxwidgets/APKBUILD
@@ -18,7 +18,6 @@ source="https://github.com/wxWidgets/wxWidgets/releases/download/v$pkgver/wxWidg
builddir="$srcdir/wxWidgets-$pkgver"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/x11vnc/APKBUILD b/user/x11vnc/APKBUILD
index c68858df3..b9154729b 100644
--- a/user/x11vnc/APKBUILD
+++ b/user/x11vnc/APKBUILD
@@ -7,21 +7,21 @@ pkgdesc="VNC server for X11 sessions"
url="http://www.karlrunge.com/x11vnc/"
arch="all"
license="GPL-2.0-only"
+depends=""
makedepends="cairo-dev libjpeg-turbo-dev libvncserver-dev libxcursor-dev
- openssl-dev utmps-dev zlib-dev"
+ openssl-dev utmps-dev zlib-dev autoconf automake"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/LibVNC/x11vnc/archive/$pkgver.tar.gz
+ time64.patch
utmps.patch
"
prepare() {
- cd "$builddir"
default_prepare
./autogen.sh
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -34,14 +34,13 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
sha512sums="69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec x11vnc-0.9.16.tar.gz
+764dc0d22f4b167b7683b1551a6d8cc8ea6745fdd9791422404ef604186930615b52ef1bf66fd03dd9c6eed18845ff4a1e5a235eee80810177e082359a8c4766 time64.patch
8aaa6d1fd9e795a60cad162f2b21fe96cd3a7076a0c4fae6e6b0021881bd019312a678fa3ed69b694da36ee64cc0601812da5df96c6461baf68b7e70adf6cd4e utmps.patch"
diff --git a/user/x11vnc/time64.patch b/user/x11vnc/time64.patch
new file mode 100644
index 000000000..663684716
--- /dev/null
+++ b/user/x11vnc/time64.patch
@@ -0,0 +1,78 @@
+--- x11vnc-0.9.16/src/uinput.c.old 2019-01-05 13:22:11.000000000 +0000
++++ x11vnc-0.9.16/src/uinput.c 2020-01-24 04:49:39.479206612 +0000
+@@ -710,6 +710,7 @@
+ static void ptr_move(int dx, int dy) {
+ #ifdef UINPUT_OK
+ struct input_event ev;
++ struct timeval tv;
+ int d = direct_rel_fd < 0 ? fd : direct_rel_fd;
+
+ if (injectable && strchr(injectable, 'M') == NULL) {
+@@ -720,7 +721,9 @@
+
+ if (db) fprintf(stderr, "ptr_move(%d, %d) fd=%d\n", dx, dy, d);
+
+- gettimeofday(&ev.time, NULL);
++ gettimeofday(&tv, NULL);
++ ev.input_event_sec = tv.tv_sec;
++ ev.input_event_usec = tv.tv_usec;
+ ev.type = EV_REL;
+ ev.code = REL_Y;
+ ev.value = dy;
+@@ -755,6 +758,7 @@
+ static void ptr_abs(int x, int y, int p) {
+ #ifdef UINPUT_OK
+ struct input_event ev;
++ struct timeval tv;
+ int x0, y0;
+ int d = direct_abs_fd < 0 ? fd : direct_abs_fd;
+
+@@ -773,7 +777,9 @@
+
+ if (db) fprintf(stderr, "ptr_abs(%d, %d => %d %d, p=%d) fd=%d\n", x0, y0, x, y, p, d);
+
+- gettimeofday(&ev.time, NULL);
++ gettimeofday(&tv, NULL);
++ ev.input_event_sec = tv.tv_sec;
++ ev.input_event_usec = tv.tv_usec;
+ ev.type = EV_ABS;
+ ev.code = ABS_Y;
+ ev.value = y;
+@@ -950,6 +956,7 @@
+ static void button_click(int down, int btn) {
+ #ifdef UINPUT_OK
+ struct input_event ev;
++ struct timeval tv;
+ int d = direct_btn_fd < 0 ? fd : direct_btn_fd;
+
+ if (injectable && strchr(injectable, 'B') == NULL) {
+@@ -959,7 +966,9 @@
+ if (db) fprintf(stderr, "button_click: btn %d %s fd=%d\n", btn, down ? "down" : "up", d);
+
+ memset(&ev, 0, sizeof(ev));
+- gettimeofday(&ev.time, NULL);
++ gettimeofday(&tv, NULL);
++ ev.input_event_sec = tv.tv_sec;
++ ev.input_event_usec = tv.tv_usec;
+ ev.type = EV_KEY;
+ ev.value = down;
+
+@@ -1230,6 +1239,7 @@
+ void uinput_key_command(int down, int keysym, rfbClientPtr client) {
+ #ifdef UINPUT_OK
+ struct input_event ev;
++ struct timeval tv;
+ int scancode;
+ allowed_input_t input;
+ int d = direct_key_fd < 0 ? fd : direct_key_fd;
+@@ -1253,7 +1263,9 @@
+ if (db) fprintf(stderr, "uinput_key_command: %d -> %d %s fd=%d\n", keysym, scancode, down ? "down" : "up", d);
+
+ memset(&ev, 0, sizeof(ev));
+- gettimeofday(&ev.time, NULL);
++ gettimeofday(&tv, NULL);
++ ev.input_event_sec = tv.tv_sec;
++ ev.input_event_usec = tv.tv_usec;
+ ev.type = EV_KEY;
+ ev.code = (unsigned char) scancode;
+ ev.value = down;
diff --git a/user/x264/APKBUILD b/user/x264/APKBUILD
index 4c8b772a0..c7c18cb67 100644
--- a/user/x264/APKBUILD
+++ b/user/x264/APKBUILD
@@ -1,29 +1,28 @@
# Maintainer:
pkgname=x264
-pkgver=20170930
+pkgver=20191105
pkgrel=0
pkgdesc="Library for encoding H264/AVC video streams"
url="https://www.videolan.org/developers/x264.html"
arch="all"
-license="GPL-2.0+"
options="textrels"
+license="GPL-2.0+"
+depends=""
makedepends="bash coreutils libx11-dev perl"
case $CTARGET_ARCH in
x86_64) makedepends="$makedepends yasm";;
esac
subpackages="$pkgname-dev $pkgname-libs"
-source="ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2"
+source="https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245-stable.tar.bz2"
builddir="$srcdir/$pkgname-snapshot-$pkgver-2245-stable"
build() {
- cd "$builddir"
-
- local asmopts=
+ _asmopts=""
case "$CARCH" in
# ppc requires AltiVec, we run on G3s
- ppc | pmmx) asmopts="--disable-asm" ;;
+ ppc | pmmx) _asmopts="--disable-asm" ;;
# VSX was added in power8
- ppc64) asmopts="--disable-vsx" ;;
+ ppc64) _asmopts="--disable-vsx" ;;
esac
# note: not autotools
@@ -33,24 +32,20 @@ build() {
--prefix=/usr \
--enable-shared \
--enable-static \
- $asmopts \
+ $_asmopts \
--enable-pic \
--extra-cflags=-fno-aggressive-loop-optimizations
make
}
check() {
- cd "$builddir"
-
./x264 --version
}
package() {
- cd "$builddir"
-
make DESTDIR="$pkgdir" \
bindir=/usr/bin libdir=/usr/lib includedir=/usr/include \
install
}
-sha512sums="7f0d33f2955dbc8958ad739cfe69b9083ea376d21a4af469a6a44c8db8089859cf0a94018a1cdea49ce4c3b4a1b635cc304208d0492d901fd99a1337ac2c5d57 x264-snapshot-20170930-2245-stable.tar.bz2"
+sha512sums="5a5bc2bd322af8544a6e7d89d6c56d1b609f8a69e177b20964fda1b5c8ad3a0ca77ff00b8ec47412a0c069afac677300c1d26aaaa704cf9be93df27f189171d3 x264-snapshot-20191105-2245-stable.tar.bz2"
diff --git a/user/xabacus/APKBUILD b/user/xabacus/APKBUILD
index 61bf59e2c..6ab2e4f8b 100644
--- a/user/xabacus/APKBUILD
+++ b/user/xabacus/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Horst Burkhardt <horst@adelielinux.org>
# Maintainer: Horst Burkhardt <horst@adelielinux.org>
pkgname=xabacus
-pkgver=8.2.1
+pkgver=8.2.4
pkgrel=0
pkgdesc="Simple X11 abacus widget"
url="http://www.sillycycle.com/abacus.html"
@@ -11,18 +11,16 @@ license="MIT"
depends=""
makedepends="libx11-dev libxpm-dev libxt-dev libxml2-dev"
subpackages="$pkgname-doc"
-# Refuses cURL user agents: 406 Not Acceptable
-#source="http://www.sillycycle.com/abacus/$pkgname-$pkgver.tar.xz"
-source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.bz2"
+source="$pkgname-$pkgver.tar.bz2::http://www.sillycycle.com/abacus/$pkgname-$pkgver.tar.xz"
build() {
- ./configure --prefix=/usr
+ ./configure \
+ --prefix=/usr
make
}
package() {
- make DESTDIR="$pkgdir" install
- make DESTDIR="$pkgdir" install-png install-xpm
+ make DESTDIR="$pkgdir" install install-png install-xpm
}
-sha512sums="06f26af541bb7b9a17acce7b56c7edd28aac50ef4c63a1cc73ae8269842d95618cd99eeafb62f045ec4ad543a3ecad529473e138c0933c4674a91027fa32e548 xabacus-8.2.1.tar.bz2"
+sha512sums="6a65e36c678cbb39d95932da265d40c61afb21eccc87264e07e80fb98b75c4e4a4777ee2bce458eb2e811b720656732e7c780e61e436287f91df83015c7e58c0 xabacus-8.2.4.tar.bz2"
diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD
index 102f86751..20005d338 100644
--- a/user/xapian-core/APKBUILD
+++ b/user/xapian-core/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer:
pkgname=xapian-core
-pkgver=1.4.12
+pkgver=1.4.14
pkgrel=0
pkgdesc="Open source search engine library"
url="https://xapian.org/"
@@ -13,12 +13,8 @@ depends_dev="zlib-dev util-linux-dev"
makedepends="$depends_dev libtool"
subpackages="$pkgname-dev $pkgname-doc libxapian"
source="http://oligarchy.co.uk/xapian/$pkgver/$pkgname-$pkgver.tar.xz
- timeval-t.patch"
-
-case "$CARCH" in
-armhf) options="!check" ;; # FIXME
-s390x) options="!check" ;; # FIXME
-esac
+ timeval-t.patch
+ "
# secfixes:
# 1.4.6-r0:
@@ -46,10 +42,9 @@ package() {
libxapian() {
pkgdesc="Xapian search engine library"
- cd "$builddir"
install -d "$subpkgdir"/usr/lib
mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib
}
-sha512sums="230b39e012366267cf5ea09d01d3b463818c0d05861b8c8643bc6fc238be21bd3f4862adeba864b4af2962b1c0748b3d380dfe845da467f5164b0d938288c430 xapian-core-1.4.12.tar.xz
+sha512sums="c08c9abe87e08491566b7cfa8cda9e2a80e4959a647428b6d82bce7af1c967b4cb463607ffb8976372a980c163923ced36117a66e0b5a1f35659393def3d371b xapian-core-1.4.14.tar.xz
639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch"
diff --git a/user/xautolock/APKBUILD b/user/xautolock/APKBUILD
index 71fd17994..a614dfb54 100644
--- a/user/xautolock/APKBUILD
+++ b/user/xautolock/APKBUILD
@@ -1,29 +1,27 @@
-# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=xautolock
pkgver=2.2
pkgrel=4
pkgdesc="An automatic X screen-locker/screen-saver"
url="http://ibiblio.org/pub/Linux/X11/screensavers/"
-arch="all" # this might not build on aarch64? removed from alpine commit
-license="GPL-2.0"
-options="!check" # This package has no testsuite
+arch="all"
+options="!check" # This package has no test suite.
+license="GPL-2.0-only"
depends=""
makedepends="$depends_dev imake xorg-server-dev libxscrnsaver-dev xorg-cf-files"
subpackages="$pkgname-doc"
source="https://www.ibiblio.org/pub/linux/X11/screensavers/xautolock-$pkgver.tgz
- processwait.patch"
+ processwait.patch
+ "
build() {
- cd "$builddir"
- xmkmf
- make
+ xmkmf
+ make
}
package() {
- cd "$builddir"
- make DESTDIR="$pkgdir" install
- make MANPATH=/usr/share/man DESTDIR="$pkgdir" install.man
+ make DESTDIR="$pkgdir" install
+ make MANPATH=/usr/share/man DESTDIR="$pkgdir" install.man
}
sha512sums="5f9dcc25cda706610e77a74235c4b421ca3a833d154b1a269057f0774579e1c6ec36fe0e5be5fadd6942ce8c1640a760f891397586b162e6024b524635153d04 xautolock-2.2.tgz
diff --git a/user/xbitmaps/APKBUILD b/user/xbitmaps/APKBUILD
index 47ca8efca..3052984ef 100644
--- a/user/xbitmaps/APKBUILD
+++ b/user/xbitmaps/APKBUILD
@@ -8,10 +8,10 @@ arch="noarch"
license="X11"
depends="util-macros"
makedepends=""
+subpackages=""
source="https://www.X.Org/releases/individual/data/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -20,12 +20,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xcape/APKBUILD b/user/xcape/APKBUILD
index c560795e1..34ddcb85a 100644
--- a/user/xcape/APKBUILD
+++ b/user/xcape/APKBUILD
@@ -14,12 +14,10 @@ subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
build() {
- cd "$builddir"
make
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" MANDIR="/share/man/man1" install
}
diff --git a/user/xcb-util-cursor/APKBUILD b/user/xcb-util-cursor/APKBUILD
index 76f6d2016..e6b46f9e1 100644
--- a/user/xcb-util-cursor/APKBUILD
+++ b/user/xcb-util-cursor/APKBUILD
@@ -9,14 +9,12 @@ arch="all"
license="MIT"
depends=""
depends_dev="xcb-util-dev"
-makedepends="$depends_dev m4 util-macros xcb-util-image-dev xcb-util-renderutil-dev"
checkdepends="check-dev"
+makedepends="$depends_dev m4 util-macros xcb-util-image-dev xcb-util-renderutil-dev"
subpackages="$pkgname-dev"
source="https://xcb.freedesktop.org/dist/xcb-util-cursor-$pkgver.tar.gz"
build() {
- cd "$builddir"
- export CFLAGS="$CFLAGS -std=gnu99"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -29,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xcb-util-xrm/APKBUILD b/user/xcb-util-xrm/APKBUILD
index d368f1544..dfdefaba7 100644
--- a/user/xcb-util-xrm/APKBUILD
+++ b/user/xcb-util-xrm/APKBUILD
@@ -8,12 +8,12 @@ pkgdesc="Utility functions for the X resource manager"
url="https://github.com/Airblader/xcb-util-xrm"
arch="all"
license="MIT"
+depends=""
makedepends="m4 bsd-compat-headers libx11-dev libxcb-dev util-macros xcb-util-dev"
-source="https://github.com/Airblader/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
subpackages="$pkgname-dev"
+source="https://github.com/Airblader/$pkgname/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xclip/APKBUILD b/user/xclip/APKBUILD
index 19125d29b..dcff75e1e 100644
--- a/user/xclip/APKBUILD
+++ b/user/xclip/APKBUILD
@@ -10,18 +10,16 @@ arch="all"
options="!check" # TODO: this package has tests that require X
license="GPL-2.0+"
depends=""
-makedepends="libx11-dev libxmu-dev"
+makedepends="autoconf automake libx11-dev libxmu-dev"
subpackages="$pkgname-doc"
source="$pkgname-$pkgver.tar.gz::https://github.com/astrand/${pkgname}/archive/${pkgver}.tar.gz"
prepare() {
- cd "$builddir"
default_prepare
autoreconf -vif
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -33,7 +31,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
mkdir -p "$pkgdir"/usr/share/doc/$pkgname/
diff --git a/user/xclipboard/APKBUILD b/user/xclipboard/APKBUILD
index b0219ea81..f5f75114e 100644
--- a/user/xclipboard/APKBUILD
+++ b/user/xclipboard/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xclipboard-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xcmsdb/APKBUILD b/user/xcmsdb/APKBUILD
index 973f006f0..f0f595804 100644
--- a/user/xcmsdb/APKBUILD
+++ b/user/xcmsdb/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xcmsdb-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xconsole/APKBUILD b/user/xconsole/APKBUILD
index 4bbac0359..8c7a64ff7 100644
--- a/user/xconsole/APKBUILD
+++ b/user/xconsole/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xconsole-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xdbedizzy/APKBUILD b/user/xdbedizzy/APKBUILD
index 5d190e7c5..a16dc62fe 100644
--- a/user/xdbedizzy/APKBUILD
+++ b/user/xdbedizzy/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xdbedizzy-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xdg-user-dirs/APKBUILD b/user/xdg-user-dirs/APKBUILD
index e754a868e..241e80519 100644
--- a/user/xdg-user-dirs/APKBUILD
+++ b/user/xdg-user-dirs/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xdg-user-dirs
pkgver=0.17
pkgrel=0
@@ -14,7 +14,6 @@ subpackages="$pkgname-lang $pkgname-doc"
source="https://user-dirs.freedesktop.org/releases/xdg-user-dirs-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,7 +25,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xdotool/APKBUILD b/user/xdotool/APKBUILD
index 3aae63783..af14cc595 100644
--- a/user/xdotool/APKBUILD
+++ b/user/xdotool/APKBUILD
@@ -11,23 +11,20 @@ options="!check" # Requires running X11 server
license="BSD-3-Clause"
depends=""
depends_dev="libx11-dev libxtst-dev libxinerama-dev libxkbcommon-dev"
-makedepends="$depends_dev perl"
#checkdepends="xvfb ruby-minitest cmd:which lsof xdpyinfo xterm xwininfo"
+makedepends="$depends_dev perl"
subpackages="$pkgname-dev $pkgname-doc"
source="https://github.com/jordansissel/xdotool/releases/download/v$pkgver/xdotool-$pkgver.tar.gz"
build() {
- cd "$builddir"
make WITHOUT_RPATH_FIX=1
}
check() {
- cd "$builddir"
make test
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" PREFIX="/usr" INSTALLMAN="/usr/share/man" install
}
diff --git a/user/xdpyinfo/APKBUILD b/user/xdpyinfo/APKBUILD
index 903b9a11d..52dd15d09 100644
--- a/user/xdpyinfo/APKBUILD
+++ b/user/xdpyinfo/APKBUILD
@@ -7,12 +7,13 @@ url="https://www.X.Org/"
arch="all"
license="X11"
depends=""
-makedepends="libx11-dev libxcomposite-dev libxext-dev libxinerama-dev libxrender-dev libxtst-dev libxxf86dga-dev libxxf86misc-dev libxxf86vm-dev util-macros xorgproto-dev"
+makedepends="libx11-dev libxcomposite-dev libxext-dev libxinerama-dev
+ libxrender-dev libxtst-dev libxxf86dga-dev libxxf86misc-dev
+ libxxf86vm-dev util-macros xorgproto-dev"
subpackages="$pkgname-doc"
source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -22,12 +23,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xdriinfo/APKBUILD b/user/xdriinfo/APKBUILD
index ae39b7f97..fe20244c0 100644
--- a/user/xdriinfo/APKBUILD
+++ b/user/xdriinfo/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xdriinfo-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xedit/APKBUILD b/user/xedit/APKBUILD
index 3ad25658c..6926602ed 100644
--- a/user/xedit/APKBUILD
+++ b/user/xedit/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xedit-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xeyes/APKBUILD b/user/xeyes/APKBUILD
index 76edc0272..253d4738b 100644
--- a/user/xeyes/APKBUILD
+++ b/user/xeyes/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xeyes-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-input-evdev/APKBUILD b/user/xf86-input-evdev/APKBUILD
index 3339d8caf..0896f48fa 100644
--- a/user/xf86-input-evdev/APKBUILD
+++ b/user/xf86-input-evdev/APKBUILD
@@ -6,14 +6,13 @@ pkgdesc="X.Org generic input driver"
url="https://www.X.Org/"
arch="all"
license="MIT"
-subpackages="$pkgname-doc $pkgname-dev"
depends=""
makedepends="libxkbfile-dev xorg-server-dev libxi-dev libxrandr-dev
eudev-dev mtdev-dev libevdev-dev"
+subpackages="$pkgname-doc $pkgname-dev"
source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
./configure \
--build=$CBUILD \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
diff --git a/user/xf86-input-joystick/APKBUILD b/user/xf86-input-joystick/APKBUILD
index c71441234..d2816b435 100644
--- a/user/xf86-input-joystick/APKBUILD
+++ b/user/xf86-input-joystick/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/driver/xf86-input-joystick-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-input-keyboard/APKBUILD b/user/xf86-input-keyboard/APKBUILD
index 600a12ec6..cc6ce0528 100644
--- a/user/xf86-input-keyboard/APKBUILD
+++ b/user/xf86-input-keyboard/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/driver/xf86-input-keyboard-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-input-mouse/APKBUILD b/user/xf86-input-mouse/APKBUILD
index eaefa3bb0..8082ce5f2 100644
--- a/user/xf86-input-mouse/APKBUILD
+++ b/user/xf86-input-mouse/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/driver/xf86-input-mouse-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-input-synaptics/APKBUILD b/user/xf86-input-synaptics/APKBUILD
index 5d45c4602..2ca9e1387 100644
--- a/user/xf86-input-synaptics/APKBUILD
+++ b/user/xf86-input-synaptics/APKBUILD
@@ -10,10 +10,11 @@ depends=""
makedepends="libevdev-dev libxi-dev libxkbfile-dev libxrandr-dev libxtst-dev
mtdev-dev xorg-server-dev"
subpackages="$pkgname-doc $pkgname-dev"
-source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2
+ input-event.patch
+ "
build() {
- cd "$builddir"
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
./configure \
--build=$CBUILD \
@@ -26,14 +27,13 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
-sha512sums="978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f xf86-input-synaptics-1.9.1.tar.bz2"
+sha512sums="978eddd456aa7361047bc3d72e5127b24b13de29b0dddb6a0acc9f9da93931baa2b22fb5d1e6be164f629a11e5d97d753b835426435396b45b1af5eb8d546c3f xf86-input-synaptics-1.9.1.tar.bz2
+c2fb26ce6721eddc611fb21cec18bd3a180557deccb5b46e2cdd60c7b10d4c4105dacd6d027ac2e71934df5f51a58a18a12e2c18d16e48768fa56a7dfffd9f90 input-event.patch"
diff --git a/user/xf86-input-synaptics/input-event.patch b/user/xf86-input-synaptics/input-event.patch
new file mode 100644
index 000000000..38b620f09
--- /dev/null
+++ b/user/xf86-input-synaptics/input-event.patch
@@ -0,0 +1,27 @@
+--- xf86-input-synaptics-1.9.1/src/eventcomm.c.old 2018-05-29 03:18:45.000000000 +0000
++++ xf86-input-synaptics-1.9.1/src/eventcomm.c 2020-01-22 02:18:05.881867288 +0000
+@@ -575,9 +575,12 @@
+ ev->type = EV_SYN;
+ ev->code = SYN_REPORT;
+ ev->value = 0;
+- ev->time = last_event_time;
+- } else if (ev->type == EV_SYN)
+- last_event_time = ev->time;
++ ev->input_event_sec = last_event_time.tv_sec;
++ ev->input_event_usec = last_event_time.tv_usec;
++ } else if (ev->type == EV_SYN) {
++ last_event_time.tv_sec = ev->input_event_sec;
++ last_event_time.tv_usec = ev->input_event_usec;
++ }
+
+ return TRUE;
+ }
+@@ -725,7 +728,7 @@
+ case SYN_REPORT:
+ hw->numFingers = count_fingers(pInfo, comm);
+ if (proto_data->have_monotonic_clock)
+- hw->millis = 1000 * ev.time.tv_sec + ev.time.tv_usec / 1000;
++ hw->millis = 1000 * ev.input_event_sec + ev.input_event_usec / 1000;
+ else
+ hw->millis = GetTimeInMillis();
+ SynapticsCopyHwState(hwRet, hw);
diff --git a/user/xf86-input-void/APKBUILD b/user/xf86-input-void/APKBUILD
index 9ce25b0f7..8f559b25f 100644
--- a/user/xf86-input-void/APKBUILD
+++ b/user/xf86-input-void/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/driver/xf86-input-void-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-input-wacom/APKBUILD b/user/xf86-input-wacom/APKBUILD
index d0a9a14a3..a1d6375a7 100644
--- a/user/xf86-input-wacom/APKBUILD
+++ b/user/xf86-input-wacom/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xf86-input-wacom
-pkgver=0.38.0
+pkgver=0.39.0
pkgrel=0
pkgdesc="X.Org driver for Wacom tablets"
url="https://linuxwacom.github.io/"
@@ -32,4 +32,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="853d0d91c5a18a96ccf9e30abdabc69c1bc9fc3c067746762eb789240272d1d7faaaa4524e60fd299f44d9f6603adb2de69caf697cde3f841debab8232d983b5 xf86-input-wacom-0.38.0.tar.bz2"
+sha512sums="9ad92c86c4ba3587d68e2107057c89dfe8628c0a2ec882f5a424ab4983c18ff6048489d7f6d3a8de87403744f74de1982de25327fc955bb5c21346a242e0aaa3 xf86-input-wacom-0.39.0.tar.bz2"
diff --git a/user/xf86-video-ast/APKBUILD b/user/xf86-video-ast/APKBUILD
index 0d90f631b..2ba078de0 100644
--- a/user/xf86-video-ast/APKBUILD
+++ b/user/xf86-video-ast/APKBUILD
@@ -13,7 +13,6 @@ subpackages=""
source="https://www.x.org/releases/individual/driver/xf86-video-ast-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-video-ati/APKBUILD b/user/xf86-video-ati/APKBUILD
index 3f867c166..e73509e18 100644
--- a/user/xf86-video-ati/APKBUILD
+++ b/user/xf86-video-ati/APKBUILD
@@ -7,15 +7,14 @@ url="https://www.X.Org/"
arch="all"
options="!check" # No test suite.
license="MIT"
-subpackages="$pkgname-doc"
depends="mesa-dri-ati"
makedepends="eudev-dev libdrm-dev libxi-dev mesa-dev pixman-dev util-macros
xorg-server-dev"
+subpackages="$pkgname-doc"
source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
build() {
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
-
./configure \
--build=$CBUILD \
--host=$CHOST \
diff --git a/user/xf86-video-cirrus/APKBUILD b/user/xf86-video-cirrus/APKBUILD
index 1c26532ea..56cdf55fa 100644
--- a/user/xf86-video-cirrus/APKBUILD
+++ b/user/xf86-video-cirrus/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/driver/xf86-video-cirrus-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-video-dummy/APKBUILD b/user/xf86-video-dummy/APKBUILD
index 453dda88c..27ac8da62 100644
--- a/user/xf86-video-dummy/APKBUILD
+++ b/user/xf86-video-dummy/APKBUILD
@@ -13,7 +13,6 @@ subpackages=""
source="https://www.x.org/releases/individual/driver/xf86-video-dummy-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-video-fbdev/APKBUILD b/user/xf86-video-fbdev/APKBUILD
index d514f987d..b78739650 100644
--- a/user/xf86-video-fbdev/APKBUILD
+++ b/user/xf86-video-fbdev/APKBUILD
@@ -6,13 +6,12 @@ pkgdesc="Framebuffer video driver for X11"
url="https://www.X.Org/"
arch="all"
license="MIT"
-subpackages="$pkgname-doc"
depends=""
makedepends="libxi-dev util-macros xorgproto-dev xorg-server-dev"
+subpackages="$pkgname-doc"
source="https://www.X.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
./configure \
--build=$CBUILD \
@@ -22,12 +21,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
}
diff --git a/user/xf86-video-freedreno/APKBUILD b/user/xf86-video-freedreno/APKBUILD
index d46d2b23a..4eb0448e4 100644
--- a/user/xf86-video-freedreno/APKBUILD
+++ b/user/xf86-video-freedreno/APKBUILD
@@ -5,7 +5,7 @@ pkgver=1.4.0
pkgrel=0
pkgdesc="Libre Adreno video driver for X11"
url="https://www.X.Org/"
-arch="all"
+arch="aarch64 aarch64_be armel armeb armhf armv7"
license="X11 AND BSD-3-Clause"
depends=""
makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev"
@@ -16,7 +16,6 @@ source="https://www.x.org/releases/individual/driver/xf86-video-freedreno-$pkgve
"
build() {
- cd "$builddir"
CFLAGS="$CFLAGS -Wno-error=deprecated-declarations" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-video-geode/APKBUILD b/user/xf86-video-geode/APKBUILD
index 0ba4f2954..71749e608 100644
--- a/user/xf86-video-geode/APKBUILD
+++ b/user/xf86-video-geode/APKBUILD
@@ -16,7 +16,6 @@ source="https://www.x.org/releases/individual/driver/xf86-video-geode-$pkgver.ta
"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,12 +27,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-video-intel/APKBUILD b/user/xf86-video-intel/APKBUILD
index 6727ce394..7ffb832b9 100644
--- a/user/xf86-video-intel/APKBUILD
+++ b/user/xf86-video-intel/APKBUILD
@@ -9,11 +9,11 @@ url="https://xorg.freedesktop.org"
arch="pmmx x86_64"
options="!check" # No test suite.
license="MIT"
-subpackages="$pkgname-doc"
depends="mesa-dri-intel"
makedepends="xorg-server-dev libxi-dev libdrm-dev mesa-dev libxvmc-dev
xcb-util-dev eudev-dev util-macros autoconf automake libtool xorgproto
"
+subpackages="$pkgname-doc"
source="https://dev.sick.bike/$pkgname-$pkgver.tar.gz
pmmx.patch
"
@@ -21,13 +21,11 @@ giturl="https://gitlab.freedesktop.org/xorg/driver/xf86-video-intel.git"
reporev="3d395062ce73f85e8340218df01c2ebf4bc25023"
prepare() {
- cd "$builddir"
default_prepare
autoreconf -vif
}
build() {
- cd "$builddir"
export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
./configure \
--build=$CBUILD \
@@ -40,7 +38,6 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
rm "$pkgdir"/usr/libexec/xf86-video-intel-backlight-helper
diff --git a/user/xf86-video-mach64/APKBUILD b/user/xf86-video-mach64/APKBUILD
index 2fdbb93c7..0ab4416af 100644
--- a/user/xf86-video-mach64/APKBUILD
+++ b/user/xf86-video-mach64/APKBUILD
@@ -13,7 +13,6 @@ subpackages=""
source="https://www.x.org/releases/individual/driver/xf86-video-mach64-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-video-mga/APKBUILD b/user/xf86-video-mga/APKBUILD
index adfbc5b31..14b891e37 100644
--- a/user/xf86-video-mga/APKBUILD
+++ b/user/xf86-video-mga/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/driver/xf86-video-mga-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-video-openchrome/APKBUILD b/user/xf86-video-openchrome/APKBUILD
index 10832e4ae..1b71f0b87 100644
--- a/user/xf86-video-openchrome/APKBUILD
+++ b/user/xf86-video-openchrome/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/driver/xf86-video-openchrome-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-video-qxl/APKBUILD b/user/xf86-video-qxl/APKBUILD
index 3106debc5..57c54f403 100644
--- a/user/xf86-video-qxl/APKBUILD
+++ b/user/xf86-video-qxl/APKBUILD
@@ -14,7 +14,6 @@ subpackages=""
source="https://www.x.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-video-r128/APKBUILD b/user/xf86-video-r128/APKBUILD
index 094b11633..0e6702994 100644
--- a/user/xf86-video-r128/APKBUILD
+++ b/user/xf86-video-r128/APKBUILD
@@ -15,7 +15,6 @@ source="https://www.x.org/releases/individual/driver/xf86-video-r128-$pkgver.tar
"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +26,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xf86-video-sis/APKBUILD b/user/xf86-video-sis/APKBUILD
index 4febae7c9..f07e35f35 100644
--- a/user/xf86-video-sis/APKBUILD
+++ b/user/xf86-video-sis/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xf86-video-sis
-pkgver=0.11.0
+pkgver=0.12.0
pkgrel=0
pkgdesc="X.Org driver for SiS video cards"
url="https://www.X.Org/"
@@ -31,4 +31,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="b8ad05b3faa24c6df65d825b576ddb8e2ce44705ce8b55d8cf0d9f37aa47a429ab43765d8daea57ff35c4cffed056fbec6dfe8ce95efcd6269cc7711115ea09c xf86-video-sis-0.11.0.tar.bz2"
+sha512sums="5aa101e5217f15667f2c94f7a76f4afcf47717b61f5d206ce65efe35dc3f674ca294f98ca8586971c6467f31decdd94d8255ebfc7dc220fac0179afc61995952 xf86-video-sis-0.12.0.tar.bz2"
diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD
index 20923ed26..66e869a55 100644
--- a/user/xfburn/APKBUILD
+++ b/user/xfburn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfburn
pkgver=0.6.1
pkgrel=0
@@ -7,13 +7,14 @@ pkgdesc="CD burning utility for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
-makedepends="intltool libburn-dev libisofs-dev gtk+3.0-dev gtk+2.0-dev
+depends=""
+makedepends="bash intltool libburn-dev libisofs-dev gtk+3.0-dev gtk+2.0-dev
libxfce4ui-dev exo-dev libgudev-dev gstreamer-dev gst-plugins-base-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="https://archive.xfce.org/src/apps/xfburn/${pkgver%.*}/xfburn-$pkgver.tar.bz2"
build() {
- LIBS="-lintl" ./configure \
+ LIBS="-lintl" bash ./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD
index 7044a7dd7..035c79a18 100644
--- a/user/xfce-desktop/APKBUILD
+++ b/user/xfce-desktop/APKBUILD
@@ -1,28 +1,24 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce-desktop
pkgver=4.13
pkgrel=0
arch="noarch"
pkgdesc="Complete XFCE desktop environment"
url="https://xfce.org"
+options="!check" # meta package, no tests needed.
license="NCSA"
-options="!check" # meta package, no tests needed.
depends="xfburn xfce4-power-manager xfce4-settings xfce4-volumed-pulse
xfdesktop xfce4-appfinder xfce4-panel xfce4-screenshooter
xfce4-taskmanager xfconf xfce4-dict xfce4-panel-profiles
xfce4-session xfdashboard xfmpc xfwm4 xfce4-terminal
xfce4-notifyd"
+makedepends=""
source="org.adelie-linux.about-xfce.desktop"
-builddir="$srcdir/$pkgname-$pkgver"
-
-build() {
- cd "$srcdir"
-}
package() {
- cd "$srcdir"
install -D -m644 "$srcdir"/org.adelie-linux.about-xfce.desktop \
"$pkgdir"/usr/share/applications/org.adelie-linux.about-xfce.desktop
}
+
sha512sums="362793e478e3fb0c6d7dca1f52f582a641ff4582ad0c0d6d1cbe28f1255fc6cd7918ea6b24a5d905a59275f67c44703bf8c78580642c4e0147b539842a6f372f org.adelie-linux.about-xfce.desktop"
diff --git a/user/xfce-plugins/APKBUILD b/user/xfce-plugins/APKBUILD
index 8b9396447..5e4d92920 100644
--- a/user/xfce-plugins/APKBUILD
+++ b/user/xfce-plugins/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce-plugins
pkgver=0.1
pkgrel=0
@@ -13,12 +13,9 @@ depends="xfce4-battery-plugin xfce4-diskperf-plugin xfce4-netload-plugin
xfce4-indicator-plugin xfce4-pulseaudio-plugin xfce4-time-out-plugin
xfce4-whiskermenu-plugin xfce4-cpugraph-plugin xfce4-sensors-plugin
xfce4-timer-plugin"
+makedepends=""
source="dummy"
-build() {
- cd "$srcdir"
-}
-
package() {
mkdir -p "$pkgdir"
}
diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD
index 4a516b885..187e18781 100644
--- a/user/xfce4-appfinder/APKBUILD
+++ b/user/xfce4-appfinder/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-appfinder
pkgver=4.14.0
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="An application finder for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev garcon-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/xfce/xfce4-appfinder/4.14/xfce4-appfinder-$pkgver.tar.bz2"
diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD
index 867c05676..90aea20eb 100644
--- a/user/xfce4-battery-plugin/APKBUILD
+++ b/user/xfce4-battery-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-battery-plugin
pkgver=1.1.3
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Battery monitor plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="GPL-2.0+ AND LGPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-battery-plugin/1.1/xfce4-battery-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD
index 2ca1be37e..1e1e5649d 100644
--- a/user/xfce4-clipman-plugin/APKBUILD
+++ b/user/xfce4-clipman-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-clipman-plugin
pkgver=1.4.3
pkgrel=1
@@ -7,6 +7,7 @@ pkgdesc="Clipboard management plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev libqrencode-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/1.4/xfce4-clipman-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD
index 6295a2aa5..5a235a42e 100644
--- a/user/xfce4-cpugraph-plugin/APKBUILD
+++ b/user/xfce4-cpugraph-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-cpugraph-plugin
pkgver=1.1.0
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Graphical CPU monitor plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/1.1/xfce4-cpugraph-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD
index 1aad37ff0..cb9291532 100644
--- a/user/xfce4-dict/APKBUILD
+++ b/user/xfce4-dict/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-dict
pkgver=0.8.3
pkgrel=0
@@ -7,12 +7,12 @@ pkgdesc="Dictionary application for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool glib-dev gtk+3.0-dev libxfce4ui-dev xfce4-panel-dev"
subpackages="$pkgname-doc"
source="http://archive.xfce.org/src/apps/xfce4-dict/0.8/xfce4-dict-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xfce4-diskperf-plugin/APKBUILD b/user/xfce4-diskperf-plugin/APKBUILD
index ef82ecf56..cc66c040c 100644
--- a/user/xfce4-diskperf-plugin/APKBUILD
+++ b/user/xfce4-diskperf-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-diskperf-plugin
pkgver=2.6.2
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Disk performance monitor plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="BSD-2-Clause AND GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-diskperf-plugin/2.6/xfce4-diskperf-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-indicator-plugin/APKBUILD b/user/xfce4-indicator-plugin/APKBUILD
index c0d02810f..a8e5f5f97 100644
--- a/user/xfce4-indicator-plugin/APKBUILD
+++ b/user/xfce4-indicator-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-indicator-plugin
pkgver=2.3.4
pkgrel=1
@@ -7,6 +7,7 @@ pkgdesc="Application information plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev libindicator-dev ido-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/2.3/xfce4-indicator-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD
index 743aa161e..2101b528a 100644
--- a/user/xfce4-netload-plugin/APKBUILD
+++ b/user/xfce4-netload-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-netload-plugin
pkgver=1.3.2
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Network monitor plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-netload-plugin/1.3/xfce4-netload-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD
index 5bc42afc4..0aa0fdd1f 100644
--- a/user/xfce4-notifyd/APKBUILD
+++ b/user/xfce4-notifyd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-notifyd
pkgver=0.4.4
pkgrel=1
@@ -7,6 +7,7 @@ pkgdesc="Notification service for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0-only AND GPL-2.0+"
+depends=""
makedepends="intltool libice-dev gtk+3.0-dev libxfce4util-dev libxfce4ui-dev
xfce4-panel-dev libnotify-dev dbus-glib-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/user/xfce4-panel-profiles/APKBUILD b/user/xfce4-panel-profiles/APKBUILD
index 503943b62..1d466b686 100644
--- a/user/xfce4-panel-profiles/APKBUILD
+++ b/user/xfce4-panel-profiles/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-panel-profiles
pkgver=1.0.9
pkgrel=0
diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD
index 8632458d9..043044ffe 100644
--- a/user/xfce4-panel/APKBUILD
+++ b/user/xfce4-panel/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-panel
pkgver=4.14.1
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Panel for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="LGPL-2.1+ AND GPL-2.0+"
+depends=""
makedepends="intltool gtk+3.0-dev libice-dev libxfce4util-dev garcon-dev exo-dev
libwnck-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD
index 0d7f38a38..ab652e8c1 100644
--- a/user/xfce4-power-manager/APKBUILD
+++ b/user/xfce4-power-manager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-power-manager
pkgver=1.6.5
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Power management support for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool gtk+3.0-dev libxfce4ui-dev libice-dev libnotify-dev
upower-dev xfce4-panel-dev"
subpackages="$pkgname-doc $pkgname-lang"
diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD
index 77c6f3515..96588826c 100644
--- a/user/xfce4-pulseaudio-plugin/APKBUILD
+++ b/user/xfce4-pulseaudio-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-pulseaudio-plugin
pkgver=0.4.2
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Pulseaudio plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev pulseaudio-dev
keybinder-3.0-dev libnotify-dev dbus-glib-dev"
subpackages="$pkgname-lang"
diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD
index 9b610d066..e3ad324dd 100644
--- a/user/xfce4-screenshooter/APKBUILD
+++ b/user/xfce4-screenshooter/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-screenshooter
pkgver=1.9.7
pkgrel=0
@@ -7,12 +7,12 @@ pkgdesc="Screenshot tool for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev libsoup-dev exo-dev"
subpackages="$pkgname-doc"
-source="http://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/apps/xfce4-screenshooter/1.9/xfce4-screenshooter-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD
index 781ec965d..eef3b208f 100644
--- a/user/xfce4-sensors-plugin/APKBUILD
+++ b/user/xfce4-sensors-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-sensors-plugin
pkgver=1.3.92
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Hardware sensor monitor plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-sensors-plugin/1.3/xfce4-sensors-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD
index 8ccbb3378..5f4043b68 100644
--- a/user/xfce4-session/APKBUILD
+++ b/user/xfce4-session/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-session
pkgver=4.14.0
pkgrel=0
diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD
index 1246a51a8..2ac50d1a7 100644
--- a/user/xfce4-settings/APKBUILD
+++ b/user/xfce4-settings/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-settings
pkgver=4.14.1
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="GUI settings application for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+ AND MIT AND LGPL-2.0+"
+depends=""
makedepends="intltool exo-dev garcon-dev libnotify-dev upower-dev
libxklavier-dev xf86-input-libinput-dev"
subpackages="$pkgname-lang"
diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD
index 32950f105..7600d411e 100644
--- a/user/xfce4-systemload-plugin/APKBUILD
+++ b/user/xfce4-systemload-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-systemload-plugin
pkgver=1.2.3
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="System load monitor plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="BSD-2-Clause"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-systemload-plugin/1.2/xfce4-systemload-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD
index daac4f234..ef98510e3 100644
--- a/user/xfce4-taskmanager/APKBUILD
+++ b/user/xfce4-taskmanager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-taskmanager
pkgver=1.2.2
pkgrel=0
@@ -7,29 +7,29 @@ pkgdesc="Process manager for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool gtk+3.0-dev gtk+2.0-dev libxmu-dev libwnck-dev"
-source="http://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-$pkgver.tar.bz2"
+subpackages="$pkgname-lang"
+source="https://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
+ --with-locales-dir=/usr/share/locale \
--localstatedir=/var \
--enable-gtk3
make
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD
index 5e09bf24c..809774459 100644
--- a/user/xfce4-terminal/APKBUILD
+++ b/user/xfce4-terminal/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-terminal
pkgver=0.8.8
pkgrel=0
@@ -7,7 +7,8 @@ pkgdesc="Terminal for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
-makedepends="intltool gtk+3.0-dev vte-dev libxfce4ui-dev"
+depends=""
+makedepends="intltool gtk+3.0-dev vte-dev libxfce4ui-dev pcre2-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="https://archive.xfce.org/src/apps/xfce4-terminal/0.8/xfce4-terminal-$pkgver.tar.bz2"
diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD
index da47061b6..607bdf263 100644
--- a/user/xfce4-time-out-plugin/APKBUILD
+++ b/user/xfce4-time-out-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-time-out-plugin
pkgver=1.1.0
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Forced computer break plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-time-out-plugin/${pkgver%.*}/xfce4-time-out-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD
index b59b00931..eb420718a 100644
--- a/user/xfce4-timer-plugin/APKBUILD
+++ b/user/xfce4-timer-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-timer-plugin
pkgver=1.7.0
pkgrel=1
@@ -7,6 +7,7 @@ pkgdesc="Timer plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-timer-plugin/1.7/xfce4-timer-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD
index 935a39a5f..432c5cff9 100644
--- a/user/xfce4-verve-plugin/APKBUILD
+++ b/user/xfce4-verve-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-verve-plugin
pkgver=2.0.0
pkgrel=1
@@ -7,6 +7,7 @@ pkgdesc="Command-line plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool libxfce4ui-dev xfce4-panel-dev"
subpackages="$pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/2.0/xfce4-verve-plugin-$pkgver.tar.bz2"
diff --git a/user/xfce4-volumed-pulse/APKBUILD b/user/xfce4-volumed-pulse/APKBUILD
index bfaa8f297..55a0ff0d3 100644
--- a/user/xfce4-volumed-pulse/APKBUILD
+++ b/user/xfce4-volumed-pulse/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-volumed-pulse
pkgver=0.2.3
pkgrel=0
@@ -7,7 +7,9 @@ pkgdesc="Pulseaudio volume manager for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-3.0+"
-makedepends="gtk+3.0-dev libxfce4ui-dev pulseaudio-dev keybinder-3.0-dev libnotify-dev"
+depends=""
+makedepends="gtk+3.0-dev libxfce4ui-dev pulseaudio-dev keybinder-3.0-dev
+ libnotify-dev"
source="https://archive.xfce.org/src/apps/xfce4-volumed-pulse/0.2/xfce4-volumed-pulse-$pkgver.tar.bz2"
build() {
diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD
index cf44747f1..c09d74cc3 100644
--- a/user/xfce4-whiskermenu-plugin/APKBUILD
+++ b/user/xfce4-whiskermenu-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-whiskermenu-plugin
pkgver=2.3.4
_pkgmaj=${pkgver%.*}
@@ -7,9 +7,10 @@ pkgrel=0
pkgdesc="Whisker menu plugin for the XFCE panel"
url="https://xfce.org"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="GPL-2.0+"
-makedepends="gtk+3.0-dev exo-dev garcon-dev xfce4-panel-dev"
+depends=""
+makedepends="cmake gtk+3.0-dev exo-dev garcon-dev xfce4-panel-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="https://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/$_pkgmaj/xfce4-whiskermenu-plugin-$pkgver.tar.bz2"
@@ -24,7 +25,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD
index d13a4dceb..c211fb629 100644
--- a/user/xfconf/APKBUILD
+++ b/user/xfconf/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfconf
pkgver=4.14.1
pkgrel=0
pkgdesc="Configuration framework for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
-options="!check" # tests require X11
+options="!check" # Tests require X11.
license="LGPL-2.1+ AND GPL-2.0+"
depends="dbus"
makedepends="intltool gtk+3.0-dev libxfce4util-dev"
diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD
index af4013ff8..fd6f315b3 100644
--- a/user/xfdashboard/APKBUILD
+++ b/user/xfdashboard/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfdashboard
pkgver=0.7.5
pkgrel=1
@@ -7,6 +7,7 @@ pkgdesc="Gnome dashboard clone for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool gtk+3.0-dev libwnck-dev libice-dev garcon-dev
libxfce4ui-dev clutter-dev"
subpackages="$pkgname-dev $pkgname-lang"
diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD
index 7b5083068..cb4507523 100644
--- a/user/xfdesktop/APKBUILD
+++ b/user/xfdesktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfdesktop
pkgver=4.14.1
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Desktop manager for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev
exo-dev garcon-dev libnotify-dev thunar-dev"
subpackages="$pkgname-doc $pkgname-lang"
diff --git a/user/xfindproxy/APKBUILD b/user/xfindproxy/APKBUILD
index 430427fb2..bca667899 100644
--- a/user/xfindproxy/APKBUILD
+++ b/user/xfindproxy/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xfindproxy-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD
index dc889ea14..c6f9975a0 100644
--- a/user/xfmpc/APKBUILD
+++ b/user/xfmpc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfmpc
pkgver=0.3.0
pkgrel=1
@@ -7,6 +7,7 @@ pkgdesc="Graphical music player daemon client for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+ AND LGPL-2.0+"
+depends=""
makedepends="intltool gtk+2.0-dev libxfce4ui-dev libmpd-dev"
subpackages="$pkgname-doc $pkgname-lang"
source="https://archive.xfce.org/src/apps/xfmpc/${pkgver%.*}/xfmpc-$pkgver.tar.bz2"
diff --git a/user/xfontsel/APKBUILD b/user/xfontsel/APKBUILD
index e34c9d2ac..2256f0359 100644
--- a/user/xfontsel/APKBUILD
+++ b/user/xfontsel/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xfontsel-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xfs/APKBUILD b/user/xfs/APKBUILD
index d7e0fdeb6..e36ce177c 100644
--- a/user/xfs/APKBUILD
+++ b/user/xfs/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xfs-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD
index 4dbd07d10..b6c907d50 100644
--- a/user/xfwm4/APKBUILD
+++ b/user/xfwm4/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfwm4
pkgver=4.14.0
pkgrel=0
@@ -7,6 +7,7 @@ pkgdesc="Window manager for the XFCE desktop environment"
url="https://xfce.org"
arch="all"
license="GPL-2.0+"
+depends=""
makedepends="intltool gtk+3.0-dev libxfce4util-dev libxfce4ui-dev libwnck-dev
gobject-introspection-dev vala-dev"
subpackages="$pkgname-lang"
diff --git a/user/xfwp/APKBUILD b/user/xfwp/APKBUILD
index 46540f2ce..07d72f7b5 100644
--- a/user/xfwp/APKBUILD
+++ b/user/xfwp/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xfwp-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xgamma/APKBUILD b/user/xgamma/APKBUILD
index d93f3853b..f6f49a5cb 100644
--- a/user/xgamma/APKBUILD
+++ b/user/xgamma/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xgamma-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xgc/APKBUILD b/user/xgc/APKBUILD
index 8e55f8a4f..472ea5da1 100644
--- a/user/xgc/APKBUILD
+++ b/user/xgc/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xgc-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xinput/APKBUILD b/user/xinput/APKBUILD
index 8e5dde983..7e4014048 100644
--- a/user/xinput/APKBUILD
+++ b/user/xinput/APKBUILD
@@ -8,6 +8,7 @@ url="https://www.X.Org/"
arch="all"
options="!check" # No test suite.
license="X11"
+depends=""
makedepends="util-macros libx11-dev libxext-dev libxi-dev libxrandr-dev
libxinerama-dev"
subpackages="$pkgname-doc"
diff --git a/user/xkbevd/APKBUILD b/user/xkbevd/APKBUILD
index 2402772b7..6ddef0568 100644
--- a/user/xkbevd/APKBUILD
+++ b/user/xkbevd/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xkbevd-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xkbprint/APKBUILD b/user/xkbprint/APKBUILD
index a313ee04c..ce4387c78 100644
--- a/user/xkbprint/APKBUILD
+++ b/user/xkbprint/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xkbprint-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xkbutils/APKBUILD b/user/xkbutils/APKBUILD
index d627a69a8..ec291a6e9 100644
--- a/user/xkbutils/APKBUILD
+++ b/user/xkbutils/APKBUILD
@@ -13,14 +13,12 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xkbutils-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
chmod a+w config.sub
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xkill/APKBUILD b/user/xkill/APKBUILD
index bc4d3cceb..f0fd097e4 100644
--- a/user/xkill/APKBUILD
+++ b/user/xkill/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xkill-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xload/APKBUILD b/user/xload/APKBUILD
index 71414484b..a89b3a6ca 100644
--- a/user/xload/APKBUILD
+++ b/user/xload/APKBUILD
@@ -14,7 +14,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xload-$pkgver.tar.bz2"
build() {
- cd "$builddir"
CFLAGS="$CFLAGS -DRLOADSTUB" ./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -26,12 +25,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xlsclients/APKBUILD b/user/xlsclients/APKBUILD
index 81b470a1d..511d2d152 100644
--- a/user/xlsclients/APKBUILD
+++ b/user/xlsclients/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xlsclients-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xlsfonts/APKBUILD b/user/xlsfonts/APKBUILD
index 054386397..d3765c29b 100644
--- a/user/xlsfonts/APKBUILD
+++ b/user/xlsfonts/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xlsfonts-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xmag/APKBUILD b/user/xmag/APKBUILD
index 85191ca8d..ca81d63c8 100644
--- a/user/xmag/APKBUILD
+++ b/user/xmag/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xmag-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xmessage/APKBUILD b/user/xmessage/APKBUILD
index 145daeec0..21c5cf84a 100644
--- a/user/xmessage/APKBUILD
+++ b/user/xmessage/APKBUILD
@@ -6,12 +6,12 @@ pkgdesc="Display a message or query in a window"
url="https://www.X.Org/"
arch="all"
license="X11"
+depends=""
makedepends="libx11-dev libxaw-dev util-macros"
subpackages="$pkgname-doc"
source="https://www.X.Org/releases/individual/app/${pkgname}-${pkgver}.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -23,12 +23,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xmh/APKBUILD b/user/xmh/APKBUILD
index d7594e546..ae460e7ae 100644
--- a/user/xmh/APKBUILD
+++ b/user/xmh/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xmh-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD
index 4b7f83509..5c71b8f19 100644
--- a/user/xmlsec/APKBUILD
+++ b/user/xmlsec/APKBUILD
@@ -1,20 +1,19 @@
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=xmlsec
-pkgver=1.2.28
+pkgver=1.2.29
_pkgname="$pkgname${pkgver%%.*}"
-pkgrel=1
+pkgrel=0
pkgdesc="C-based XML signature and encryption syntax and processing library"
url="https://www.aleksey.com/xmlsec/"
arch="all"
license="MIT"
depends=""
checkdepends="nss-tools"
-makedepends="libxml2-dev libxslt-dev openssl-dev
+makedepends="libtool libxml2-dev libxslt-dev openssl-dev
gnutls-dev libgcrypt-dev nss-dev"
subpackages="$pkgname-dev $pkgname-doc
$pkgname-gcrypt $pkgname-gnutls $pkgname-nss"
-source="http://www.aleksey.com/xmlsec/download/$_pkgname-$pkgver.tar.gz
- fix-tests.patch"
+source="http://www.aleksey.com/xmlsec/download/$_pkgname-$pkgver.tar.gz"
builddir="$srcdir/$_pkgname-$pkgver"
build() {
@@ -69,5 +68,4 @@ nss() {
mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/
}
-sha512sums="17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480 xmlsec1-1.2.28.tar.gz
-2f146b31460ae1843a696c77cef03b36a0bf212028189055834e2e50d7a3142f6a069ce18a5c6b2251b5846fad7e96a6d9e26a6445fd182ac4c44c70afc4f8a3 fix-tests.patch"
+sha512sums="07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d xmlsec1-1.2.29.tar.gz"
diff --git a/user/xmlsec/fix-tests.patch b/user/xmlsec/fix-tests.patch
deleted file mode 100644
index 73acdf800..000000000
--- a/user/xmlsec/fix-tests.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-Backport of the following commits:
-
-b841f2c0b1e9cf24d991cc8b5d21e5a3b7c6ad80
-f25e8f07428b9475fa576bf78d77fb4fa366bc70
-106e7dbf39d96c46aedecf229d55a09e7593f1ec
-
-diff --git a/tests/testDSig.sh b/tests/testDSig.sh
-index 77372311..f2014464 100755
---- a/tests/testDSig.sh
-+++ b/tests/testDSig.sh
-@@ -805,98 +805,98 @@ execDSigTest $res_success \
- "signature-rsa-detached-b64-transform" \
- "base64 sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-detached" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-detached-xpath-transform" \
- "xpath sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-detached-xslt-transform-retrieval-method" \
- "xslt sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-detached-xslt-transform" \
- "xslt sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-enveloped" \
- "enveloped-signature sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-enveloping" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest-x509-data-cert-chain" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest-x509-data-cert" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest-x509-data-issuer-serial" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest-x509-data-ski" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest-x509-data-subject-name" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --untrusted-$cert_format certs/rsa-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-manifest" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00 $url_map_rfc3161"
-
- execDSigTest $res_success \
- "phaos-xmldsig-three" \
- "signature-rsa-xpath-transform-enveloped" \
- "enveloped-signature xpath sha1 rsa-sha1" \
- "rsa x509" \
-- "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --X509-skip-strict-checks --verification-time 2009-01-01+10:00:00"
-+ "--trusted-$cert_format certs/rsa-ca-cert.$cert_format --verification-time 2009-01-01+10:00:00"
-
-
- ##########################################################################
-@@ -940,7 +940,7 @@ execDSigTest $res_fail \
- "merlin-xmldsig-twenty-three/signature-x509-crt-crl" \
- "sha1 rsa-sha1" \
- "rsa x509" \
-- "--X509-skip-strict-checks --trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format $url_map_xml_stylesheet_2018"
-+ "--trusted-$cert_format $topfolder/merlin-xmldsig-twenty-three/certs/ca.$cert_format $url_map_xml_stylesheet_2018"
-
- execDSigTest $res_fail \
- "" \
-diff --git a/tests/testrun.sh b/tests/testrun.sh
-index ea65802b..fe0334c7 100755
---- a/tests/testrun.sh
-+++ b/tests/testrun.sh
-@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then
- elif [ "z$crypto" != "z" ] ; then
- xmlsec_params="$xmlsec_params --crypto $crypto"
- fi
--xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config"
-+xmlsec_params="$xmlsec_params --crypto-config $crypto_config"
-
- #
- # Setup keys config
-@@ -308,8 +308,8 @@ execDSigTest() {
- # run tests
- if [ -n "$params1" ] ; then
- printf " Verify existing signature "
-- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-- $VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-+ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
- printRes $expected_res $?
- if [ $? != 0 ]; then
- failures=`expr $failures + 1`
-@@ -328,8 +328,8 @@ execDSigTest() {
-
- if [ -n "$params3" -a -z "$PERF_TEST" ] ; then
- printf " Verify new signature "
-- echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile" >> $curlogfile
-- $VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
-+ echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile" >> $curlogfile
-+ $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
- printRes $res_success $?
- if [ $? != 0 ]; then
- failures=`expr $failures + 1`
-@@ -406,7 +406,7 @@ execEncTest() {
- if [ -n "$params1" ] ; then
- rm -f $tmpfile
- printf " Decrypt existing document "
-- echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-+ echo "$VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 $full_file.xml" >> $curlogfile
- $VALGRIND $xmlsec_app decrypt $xmlsec_params $params1 --output $tmpfile $full_file.xml >> $curlogfile 2>> $curlogfile
- res=$?
- echo "=== TEST RESULT: $res; expected: $expected_res" >> $curlogfile
diff --git a/user/xmodmap/APKBUILD b/user/xmodmap/APKBUILD
index abf6c45ba..a37dd7b67 100644
--- a/user/xmodmap/APKBUILD
+++ b/user/xmodmap/APKBUILD
@@ -12,7 +12,7 @@ makedepends="libx11-dev util-macros"
subpackages="$pkgname-doc"
source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
-build () {
+build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
diff --git a/user/xmoto/APKBUILD b/user/xmoto/APKBUILD
index 62bbdd1e7..f13b7d68d 100644
--- a/user/xmoto/APKBUILD
+++ b/user/xmoto/APKBUILD
@@ -10,7 +10,8 @@ license="GPL-2.0+"
depends=""
makedepends="bzip2-dev curl-dev glu-dev libjpeg-turbo-dev libpng-dev
libxdg-basedir-dev libxml2-dev lua5.3-dev mesa-dev ode-dev sdl-dev
- sdl_mixer-dev sdl_net-dev sdl_ttf-dev sqlite-dev zlib-dev"
+ sdl_mixer-dev sdl_net-dev sdl_ttf-dev sqlite-dev zlib-dev
+ autoconf automake"
subpackages="$pkgname-doc $pkgname-lang"
source="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-$pkgver-src.tar.gz
stupid-lua.patch
@@ -18,14 +19,12 @@ source="http://download.tuxfamily.org/xmoto/xmoto/0.5.11/xmoto-$pkgver-src.tar.g
"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
rm -r src/ode
}
build() {
- cd "$builddir"
./bootstrap
CPPFLAGS="$CPPFLAGS -D_GLIBCXX_USE_CXX11_ABI=0" \
LDFLAGS="$LDFLAGS $(pkg-config --libs lua)" \
@@ -41,12 +40,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
install -D -m644 "$builddir"/extra/xmoto.desktop \
"$pkgdir"/usr/share/applications/xmoto.desktop
diff --git a/user/xorg-apps/APKBUILD b/user/xorg-apps/APKBUILD
index be8cce184..a40d9332c 100644
--- a/user/xorg-apps/APKBUILD
+++ b/user/xorg-apps/APKBUILD
@@ -9,16 +9,15 @@ license="MIT"
options="!check" # Metapacakge
subpackages=""
depends="appres bdftopcf beforelight bitmap editres fonttosfnt fslsfonts
- fstobdf iceauth ico lbxproxy listres luit mkcomposecache mkfontdir
- mkfontscale oclock proxymngr rendercheck rgb setxkbmap showfont smproxy
- transset twm viewres x11perf xauth acpilight xbiff xbitmaps xcalc
- xclipboard xclock xcmsdb xcompmgr xconsole xcursorgen xdbedizzy
- xditview xdpyinfo xdriinfo xedit xev xeyes xfd xfindproxy xfontsel xfs
- xfsinfo xfwp xgamma xgc xhost xinit xinput xkbcomp xkbevd xkbprint
- xkbutils xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xman
- xmessage xmh xmodmap xmore xpr xprop xrandr xrdb xrefresh xrx xscope
- xset xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo xwd
- xwininfo xwud"
+ fstobdf iceauth ico listres luit mkcomposecache mkfontscale oclock
+ rendercheck rgb setxkbmap showfont smproxy transset twm viewres x11perf
+ xauth acpilight xbiff xbitmaps xcalc xclipboard xclock xcmsdb xcompmgr
+ xconsole xcursorgen xdbedizzy xditview xdpyinfo xdriinfo xedit xev
+ xeyes xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc xhost xinit
+ xinput xkbcomp xkbevd xkbprint xkbutils xkill xload xlogo xlsatoms
+ xlsclients xlsfonts xmag xman xmessage xmh xmodmap xmore xpr xprop
+ xrandr xrdb xrefresh xrx xscope xset xsetmode xsetpointer xsetroot xsm
+ xstdcmap xvidtune xvinfo xwd xwininfo xwud"
source=""
package() {
diff --git a/user/xorg-cf-files/APKBUILD b/user/xorg-cf-files/APKBUILD
index 5a438d2bf..f3270a4db 100644
--- a/user/xorg-cf-files/APKBUILD
+++ b/user/xorg-cf-files/APKBUILD
@@ -1,20 +1,18 @@
-# Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=xorg-cf-files
pkgver=1.0.6
pkgrel=0
pkgdesc="Data files for the imake utility"
-url="http://xorg.freedesktop.org/"
+url="https://www.X.Org/"
arch="noarch"
+options="!check" # This package has no test suite.
license="X11"
-options="!check" # This package has no testsuite
depends=""
-makedepends=""
+makedepends="util-macros"
subpackages="$pkgname-doc"
-source="http://xorg.freedesktop.org/releases/individual/util/${pkgname}-${pkgver}.tar.bz2"
+source="https://www.X.Org/releases/individual/util/${pkgname}-${pkgver}.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -27,12 +25,9 @@ build() {
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
- install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+ install -m755 -d "$pkgdir"/usr/share/licenses/$pkgname
+ install -m644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/
}
-md5sums="28649f34fa23143f1945aa2750e1472a xorg-cf-files-1.0.6.tar.bz2"
-sha256sums="4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d xorg-cf-files-1.0.6.tar.bz2"
sha512sums="1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa xorg-cf-files-1.0.6.tar.bz2"
diff --git a/user/xorg-drivers/APKBUILD b/user/xorg-drivers/APKBUILD
index 18bd7e6cf..c39fce3ba 100644
--- a/user/xorg-drivers/APKBUILD
+++ b/user/xorg-drivers/APKBUILD
@@ -13,11 +13,11 @@ depends="xf86-input-evdev xf86-input-joystick xf86-input-keyboard
xf86-input-void xf86-input-wacom
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-sis xf86-video-sisusb xf86-video-tdfx
- xf86-video-trident xf86-video-v4l xf86-video-vboxvideo xf86-video-vesa"
+ xf86-video-dummy xf86-video-fbdev 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-sis xf86-video-sisusb
+ xf86-video-tdfx xf86-video-trident xf86-video-v4l xf86-video-vboxvideo
+ xf86-video-vesa"
case $CTARGET_ARCH in
pmmx)
depends="$depends xf86-video-geode xf86-video-intel" ;;
@@ -28,7 +28,7 @@ case $CTARGET_ARCH in
esac
case $CTARGET_ARCH in
aarch64*|arm*)
- ;;
+ depends="$depends xf86-video-freedreno";;
*)
depends="$depends xf86-video-siliconmotion xf86-video-vmware";;
esac
diff --git a/user/xorg-gtest/APKBUILD b/user/xorg-gtest/APKBUILD
index 572976147..1dee09b1e 100644
--- a/user/xorg-gtest/APKBUILD
+++ b/user/xorg-gtest/APKBUILD
@@ -1,15 +1,16 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xorg-gtest
pkgver=0.7.1
pkgrel=0
-pkgdesc="X extensions to googletest"
+pkgdesc="X11 extensions to Google Test"
url="https://gitlab.freedesktop.org/xorg/test/xorg-gtest"
arch="noarch"
options="!check" # tests require X
license="MIT AND BSD-3-Clause"
depends=""
-makedepends="libx11-dev libxi-dev util-macros xorg-server-dev xf86-video-dummy"
+makedepends="libx11-dev libxi-dev util-macros xorg-server-dev xf86-video-dummy
+ autoconf automake"
subpackages="$pkgname-dev"
source="https://gitlab.freedesktop.org/xorg/test/xorg-gtest/-/archive/xorg-gtest-$pkgver/xorg-gtest-xorg-gtest-$pkgver.tar.bz2
remove-ridiculous-va_list-hacks.patch
@@ -17,13 +18,11 @@ source="https://gitlab.freedesktop.org/xorg/test/xorg-gtest/-/archive/xorg-gtest
builddir="$srcdir"/$pkgname-$pkgname-$pkgver
prepare() {
- cd "$builddir"
default_prepare
./autogen.sh
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -35,12 +34,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
DESTDIR="$pkgdir" make install
for i in gtest gtest-spi; do
rm "$pkgdir"/usr/include/gtest/"$i".h
diff --git a/user/xorriso/APKBUILD b/user/xorriso/APKBUILD
index eb01714ec..438d19a60 100644
--- a/user/xorriso/APKBUILD
+++ b/user/xorriso/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=xorriso
-pkgver=1.5.2
+pkgver=1.5.3
pkgrel=0
pkgdesc="ISO 9660 Rock Ridge filesystem manipulator"
url="https://www.gnu.org/software/xorriso/"
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.gnu.org/software/xorriso/xorriso-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,13 +24,11 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
-sha512sums="7247c00cda11a5341ab100f1091200e396b76cb5c852a3958fe3b9b735aa6a9142a0f22d2892275887bf52de175776e731fd853fff8c6ce20a096435fa05daf9 xorriso-1.5.2.tar.gz"
+sha512sums="7c0076449a54880e3988879f9c5689d1a0b8edd8b15e037c510aa960f25fba4d27b9fc2fdc0c5d959b7d46fb09ec861f33cf0fa2766aa0b93712ac6663cfa1e1 xorriso-1.5.3.tar.gz"
diff --git a/user/xpr/APKBUILD b/user/xpr/APKBUILD
index a8980c5c4..103f60db6 100644
--- a/user/xpr/APKBUILD
+++ b/user/xpr/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xpr-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xprop/APKBUILD b/user/xprop/APKBUILD
index 1339105a2..252178ea3 100644
--- a/user/xprop/APKBUILD
+++ b/user/xprop/APKBUILD
@@ -16,7 +16,10 @@ build() {
./configure \
--build=$CBUILD \
--host=$CHOST \
- --prefix=/usr
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=/usr/share/man \
+ --localstatedir=/var
make
}
diff --git a/user/xrandr/APKBUILD b/user/xrandr/APKBUILD
index e9e37a32c..59ffef0ec 100644
--- a/user/xrandr/APKBUILD
+++ b/user/xrandr/APKBUILD
@@ -9,9 +9,9 @@ url="https://www.X.Org/"
arch="all"
options="!check" # No test suite.
license="MIT"
-subpackages="$pkgname-doc"
depends=""
makedepends="libxrandr-dev util-macros"
+subpackages="$pkgname-doc"
source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.xz"
build() {
diff --git a/user/xrefresh/APKBUILD b/user/xrefresh/APKBUILD
index e942b954b..d84afd58c 100644
--- a/user/xrefresh/APKBUILD
+++ b/user/xrefresh/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xrefresh-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xrx/APKBUILD b/user/xrx/APKBUILD
index 97e71a06d..f2e79d9fb 100644
--- a/user/xrx/APKBUILD
+++ b/user/xrx/APKBUILD
@@ -14,13 +14,11 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xrx-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xscope/APKBUILD b/user/xscope/APKBUILD
index 9b4ce4205..7a51fc97c 100644
--- a/user/xscope/APKBUILD
+++ b/user/xscope/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xscope-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD
index 9e68c3eda..047d4eef8 100644
--- a/user/xscreensaver/APKBUILD
+++ b/user/xscreensaver/APKBUILD
@@ -1,12 +1,12 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xscreensaver
pkgver=5.43
pkgrel=0
pkgdesc="X Screensaver suite"
url="https://www.jwz.org/xscreensaver/"
arch="all"
-options="!check suid" # no tests
+options="!check suid" # No test suite.
license="MIT"
depends=""
makedepends="bc gtk+2.0-dev intltool libglade-dev libice-dev libjpeg-turbo-dev
@@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://www.jwz.org/xscreensaver/xscreensaver-$pkgver.tar.gz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -28,7 +27,6 @@ build() {
}
package() {
- cd "$builddir"
make install_prefix="$pkgdir" install
}
diff --git a/user/xset/APKBUILD b/user/xset/APKBUILD
index 9abfb3d46..e751862c2 100644
--- a/user/xset/APKBUILD
+++ b/user/xset/APKBUILD
@@ -7,13 +7,12 @@ pkgdesc="User preference utility for X11"
url="https://www.X.Org/"
arch="all"
license="X11"
-subpackages="$pkgname-doc"
depends=""
makedepends="libx11-dev libxext-dev libxmu-dev util-macros"
+subpackages="$pkgname-doc"
source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xsetmode/APKBUILD b/user/xsetmode/APKBUILD
index 37615c3f3..09a038202 100644
--- a/user/xsetmode/APKBUILD
+++ b/user/xsetmode/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xsetmode-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xsetpointer/APKBUILD b/user/xsetpointer/APKBUILD
index 0e0d5f697..35ca4aa67 100644
--- a/user/xsetpointer/APKBUILD
+++ b/user/xsetpointer/APKBUILD
@@ -13,13 +13,11 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xsetpointer-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -31,12 +29,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xsetroot/APKBUILD b/user/xsetroot/APKBUILD
index d5d6d4d9a..e4ad05a2d 100644
--- a/user/xsetroot/APKBUILD
+++ b/user/xsetroot/APKBUILD
@@ -6,13 +6,12 @@ pkgdesc="Set the root window (desktop background) of an X11 session"
url="https://www.X.Org/"
arch="all"
license="MIT"
-subpackages="$pkgname-doc"
depends=""
makedepends="libx11-dev libxcursor-dev libxmu-dev util-macros xbitmaps"
+subpackages="$pkgname-doc"
source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -24,12 +23,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xsm/APKBUILD b/user/xsm/APKBUILD
index f3e42cd18..b0a5b9968 100644
--- a/user/xsm/APKBUILD
+++ b/user/xsm/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xsm-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xsv/APKBUILD b/user/xsv/APKBUILD
index dab8647d5..d445d6514 100644
--- a/user/xsv/APKBUILD
+++ b/user/xsv/APKBUILD
@@ -8,6 +8,7 @@ pkgdesc="A fast CSV command line toolkit written in Rust"
url="https://github.com/BurntSushi/xsv"
arch="all"
license="MIT OR Unlicense"
+depends=""
makedepends="cargo"
source=""
diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD
index 1e4c02575..e8d82939a 100644
--- a/user/xterm/APKBUILD
+++ b/user/xterm/APKBUILD
@@ -1,13 +1,14 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xterm
-pkgver=350
+pkgver=351
pkgrel=0
pkgdesc="An X-based terminal emulator"
url="https://invisible-island.net/xterm/"
arch="all"
-options="!check" # no tests
+options="!check" # No test suite.
license="X11"
+depends=""
makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev
libxext-dev libxrender-dev libxft-dev freetype-dev ncurses-dev
pcre-dev"
@@ -44,5 +45,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="66e6cb37ebedd65c473b04cc31917e509f50652358414787a0a3f0b8f39ae957bf0aefe372576f82a698fccc6c45840cd4e4a2d8ce9f0b1fe5582ed88dae724f xterm-350.tgz
-e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch"
+sha512sums="941507be19ad062b39c57288c6e28a17f0ceba090a2d1c3f626f638e5333ca9b4c762fe2fbc42908adf7854b00d9a98cb6eb7481dfa50fd0125459f8ca385c00 xterm-351.tgz
+6811cd67ffe21dc23c9ad6a439291bb0b3c3d347f4d5e2cd65de9f790fde2bf7323fe9f1b309d95ac98a3ffaae5989bc73a2c5fe08aa9f6a2c6cbc3b9adcf8d9 posix-ptmx.patch"
diff --git a/user/xterm/posix-ptmx.patch b/user/xterm/posix-ptmx.patch
index 351aba9ab..6d1a859cd 100644
--- a/user/xterm/posix-ptmx.patch
+++ b/user/xterm/posix-ptmx.patch
@@ -1,6 +1,6 @@
--- xterm/main.c.old
+++ xterm/main.c
-@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED)
+@@ -2892,7 +2892,7 @@ get_pty(int *pty, char *from GCC_UNUSED)
close(opened_tty);
opened_tty = -1;
}
@@ -9,7 +9,7 @@
if ((*pty = posix_openpt(O_RDWR)) >= 0) {
char *name = ptsname(*pty);
if (name != 0) {
-@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw)
+@@ -4040,7 +4040,7 @@ spawnXTerm(XtermWidget xw)
/*
* now in child process
*/
diff --git a/user/xvidtune/APKBUILD b/user/xvidtune/APKBUILD
index 4c4e9d8b7..bcdcb69eb 100644
--- a/user/xvidtune/APKBUILD
+++ b/user/xvidtune/APKBUILD
@@ -13,14 +13,12 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xvidtune-$pkgver.tar.bz2"
prepare() {
- cd "$builddir"
default_prepare
chmod a+w config.sub
update_config_sub
}
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xwd/APKBUILD b/user/xwd/APKBUILD
index c7bd606be..23cf55fa6 100644
--- a/user/xwd/APKBUILD
+++ b/user/xwd/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xwd-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xwud/APKBUILD b/user/xwud/APKBUILD
index 72f7e9e50..4a606fc9f 100644
--- a/user/xwud/APKBUILD
+++ b/user/xwud/APKBUILD
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc"
source="https://www.x.org/releases/individual/app/xwud-$pkgver.tar.bz2"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/xxhash/APKBUILD b/user/xxhash/APKBUILD
new file mode 100644
index 000000000..91c74b4bf
--- /dev/null
+++ b/user/xxhash/APKBUILD
@@ -0,0 +1,34 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=xxhash
+pkgver=0.7.2
+pkgrel=0
+pkgdesc="Fast non-cryptographic hashing algorithm"
+url="https://cyan4973.github.io/xxHash/"
+arch="all"
+license="BSD-2-Clause"
+depends=""
+makedepends=""
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tools"
+source="xxHash-$pkgver.tar.gz::https://github.com/Cyan4973/xxHash/archive/v$pkgver.tar.gz"
+builddir="$srcdir"/xxHash-$pkgver
+
+build() {
+ make prefix=/usr
+}
+
+check() {
+ make prefix=/usr check
+}
+
+package() {
+ make prefix=/usr DESTDIR="$pkgdir" install
+}
+
+tools() {
+ license="GPL-2.0+"
+ mkdir -p "$subpkgdir"/usr
+ mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
+}
+
+sha512sums="90d4e7422729441e5013928b306fd6f394ab6f97628ec88369fbb33891c9a2cfae495516d8dd0741eda9c38859132b1bd78f2c7b8dae1dce80eeca8ea5cba575 xxHash-0.7.2.tar.gz"
diff --git a/user/yajl/APKBUILD b/user/yajl/APKBUILD
index 6a1f5991d..5be54b007 100644
--- a/user/yajl/APKBUILD
+++ b/user/yajl/APKBUILD
@@ -7,30 +7,30 @@ url="http://lloyd.github.com/yajl/"
arch="all"
license="ISC"
depends=""
-makedepends="cmake"
checkdepends="cmd:which"
+makedepends="cmake"
subpackages="$pkgname-dev $pkgname-tools"
source="yajl-$pkgver.tar.gz::https://github.com/lloyd/yajl/archive/$pkgver.tar.gz"
build() {
- cd "$builddir"
- cmake -DCMAKE_INSTALL_PREFIX="/usr" .
+ cmake \
+ -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+ .
make
}
-package() {
- cd "$builddir"
- make install DESTDIR="$pkgdir"
- mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/
-}
-
check() {
- cd "$builddir"
make test
# make test-api just checks the return status of gen-extra-close
# and also forkbombs, so elide that
}
+package() {
+ make install DESTDIR="$pkgdir"
+ mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib/
+}
+
tools() {
pkgdesc="JSON tools based on Yajl"
mkdir -p "$subpkgdir"/usr/
diff --git a/user/yakuake/APKBUILD b/user/yakuake/APKBUILD
index cc895da1c..69ff210ec 100644
--- a/user/yakuake/APKBUILD
+++ b/user/yakuake/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=yakuake
-pkgver=19.08.2
+pkgver=19.12.1
pkgrel=0
pkgdesc="Drop-down KDE terminal emulator"
url="https://www.kde.org/applications/system/yakuake/"
@@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev
kiconthemes-dev kio-dev knewstuff-dev knotifications-dev kparts-dev
knotifyconfig-dev kwidgetsaddons-dev kwindowsystem-dev"
subpackages="$pkgname-lang"
-source="https://download.kde.org/stable/applications/$pkgver/src/yakuake-$pkgver.tar.xz"
+source="https://download.kde.org/stable/release-service/$pkgver/src/yakuake-$pkgver.tar.xz"
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -26,7 +26,7 @@ build() {
-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
- ${CMAKE_CROSSOPTS}
+ ${CMAKE_CROSSOPTS} .
make
}
@@ -38,4 +38,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="fba00f8658ed799af1d7fe2e486fb450e456f6161e69bbf61bea344f4b58e9cc5933cf9306a89863440610f5f394431ee14fbd5605b2a929a40073dbdf902351 yakuake-19.08.2.tar.xz"
+sha512sums="e64646fd0c4c2d68d82b92739effca16149b8099e7616fc5681930bd07589687aceda973d5b4ff26ef199ba6231e373324b98ec6e332559bbdb144306f2c0c63 yakuake-19.12.1.tar.xz"
diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD
index 335c0de4b..70c5800f9 100644
--- a/user/youtube-dl/APKBUILD
+++ b/user/youtube-dl/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Timo Teräs <timo.teras@iki.fi>
# Maintainer: Max Rees <maxcrees@me.com>
pkgname=youtube-dl
-pkgver=2019.09.28
+pkgver=2019.11.28
pkgrel=0
pkgdesc="Command-line program to download videos from YouTube and many other sites"
url="https://youtube-dl.org"
@@ -11,6 +11,7 @@ arch="noarch"
options="!check" # Takes way too long, and uses network
license="Unlicense AND Public-Domain"
depends="ffmpeg python3"
+makedepends=""
subpackages="$pkgname-doc
$pkgname-zsh-completion:zshcomp
$pkgname-bash-completion:bashcomp
@@ -63,4 +64,4 @@ fishcomp() {
"$subpkgdir/usr/share/fish/completions/"
}
-sha512sums="b5d5034f9ace17ee18b550b825431797b49d1f916963d483c95a737a3f2842c4c916f6d24f2056efbb786ed3c2ddf269f28f736a650a47b7ff0f94256aba4e94 youtube-dl-2019.09.28.tar.gz"
+sha512sums="fd3fc9658428ecf96d681dd699db49e02f94343e5c49e370cb68a5764e8ecebc14b3ce5bc44db0a829b0d3c4fbffc96a1f8288fb24cbd21add6e9c7852b0915d youtube-dl-2019.11.28.tar.gz"
diff --git a/user/yubico-c/APKBUILD b/user/yubico-c/APKBUILD
index 926ecf235..5409c8b37 100644
--- a/user/yubico-c/APKBUILD
+++ b/user/yubico-c/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=yubico-c
pkgver=1.13
pkgrel=2
@@ -8,19 +8,19 @@ url="https://developers.yubico.com/yubico-c/"
arch="all"
license="BSD-2-Clause"
depends=""
-makedepends="asciidoctor"
+makedepends="asciidoctor autoconf automake libtool"
subpackages="$pkgname-dev $pkgname-doc"
source="yubico-c-libyubikey-$pkgver.tar.gz::https://github.com/Yubico/yubico-c/archive/libyubikey-$pkgver.tar.gz
- use-asciidoctor.patch"
+ use-asciidoctor.patch
+ "
builddir="$srcdir/$pkgname-libyubikey-$pkgver"
prepare() {
- cd "$builddir"
default_prepare
autoreconf -vif
}
+
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -32,12 +32,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir/" install
}
diff --git a/user/yubikey-personalization/APKBUILD b/user/yubikey-personalization/APKBUILD
index 7fff47158..1db97be94 100644
--- a/user/yubikey-personalization/APKBUILD
+++ b/user/yubikey-personalization/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=yubikey-personalization
pkgver=1.20.0
pkgrel=0
@@ -8,7 +8,8 @@ url="https://developers.yubico.com/yubikey-personalization/"
arch="all"
license="BSD-2-Clause AND Public-Domain"
depends=""
-makedepends="yubico-c-dev libusb-dev json-c-dev asciidoctor"
+makedepends="yubico-c-dev libusb-dev json-c-dev asciidoctor
+ autoconf automake libtool"
subpackages="$pkgname-dev $pkgname-doc"
source="yubikey-personalization-$pkgver.tar.gz::https://github.com/Yubico/yubikey-personalization/archive/v$pkgver.tar.gz
use-asciidoctor.patch
diff --git a/user/zenity/APKBUILD b/user/zenity/APKBUILD
index 234508b94..87343a192 100644
--- a/user/zenity/APKBUILD
+++ b/user/zenity/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=zenity
pkgver=3.32.0
pkgrel=0
@@ -13,7 +13,6 @@ subpackages="$pkgname-doc $pkgname-lang"
source="https://download.gnome.org/sources/zenity/${pkgver%.*}/zenity-$pkgver.tar.xz"
build() {
- cd "$builddir"
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -25,12 +24,10 @@ build() {
}
check() {
- cd "$builddir"
make check
}
package() {
- cd "$builddir"
make DESTDIR="$pkgdir" install
}
diff --git a/user/zola/APKBUILD b/user/zola/APKBUILD
index b3add1099..f61764a01 100644
--- a/user/zola/APKBUILD
+++ b/user/zola/APKBUILD
@@ -8,6 +8,7 @@ pkgdesc="A fast static site generator in a single binary with everything built i
url="https://github.com/getzola/zola"
arch="all"
license="BSD-3-Clause AND MIT"
+depends=""
makedepends="cargo oniguruma-dev openssl-dev zlib-dev"
subpackages="
$pkgname-doc