diff options
583 files changed, 4111 insertions, 2706 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/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/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/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/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/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..0fc25d609 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 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/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/alpine/APKBUILD b/user/alpine/APKBUILD index 189057dea..b879bf772 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 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/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..239644e34 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,16 @@ 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 + 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..831456f53 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,7 +7,7 @@ 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" @@ -15,12 +15,12 @@ source="http://www.sk-spell.sk.cx/file_download/103/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/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/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/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/bitlbee/APKBUILD b/user/bitlbee/APKBUILD index c61c98095..91e613b4e 100644 --- a/user/bitlbee/APKBUILD +++ b/user/bitlbee/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=bitlbee pkgver=3.5.1 pkgrel=0 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/catfish/APKBUILD b/user/catfish/APKBUILD index eacc0772b..8f9d8b88a 100644 --- a/user/catfish/APKBUILD +++ b/user/catfish/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=catfish pkgver=1.4.10 pkgrel=0 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/cloc/APKBUILD b/user/cloc/APKBUILD index 86ddd5c59..4b12785f8 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 diff --git a/user/clutter/APKBUILD b/user/clutter/APKBUILD index d2a53b372..e24d60c27 100644 --- a/user/clutter/APKBUILD +++ b/user/clutter/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=clutter pkgver=1.26.2 pkgrel=0 diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD index f7e7b699c..900be988e 100644 --- a/user/cogl/APKBUILD +++ b/user/cogl/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=cogl pkgver=1.22.4 pkgrel=0 diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD index 1753aff6c..7bf43d6b5 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 diff --git a/user/compton/APKBUILD b/user/compton/APKBUILD index 338f123de..0cfae4b52 100644 --- a/user/compton/APKBUILD +++ b/user/compton/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 pkgver=4 pkgrel=0 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/dina/APKBUILD b/user/dina/APKBUILD index 628675765..7895b8d1a 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 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/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/exo/APKBUILD b/user/exo/APKBUILD index 935b57108..4302bb5f2 100644 --- a/user/exo/APKBUILD +++ b/user/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=exo pkgver=0.12.9 pkgrel=0 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/ffmpegthumbnailer/APKBUILD b/user/ffmpegthumbnailer/APKBUILD index 8a3049363..1eca89231 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 diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD index 8c0ff4bc6..271690df5 100644 --- a/user/fish/APKBUILD +++ b/user/fish/APKBUILD @@ -1,5 +1,5 @@ # 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 diff --git a/user/flite/APKBUILD b/user/flite/APKBUILD index 3922e1d88..6818f19ee 100644 --- a/user/flite/APKBUILD +++ b/user/flite/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=flite pkgver=2.1 pkgrel=0 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/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/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/garcon/APKBUILD b/user/garcon/APKBUILD index c712903ee..235513fce 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 diff --git a/user/gleam/APKBUILD b/user/gleam/APKBUILD index cc931ea0c..b9cdc482a 100644 --- a/user/gleam/APKBUILD +++ b/user/gleam/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=gleam pkgver=0.4.2 pkgrel=0 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/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/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/gucharmap/APKBUILD b/user/gucharmap/APKBUILD index 9a3d7bfcf..913d4f749 100644 --- a/user/gucharmap/APKBUILD +++ b/user/gucharmap/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=gucharmap pkgver=12.0.1 _unicode=12.0.0 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/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/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..411207a14 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/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=icewm pkgver=1.5.5 pkgrel=0 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/ido/APKBUILD b/user/ido/APKBUILD index 9f858605e..9925e1453 100644 --- a/user/ido/APKBUILD +++ b/user/ido/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=ido pkgver=12.10.2 pkgrel=0 diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD index 1d63fd4b2..2a89e8d9b 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 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/kde-education/APKBUILD b/user/kde-education/APKBUILD index aa4e678bc..5393fbe18 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -17,7 +17,7 @@ source="org.adelie-linux.about-education.desktop" package() { mkdir -p "$pkgdir"/usr/share/applications - cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/release-service/ + cp -pr "$srcdir"/*.desktop "$pkgdir"/usr/share/applications/ } sha512sums="d88ee909e3ce8d26f3fbfeebc8656e0b72ec399f5ba0a1225babf217b01f5c7caec6e81e95cabb00b23dcbd41416360ae15958f38a5cbf4d548b89e3dd3229d5 org.adelie-linux.about-education.desktop" 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/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index b9903e868..934b57834 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.0 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="dc692db5dc4e0c7c8daa51fb8722d5d60efc22bb10b61c1048a67a50c15e9bac44bd009f6379153f1e1c21c12cb4b88f56ebe2db21a095c00bd068d0c1bbcb61 kdenlive-19.12.0.tar.xz" diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD index 9d00ce5d9..07859c854 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.65.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="6b66253e009871fa33e6f33a16a39b37f0828db688be95487f326bae96ef023aacb859a5726ea63faa4b12ee352be1f0d0d0697f67dde95292e677659a2f231d kdewebkit-5.65.0.tar.xz" diff --git a/user/keybinder-3.0/APKBUILD b/user/keybinder-3.0/APKBUILD index 8340209fb..54c82d864 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 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..1301b809f 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 diff --git a/user/libayatana-indicator/APKBUILD b/user/libayatana-indicator/APKBUILD index 4372a2b44..2e1fe0d30 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" 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/libburn/APKBUILD b/user/libburn/APKBUILD index 254c2ea90..6a8bde34b 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 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..bddbf32f2 100644 --- a/user/libfm/APKBUILD +++ b/user/libfm/APKBUILD @@ -7,6 +7,7 @@ pkgdesc="Library for file management" url="https://wiki.lxde.org/en/PCManFM" arch="all" license="GPL-2.0+" +depends="" 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 +16,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,12 +26,10 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } diff --git a/user/libglade/APKBUILD b/user/libglade/APKBUILD index 97d20f603..584e9d9c3 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 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/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/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/libindicator/APKBUILD b/user/libindicator/APKBUILD index 8bae4ffde..9d1c866f3 100644 --- a/user/libindicator/APKBUILD +++ b/user/libindicator/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=libindicator pkgver=12.10.1 pkgrel=0 diff --git a/user/libisofs/APKBUILD b/user/libisofs/APKBUILD index 7a43b027f..5020a072d 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 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/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/libmpd/APKBUILD b/user/libmpd/APKBUILD index c3ae2be64..9e1aedb1f 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 diff --git a/user/libopenraw/APKBUILD b/user/libopenraw/APKBUILD index b29becc3f..2e701fc57 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 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/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/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/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/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/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/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD index 561c84bcf..654e625e3 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 diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD index 8e8bcb8aa..06f02916e 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 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/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/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/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/lua-expat/APKBUILD b/user/lua-expat/APKBUILD index 9c8a6713a..9b6295bc1 100644 --- a/user/lua-expat/APKBUILD +++ b/user/lua-expat/APKBUILD @@ -1,6 +1,6 @@ # 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 diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD index e0deea91a..f244b935d 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 diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD index 89cbd7447..645cef44a 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 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..05e730aae 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 @@ -18,21 +18,19 @@ build() { 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 70fb32c0c..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}" 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/mate-applets/APKBUILD b/user/mate-applets/APKBUILD index e3eb7c72d..e8781f776 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 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..ec770dd97 100644 --- a/user/mate-complete/APKBUILD +++ b/user/mate-complete/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-complete pkgver=1.22.0 pkgrel=0 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/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/APKBUILD b/user/mesa/APKBUILD index b6684032d..539dbd80f 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -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 diff --git a/user/mimetic/APKBUILD b/user/mimetic/APKBUILD index c69f27270..058a8d91e 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 diff --git a/user/mlt/APKBUILD b/user/mlt/APKBUILD index ad94dd2ff..67398a1df 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,7 +18,7 @@ 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" ;; @@ -43,5 +44,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/mousepad/APKBUILD b/user/mousepad/APKBUILD index be5799335..8e6461482 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 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/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..ba7c54846 100644 --- a/user/mpv/APKBUILD +++ b/user/mpv/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=mpv pkgver=0.29.1 pkgrel=2 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/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/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/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/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/orage/APKBUILD b/user/orage/APKBUILD index c64f3c18b..42d97b547 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 diff --git a/user/otf-culmus/APKBUILD b/user/otf-culmus/APKBUILD index b67bd4347..08756dcdb 100644 --- a/user/otf-culmus/APKBUILD +++ b/user/otf-culmus/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-culmus pkgver=0.133 pkgrel=0 diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD index 939ae229a..87b065000 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 diff --git a/user/otf-office-code-pro/APKBUILD b/user/otf-office-code-pro/APKBUILD index 0f34cac2a..47eda62f0 100644 --- a/user/otf-office-code-pro/APKBUILD +++ b/user/otf-office-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-office-code-pro pkgver=1.004 pkgrel=0 diff --git a/user/otf-proggy-vector/APKBUILD b/user/otf-proggy-vector/APKBUILD index 3af3cc125..a191366f9 100644 --- a/user/otf-proggy-vector/APKBUILD +++ b/user/otf-proggy-vector/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-proggy-vector pkgver=1.1.5 pkgrel=0 diff --git a/user/otf-source-code-pro/APKBUILD b/user/otf-source-code-pro/APKBUILD index 78e144b82..551a2e1f6 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 diff --git a/user/otf-source-sans-pro/APKBUILD b/user/otf-source-sans-pro/APKBUILD index 04581e14c..871760fac 100644 --- a/user/otf-source-sans-pro/APKBUILD +++ b/user/otf-source-sans-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-sans-pro pkgver=3.006 pkgrel=0 diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD index d4c567d1c..7efafac99 100644 --- a/user/otf-source-serif-pro/APKBUILD +++ b/user/otf-source-serif-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-serif-pro pkgver=3.001 pkgrel=0 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/parole/APKBUILD b/user/parole/APKBUILD index 2ffd296e3..5d9ad60cf 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 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..1c18d17de 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 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..cd4cc7daf 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 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-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-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-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-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-data-dump/APKBUILD b/user/perl-data-dump/APKBUILD index c9fea4641..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 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-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-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-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-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-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-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-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-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-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-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-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-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-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 6bf970c7a..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 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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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-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/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/prosody/APKBUILD b/user/prosody/APKBUILD index 95b728b76..2281b6635 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 diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD index cd4e52fbc..9efc662a9 100644 --- a/user/protobuf/APKBUILD +++ b/user/protobuf/APKBUILD @@ -1,4 +1,4 @@ -# 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 diff --git a/user/py3-distutils-extra/APKBUILD b/user/py3-distutils-extra/APKBUILD index 557658b55..8c177437b 100644 --- a/user/py3-distutils-extra/APKBUILD +++ b/user/py3-distutils-extra/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-distutils-extra pkgver=2.42 pkgrel=0 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-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-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/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/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..e54f1682d 100644 --- a/user/qtkeychain/APKBUILD +++ b/user/qtkeychain/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=qtkeychain pkgver=0.9.1 pkgrel=0 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/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/ristretto/APKBUILD b/user/ristretto/APKBUILD index 6dd2d5251..880753eec 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 diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index a679afb20..792ad2e1d 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.0 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="11d9c6a0e6234c86752e07b5037ddd066673459c9f2bc1a779bfe54a06bce796af01b79af811c056f59ffcc85233ab357502a3597eeb21b5112d0f681cb51c6a rocs-19.12.0.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/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/rubberband/APKBUILD b/user/rubberband/APKBUILD index 4bbe58f6c..2e7275ae7 100644 --- a/user/rubberband/APKBUILD +++ b/user/rubberband/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=rubberband pkgver=1.8.2 pkgrel=0 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/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/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/socat/APKBUILD b/user/socat/APKBUILD index e5257103e..52bbd9f3a 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 diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD index 7699adf7d..15ee54895 100644 --- a/user/spectrwm/APKBUILD +++ b/user/spectrwm/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=spectrwm pkgver=3.2.0 _pkgver=$(printf '%s' "$pkgver" | tr . _) 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/tf/APKBUILD b/user/tf/APKBUILD index 65f205fb7..b1a09da15 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#*.} diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD index 6a2984dc6..036c50b31 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 diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index f18601085..014ab3ae8 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 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/trojita/APKBUILD b/user/trojita/APKBUILD index 429226f42..8f2088e88 100644 --- a/user/trojita/APKBUILD +++ b/user/trojita/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=trojita pkgver=0.7 pkgrel=0 diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD index 3524e7a01..c92b41be5 100644 --- a/user/ttf-sudo/APKBUILD +++ b/user/ttf-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=ttf-sudo pkgver=0.40 pkgrel=0 diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD index ebb4f09f4..69167790b 100644 --- a/user/ttf-terminus/APKBUILD +++ b/user/ttf-terminus/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=ttf-terminus pkgver=4.47.0 pkgrel=0 diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index 98adfba5d..82886aa02 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/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=tumbler pkgver=0.2.7 pkgrel=1 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..05f10ff7b 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 diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index 67f2fa698..670483fdd 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.0 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="b85a1f099cebe207b65b0f69f6f4c3c7d76c72e7d09e2c025661ad5a8c1ccc6394b6686a59fa1c997d3b29cfaaa67fc4f98d269abd1a5fdae423de8fdf2ab232 umbrello-19.12.0.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/uptimed/APKBUILD b/user/uptimed/APKBUILD index e92be5366..3ae155396 100644 --- a/user/uptimed/APKBUILD +++ b/user/uptimed/APKBUILD @@ -1,6 +1,6 @@ # 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 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/vamp-sdk/APKBUILD b/user/vamp-sdk/APKBUILD index b97a8c2df..26c4f887b 100644 --- a/user/vamp-sdk/APKBUILD +++ b/user/vamp-sdk/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=vamp-sdk pkgver=2.7.1 pkgrel=0 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/weechat/APKBUILD b/user/weechat/APKBUILD index d18e9cf69..a19b53ddc 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -1,6 +1,6 @@ # 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 pkgrel=0 diff --git a/user/which/APKBUILD b/user/which/APKBUILD index cea55c32a..ab0d0a5bc 100644 --- a/user/which/APKBUILD +++ b/user/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 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/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/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 caa0ae96f..0896f48fa 100644 --- a/user/xf86-input-evdev/APKBUILD +++ b/user/xf86-input-evdev/APKBUILD @@ -6,10 +6,10 @@ 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() { 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-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..0dd528edd 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 diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD index 7044a7dd7..122ea66b2 100644 --- a/user/xfce-desktop/APKBUILD +++ b/user/xfce-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=xfce-desktop pkgver=4.13 pkgrel=0 diff --git a/user/xfce-plugins/APKBUILD b/user/xfce-plugins/APKBUILD index 8b9396447..df0c53aca 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 diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD index 4a516b885..5e5fc3f30 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 diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD index 867c05676..87d4be1ab 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 diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD index 2ca1be37e..dfa5c7cef 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 diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD index 6295a2aa5..c3646f5d3 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 diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD index 1aad37ff0..1185b416b 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 diff --git a/user/xfce4-diskperf-plugin/APKBUILD b/user/xfce4-diskperf-plugin/APKBUILD index ef82ecf56..0d6c2021b 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 diff --git a/user/xfce4-indicator-plugin/APKBUILD b/user/xfce4-indicator-plugin/APKBUILD index c0d02810f..4056cf575 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 diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD index 743aa161e..a72fedae8 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 diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD index 5bc42afc4..c6d9edbd8 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 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..859e8b065 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 diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD index 0d7f38a38..0af1ac10f 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 diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD index 77c6f3515..71a3dcb4f 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 diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD index 9b610d066..146d3d85c 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 diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD index 781ec965d..15b39e6ea 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 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..f6cef7748 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 diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD index 32950f105..5f20a001c 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 diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD index daac4f234..16cf945b1 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 diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD index 5e09bf24c..fb16a6693 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 diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD index da47061b6..0b34b3d77 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 diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD index b59b00931..e17181b87 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 diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD index 935a39a5f..b90957cd6 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 diff --git a/user/xfce4-volumed-pulse/APKBUILD b/user/xfce4-volumed-pulse/APKBUILD index bfaa8f297..070e189e0 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 diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD index cf44747f1..f9d1dfeef 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%.*} diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD index d13a4dceb..e66232ca3 100644 --- a/user/xfconf/APKBUILD +++ b/user/xfconf/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=xfconf pkgver=4.14.1 pkgrel=0 diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD index af4013ff8..bbf373200 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 diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD index 7b5083068..03c23058a 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 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..96e346059 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 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..b74170b6d 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 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/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/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/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-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/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..4e8a19fc4 100644 --- a/user/xscreensaver/APKBUILD +++ b/user/xscreensaver/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=xscreensaver pkgver=5.43 pkgrel=0 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/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/xterm/APKBUILD b/user/xterm/APKBUILD index 1e4c02575..96d8d08f7 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/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=xterm pkgver=350 pkgrel=0 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/yubico-c/APKBUILD b/user/yubico-c/APKBUILD index 926ecf235..50e88d1c6 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 diff --git a/user/yubikey-personalization/APKBUILD b/user/yubikey-personalization/APKBUILD index 7fff47158..74b2a3f2f 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 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 } |