diff options
849 files changed, 16301 insertions, 2753 deletions
diff --git a/experimental/firefox-esr/APKBUILD b/experimental/firefox-esr/APKBUILD index 8a518d222..2a2e54066 100644 --- a/experimental/firefox-esr/APKBUILD +++ b/experimental/firefox-esr/APKBUILD @@ -1,9 +1,6 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=firefox-esr -pkgver=60.3.0 -_pkgver=$pkgver -_xulver=$pkgver +pkgver=60.5.0 pkgrel=0 pkgdesc="Firefox web browser" url="https://www.mozilla.org/en-US/firefox/organizations/faq/" @@ -29,7 +26,6 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox mallinfo.patch musl-pthread-setname.patch - fix-arm-atomics-grsec.patch fix-arm-version-detect.patch mozilla-build-arm.patch missing-header-s390x.patch @@ -42,6 +38,7 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox fix-mutex-build.patch proper-system-hunspell.patch rust-config.patch + shut-up-warning.patch skia.patch stackwalk-x86-ppc.patch webrtc-broken.patch @@ -50,9 +47,6 @@ source="https://ftp.mozilla.org/pub/firefox/releases/${pkgver}esr/source/firefox firefox-safe.desktop" builddir="$srcdir"/firefox-$pkgver -_mozappdir=/usr/lib/firefox - -# help our shared-object scanner to find the libs ldpath="$_mozappdir" unpack() { @@ -149,27 +143,27 @@ package() { EOF } -sha512sums="7ded25a38835fbd73a58085e24ad83308afee1784a3bf853d75093c1500ad46988f5865c106abdae938cfbd1fb10746cc1795ece7994fd7eba8a002158cf1bcd firefox-60.3.0esr.source.tar.xz +sha512sums="dd47e38a87a1339b733c06ea3f235576bf8dce414194ab308d0dda07bf15290afbbad92b8484732daa53cf6a48b57412f7f41e30ae0ac21144c8657b86047aec firefox-60.5.0esr.source.tar.xz 76e3e6f64f4dd1206106b2b73cca3ccd312a8d907010c382ab9e2f0a497fed297abf0654d4dd90c563e6dde6403e3f9084ce927bb275fec95be87bed8adf9257 mozconfig 0b3f1e4b9fdc868e4738b5c81fd6c6128ce8885b260affcb9a65ff9d164d7232626ce1291aaea70132b3e3124f5e13fef4d39326b8e7173e362a823722a85127 stab.h 09bc32cf9ee81b9cc6bb58ddbc66e6cc5c344badff8de3435cde5848e5a451e0172153231db85c2385ff05b5d9c20760cb18e4138dfc99060a9e960de2befbd5 fix-fortify-inline.patch 70863b985427b9653ce5e28d6064f078fb6d4ccf43dd1b68e72f97f44868fc0ce063161c39a4e77a0a1a207b7365d5dc7a7ca5e68c726825eba814f2b93e2f5d fix-seccomp-bpf.patch bdcd1b402d2ec94957ba5d08cbad7b1a7f59c251c311be9095208491a05abb05a956c79f27908e1f26b54a3679387b2f33a51e945b650671ad85c0a2d59a5a29 mallinfo.patch 3f535b1e4e9a5a0506ef6f6d9427a84fae1efa3c8e8d6b25b21046d2d04c132bde1a7a98e415067e5c542f699d89249b8cc3d925e0be4e96db498037429691ef musl-pthread-setname.patch -ed0d344c66fc8e1cc83a11e9858b32c42e841cbeedd9eb9438811e9fcc3593dc824a8336d00058d55836cedc970aeadd6a82c6dcd7bc0fb746e564d8b478cc6c fix-arm-atomics-grsec.patch 015e1ff6dbf920033982b5df95d869a0b7bf56c6964e45e50649ddf46d1ce09563458e45240c3ecb92808662b1300b67507f7af272ba184835d91068a9e7d5b0 fix-arm-version-detect.patch e61664bc93eadce5016a06a4d0684b34a05074f1815e88ef2613380d7b369c6fd305fb34f83b5eb18b9e3138273ea8ddcfdcb1084fdcaa922a1e5b30146a3b18 mozilla-build-arm.patch 6beba471b6a7fc229a9c105d58137f80cec07219e52bb9a666c787b37ca88635d6ec2eba651eccb5096429c2965709c9475c89839c255c3545f8c96c5d40f403 missing-header-s390x.patch ace7492f4fb0523c7340fdc09c831906f74fddad93822aff367135538dacd3f56288b907f5a04f53f94c76e722ba0bab73e28d83ec12d3e672554712e6b08613 bad-google-code.patch 61c7117345b4bcb045ce0287aa368d90dffd7331347021ff345d5a7c46097ffd2575f38711309ce7bdbbbec15561e03fdabcb16235ed8a325ccc8c9d5bba35a6 cmsghdr.patch -83b233e279846474bfb662d066e31f80be9055a022b126c638453ced46f70d3904dc114dbabd44800221a1bf3164350ea8c557c25d5e770e8871b7f2932c2427 endian-gfx.patch -31f0cf9663443410a996002ed0357c2ea21692ce965a30d8bfb65d0f1827173da8d8b5c831ccbc199ecbe7a577613be0dd54a09db08e620fe37e1ce977a7afb0 endianness-js.patch +11361b009d708e80afcf2eca8b02381be0c8314421eb439200c674cfa4e4bca15127f2d0dd11bf36f48d0e309d4424f949caf588f08458f8e9ba6812b83023ab endian-gfx.patch +363f1df1a78799783b4e9f887dc85d83ec83c6ec392aeacbd98dc89e543d0cd3b9d1964ce274142b44847a03c47f845cbf6fa7fa17a04b25bbaa37fc5d714730 endianness-js.patch a50b412edf9573a0bd04a43578b1c927967a616b73a5995eefb15bfa78fd2bd14e36ec05315a0703f6370ecd524e6bcb012e7285beb1245e9add9b8553acb79e fix-bug-1261392.patch d5d3ec190b1916d5c06f466a72124a3d438d90ea40d54e894105a9faf2aa2a6ce9cc21a0a80bd4408f7be867e5a660ee3d8aed40c8d1fb511cfb947739f45240 fix-mutex-build.patch 1a88c21c39d5878e2018463fe08dd3a960cdf10e650e06ef3e4f089a431800b50267d8749a7acde196bb47c45aa66058a6ed4fb4d60de2ab69e8a48cd5a109bc proper-system-hunspell.patch fd3b165e26ab931dd7eaf220d578c30b8772eab0a870710d59403c9823c2233ef941cd7eb25d1625d705de9e8a7138d0e8c4e227a185e9b687553132da96d81a rust-config.patch +21100340ff03f4257fa6a4b59e206d4d1b71c074ebae392ba616f9e6e6d4988a22eec69b40534221f9453ec3a58397fa4ab99b87abdcb7d22fabb13f9cc577d2 shut-up-warning.patch 8ef2bc4404601f66c7505f3e0a2f6d1d11e8f11e5a888dce4942cf27c86fbdbcdd66cb3d98738b7d9e25538793986140e75d51a893d22c70714ed98ef50a9894 skia.patch -d12ce112b97cbdba0748c5734a024b13032c5e0696efbd499764246e031d477b0f0a966aedc7b3bedd166bcdc2cc24d45bb9da5f678de9cff547bc6aa231cd16 stackwalk-x86-ppc.patch +e196c998a4029e4fc134fbe4b7455abb4b93644f7f07b88faef4eda900de225e72b124b5a9ab3492cbe398e17f8390d29b769a2544744a106bba6a5def540973 stackwalk-x86-ppc.patch 76409619464259e3ba52e38d640c5b6210a7fecdc75cf124c185ef356507d4d266a845e9fcdeb7766dcd547f70748123c4fa1670f6e52aadd001a3c866dc2d51 webrtc-broken.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/experimental/firefox-esr/endian-gfx.patch b/experimental/firefox-esr/endian-gfx.patch index ec81a9cee..ca92bf830 100644 --- a/experimental/firefox-esr/endian-gfx.patch +++ b/experimental/firefox-esr/endian-gfx.patch @@ -10,12 +10,10 @@ CLOSED TREE diff --git a/gfx/2d/Swizzle.cpp b/gfx/2d/Swizzle.cpp --- a/gfx/2d/Swizzle.cpp +++ b/gfx/2d/Swizzle.cpp -@@ -82,17 +82,17 @@ AlphaByteIndex(SurfaceFormat aFormat) +@@ -75,13 +75,13 @@ AlphaByteIndex(SurfaceFormat aFormat) // The endian-dependent bit shift to access RGB of a UINT32 pixel. - static constexpr uint32_t - RGBBitShift(SurfaceFormat aFormat) - { + static constexpr uint32_t RGBBitShift(SurfaceFormat aFormat) { #if MOZ_LITTLE_ENDIAN return 8 * RGBByteIndex(aFormat); #else @@ -25,8 +23,5 @@ diff --git a/gfx/2d/Swizzle.cpp b/gfx/2d/Swizzle.cpp } // The endian-dependent bit shift to access alpha of a UINT32 pixel. - static constexpr uint32_t - AlphaBitShift(SurfaceFormat aFormat) - { + static constexpr uint32_t AlphaBitShift(SurfaceFormat aFormat) { return (RGBBitShift(aFormat) + 24) % 32; - diff --git a/experimental/firefox-esr/endianness-js.patch b/experimental/firefox-esr/endianness-js.patch index 98e1bd092..1a04573ea 100644 --- a/experimental/firefox-esr/endianness-js.patch +++ b/experimental/firefox-esr/endianness-js.patch @@ -1,52 +1,44 @@ -# HG changeset patch -# User Steve Fink <sfink@mozilla.com> -# Date 1536603384 25200 -# Mon Sep 10 11:16:24 2018 -0700 -# Node ID f598dceb588d1adf503d30acf4e0915d07d34006 -# Parent b7dd3969261896020d7a9449d22f350a97e3517a -# EXP-Topic b1488552.enD -Bug 1488552 - JSString flags bit must alias the low 32 bits of JSObject.group_, not the high 32. r=tcampbell +Bug 1488552 - Ensure proper running on 64-bit and 32-bit BE platforms. diff --git a/js/src/gc/RelocationOverlay.h b/js/src/gc/RelocationOverlay.h --- a/js/src/gc/RelocationOverlay.h +++ b/js/src/gc/RelocationOverlay.h -@@ -29,24 +29,35 @@ struct Cell; +@@ -29,23 +29,34 @@ struct Cell; * This structure overlays a Cell that has been moved and provides a way to find * its new location. It's used during generational and compacting GC. */ - class RelocationOverlay - { - /* See comment in js/public/HeapAPI.h. */ - static const uint32_t Relocated = js::gc::Relocated; + class RelocationOverlay { + /* See comment in js/public/HeapAPI.h. */ + static const uint32_t Relocated = js::gc::Relocated; -+#if MOZ_LITTLE_ENDIAN - /* -- * Keep the low 32 bits untouched. Use them to distinguish strings from -+ * Keep the first 32 bits untouched. Use them to distinguish strings from - * objects in the nursery. - */ - uint32_t preserve_; ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 + /* +- * Keep the low 32 bits untouched. Use them to distinguish strings from ++ * Keep the first 32 bits untouched. Use them to distinguish strings from + * objects in the nursery. + */ + uint32_t preserve_; - /* Set to Relocated when moved. */ - uint32_t magic_; + /* Set to Relocated when moved. */ + uint32_t magic_; +#elif JS_BITS_PER_WORD == 64 -+ /* -+ * On big-endian, we need to reorder to keep preserve_ lined up with the -+ * low 32 bits of the aligned group_ pointer in JSObject. -+ */ -+ uint32_t magic_; -+ uint32_t preserve_; ++ /* ++ * On big-endian, we need to reorder to keep preserve_ lined up with the ++ * low 32 bits of the aligned group_ pointer in JSObject. ++ */ ++ uint32_t magic_; ++ uint32_t preserve_; +#else -+# error "Support for 32-bit big-endian architectures is untested. See bug 1488552." ++# error "Unknown endianness or word size" +#endif - /* The location |this| was moved to. */ - Cell* newLocation_; + /* The location |this| was moved to. */ + Cell* newLocation_; - /* A list entry to track all relocated things. */ - RelocationOverlay* next_; + /* A list entry to track all relocated things. */ + RelocationOverlay* next_; - public: + public: diff --git a/js/src/vm/StringType.h b/js/src/vm/StringType.h --- a/js/src/vm/StringType.h +++ b/js/src/vm/StringType.h @@ -68,54 +60,59 @@ diff --git a/js/src/vm/StringType.h b/js/src/vm/StringType.h #include "jsfriendapi.h" #include "builtin/String.h" -@@ -161,18 +162,30 @@ class JSString : public js::gc::Cell - static const size_t NUM_INLINE_CHARS_LATIN1 = 2 * sizeof(void*) / sizeof(JS::Latin1Char); - static const size_t NUM_INLINE_CHARS_TWO_BYTE = 2 * sizeof(void*) / sizeof(char16_t); - - /* Fields only apply to string types commented on the right. */ - struct Data - { - union { - struct { -+#if MOZ_LITTLE_ENDIAN - uint32_t flags; /* JSString */ - uint32_t length; /* JSString */ +@@ -168,8 +168,20 @@ class JSString : public js::gc::Cell + struct Data { + union { + struct { ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 + uint32_t flags; /* JSString */ + uint32_t length; /* JSString */ +#elif JS_BITS_PER_WORD == 64 -+ /* -+ * On big-endian, we need to reorder to keep flags lined up -+ * with the low 32 bits of the aligned group_ pointer in -+ * JSObject. -+ */ -+ uint32_t length; /* JSString */ -+ uint32_t flags; /* JSString */ ++ /* ++ * On big-endian, we need to reorder to keep flags lined up ++ * with the low 32 bits of the aligned group_ pointer in ++ * JSObject. ++ */ ++ uint32_t length; /* JSString */ ++ uint32_t flags; /* JSString */ +#else -+# error "Support for 32-bit big-endian architectures is untested. See bug 1488552." ++# error "Unknown endianness or word size" +#endif - }; - uintptr_t flattenData; /* JSRope (temporary while flattening) */ - } u1; - union { - union { - /* JS(Fat)InlineString */ - JS::Latin1Char inlineStorageLatin1[NUM_INLINE_CHARS_LATIN1]; - char16_t inlineStorageTwoByte[NUM_INLINE_CHARS_TWO_BYTE]; + }; + uintptr_t flattenData; /* JSRope (temporary while flattening) */ + } u1; --- thunderbird-60.2.1/js/src/gc/Marking-inl.h.old 2018-10-01 14:51:12.000000000 +0000 +++ thunderbird-60.2.1/js/src/gc/Marking-inl.h 2018-10-12 19:08:28.260000000 +0000 -@@ -92,10 +92,10 @@ - MOZ_ASSERT(!isForwarded()); - // The location of magic_ is important because it must never be valid to see - // the value Relocated there in a GC thing that has not been moved. -- static_assert(offsetof(RelocationOverlay, magic_) == offsetof(JSObject, group_) + sizeof(uint32_t), -- "RelocationOverlay::magic_ is in the wrong location"); -- static_assert(offsetof(RelocationOverlay, magic_) == offsetof(js::Shape, base_) + sizeof(uint32_t), -- "RelocationOverlay::magic_ is in the wrong location"); -+ //static_assert(offsetof(RelocationOverlay, magic_) == offsetof(JSObject, group_) + sizeof(uint32_t), -+ // "RelocationOverlay::magic_ is in the wrong location"); -+ //static_assert(offsetof(RelocationOverlay, magic_) == offsetof(js::Shape, base_) + sizeof(uint32_t), -+ // "RelocationOverlay::magic_ is in the wrong location"); - static_assert(offsetof(RelocationOverlay, magic_) == offsetof(JSString, d.u1.length), - "RelocationOverlay::magic_ is in the wrong location"); - magic_ = Relocated; +@@ -92,13 +92,29 @@ + MOZ_ASSERT(!isForwarded()); + // The location of magic_ is important because it must never be valid to see + // the value Relocated there in a GC thing that has not been moved. ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 ++ // On 32-bit, the magic_ aliases with whatever comes after the first ++ // pointer; on little-endian 64-bit, the magic_ aliases with the ++ // 32 most significant bits of the pointer, which are the second half. + static_assert(offsetof(RelocationOverlay, magic_) == + offsetof(JSObject, group_) + sizeof(uint32_t), + "RelocationOverlay::magic_ is in the wrong location"); + static_assert(offsetof(RelocationOverlay, magic_) == + offsetof(js::Shape, base_) + sizeof(uint32_t), + "RelocationOverlay::magic_ is in the wrong location"); ++#elif JS_BITS_PER_WORD == 64 ++ // On big-endian 64-bit, the magic_ aliases with the 32 most ++ // significant bits of the pointer, but now that's the first half. ++ static_assert(offsetof(RelocationOverlay, magic_) == ++ offsetof(JSObject, group_), ++ "RelocationOverlay::magic_ is in the wrong location"); ++ static_assert(offsetof(RelocationOverlay, magic_) == ++ offsetof(js::Shape, base_), ++ "RelocationOverlay::magic_ is in the wrong location"); ++#else ++# error "Unknown endianness or word size" ++#endif + static_assert( + offsetof(RelocationOverlay, magic_) == offsetof(JSString, d.u1.length), + "RelocationOverlay::magic_ is in the wrong location"); + magic_ = Relocated; --- thunderbird-60.2.1/js/src/jsfriendapi.h.old 2018-10-01 14:51:13.000000000 +0000 +++ thunderbird-60.2.1/js/src/jsfriendapi.h 2018-10-12 19:12:06.190000000 +0000 @@ -9,6 +9,7 @@ @@ -127,18 +124,18 @@ diff --git a/js/src/vm/StringType.h b/js/src/vm/StringType.h #include "mozilla/MemoryReporting.h" #include "mozilla/UniquePtr.h" @@ -640,8 +641,15 @@ - static const uint32_t LATIN1_CHARS_BIT = JS_BIT(6); - static const uint32_t EXTERNAL_FLAGS = LINEAR_BIT | NON_ATOM_BIT | JS_BIT(5); - static const uint32_t TYPE_FLAGS_MASK = JS_BIT(6) - 1; -+#if MOZ_LITTLE_ENDIAN - uint32_t flags; - uint32_t length; + static const uint32_t LATIN1_CHARS_BIT = JS_BIT(6); + static const uint32_t EXTERNAL_FLAGS = LINEAR_BIT | NON_ATOM_BIT | JS_BIT(5); + static const uint32_t TYPE_FLAGS_MASK = JS_BIT(6) - 1; ++#if MOZ_LITTLE_ENDIAN || JS_BITS_PER_WORD == 32 + uint32_t flags; + uint32_t length; +#elif JS_BITS_PER_WORD == 64 -+ uint32_t length; -+ uint32_t flags; ++ uint32_t length; ++ uint32_t flags; +#else -+# error "Support for 32-bit big-endian architectures is untested. See bug 1488552." ++# error "Unknown endianness or word size" +#endif - union { - const JS::Latin1Char* nonInlineCharsLatin1; - const char16_t* nonInlineCharsTwoByte; + union { + const JS::Latin1Char* nonInlineCharsLatin1; + const char16_t* nonInlineCharsTwoByte; diff --git a/experimental/firefox-esr/fix-arm-atomics-grsec.patch b/experimental/firefox-esr/fix-arm-atomics-grsec.patch deleted file mode 100644 index 0eb58f093..000000000 --- a/experimental/firefox-esr/fix-arm-atomics-grsec.patch +++ /dev/null @@ -1,306 +0,0 @@ ---- mozilla-release/ipc/chromium/src/base/atomicops_internals_arm_gcc.h.orig -+++ mozilla-release/ipc/chromium/src/base/atomicops_internals_arm_gcc.h -@@ -12,43 +35,194 @@ - namespace base { - namespace subtle { - --// 0xffff0fc0 is the hard coded address of a function provided by --// the kernel which implements an atomic compare-exchange. On older --// ARM architecture revisions (pre-v6) this may be implemented using --// a syscall. This address is stable, and in active use (hard coded) --// by at least glibc-2.7 and the Android C library. --typedef Atomic32 (*LinuxKernelCmpxchgFunc)(Atomic32 old_value, -- Atomic32 new_value, -- volatile Atomic32* ptr); --LinuxKernelCmpxchgFunc pLinuxKernelCmpxchg __attribute__((weak)) = -- (LinuxKernelCmpxchgFunc) 0xffff0fc0; -+// Memory barriers on ARM are funky, but the kernel is here to help: -+// -+// * ARMv5 didn't support SMP, there is no memory barrier instruction at -+// all on this architecture, or when targeting its machine code. -+// -+// * Some ARMv6 CPUs support SMP. A full memory barrier can be produced by -+// writing a random value to a very specific coprocessor register. -+// -+// * On ARMv7, the "dmb" instruction is used to perform a full memory -+// barrier (though writing to the co-processor will still work). -+// However, on single core devices (e.g. Nexus One, or Nexus S), -+// this instruction will take up to 200 ns, which is huge, even though -+// it's completely un-needed on these devices. -+// -+// * There is no easy way to determine at runtime if the device is -+// single or multi-core. However, the kernel provides a useful helper -+// function at a fixed memory address (0xffff0fa0), which will always -+// perform a memory barrier in the most efficient way. I.e. on single -+// core devices, this is an empty function that exits immediately. -+// On multi-core devices, it implements a full memory barrier. -+// -+// * This source could be compiled to ARMv5 machine code that runs on a -+// multi-core ARMv6 or ARMv7 device. In this case, memory barriers -+// are needed for correct execution. Always call the kernel helper, even -+// when targeting ARMv5TE. -+// - --typedef void (*LinuxKernelMemoryBarrierFunc)(void); --LinuxKernelMemoryBarrierFunc pLinuxKernelMemoryBarrier __attribute__((weak)) = -- (LinuxKernelMemoryBarrierFunc) 0xffff0fa0; -+inline void MemoryBarrier() { -+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \ -+ defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) -+ __asm__ __volatile__("dmb ish" ::: "memory"); -+#elif defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ -+ defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \ -+ defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) -+ __asm__ __volatile__("mcr p15,0,r0,c7,c10,5" ::: "memory"); -+#elif defined(__linux__) || defined(__ANDROID__) -+ // Note: This is a function call, which is also an implicit compiler barrier. -+ typedef void (*KernelMemoryBarrierFunc)(); -+ ((KernelMemoryBarrierFunc)0xffff0fa0)(); -+#error MemoryBarrier() is not implemented on this platform. -+#endif -+} - -+// An ARM toolchain would only define one of these depending on which -+// variant of the target architecture is being used. This tests against -+// any known ARMv6 or ARMv7 variant, where it is possible to directly -+// use ldrex/strex instructions to implement fast atomic operations. -+#if defined(__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) || \ -+ defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) || \ -+ defined(__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) || \ -+ defined(__ARM_ARCH_6K__) || defined(__ARM_ARCH_6Z__) || \ -+ defined(__ARM_ARCH_6ZK__) || defined(__ARM_ARCH_6T2__) - - inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { -- Atomic32 prev_value = *ptr; -+ Atomic32 prev_value; -+ int reloop; - do { -- if (!pLinuxKernelCmpxchg(old_value, new_value, -- const_cast<Atomic32*>(ptr))) { -- return old_value; -- } -- prev_value = *ptr; -- } while (prev_value == old_value); -+ // The following is equivalent to: -+ // -+ // prev_value = LDREX(ptr) -+ // reloop = 0 -+ // if (prev_value != old_value) -+ // reloop = STREX(ptr, new_value) -+ __asm__ __volatile__(" ldrex %0, [%3]\n" -+ " mov %1, #0\n" -+ " cmp %0, %4\n" -+#ifdef __thumb2__ -+ " it eq\n" -+#endif -+ " strexeq %1, %5, [%3]\n" -+ : "=&r"(prev_value), "=&r"(reloop), "+m"(*ptr) -+ : "r"(ptr), "r"(old_value), "r"(new_value) -+ : "cc", "memory"); -+ } while (reloop != 0); - return prev_value; - } - -+inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, -+ Atomic32 old_value, -+ Atomic32 new_value) { -+ Atomic32 result = NoBarrier_CompareAndSwap(ptr, old_value, new_value); -+ MemoryBarrier(); -+ return result; -+} -+ -+inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, -+ Atomic32 old_value, -+ Atomic32 new_value) { -+ MemoryBarrier(); -+ return NoBarrier_CompareAndSwap(ptr, old_value, new_value); -+} -+ -+inline Atomic32 NoBarrier_AtomicIncrement(volatile Atomic32* ptr, -+ Atomic32 increment) { -+ Atomic32 value; -+ int reloop; -+ do { -+ // Equivalent to: -+ // -+ // value = LDREX(ptr) -+ // value += increment -+ // reloop = STREX(ptr, value) -+ // -+ __asm__ __volatile__(" ldrex %0, [%3]\n" -+ " add %0, %0, %4\n" -+ " strex %1, %0, [%3]\n" -+ : "=&r"(value), "=&r"(reloop), "+m"(*ptr) -+ : "r"(ptr), "r"(increment) -+ : "cc", "memory"); -+ } while (reloop); -+ return value; -+} -+ -+inline Atomic32 Barrier_AtomicIncrement(volatile Atomic32* ptr, -+ Atomic32 increment) { -+ // TODO(digit): Investigate if it's possible to implement this with -+ // a single MemoryBarrier() operation between the LDREX and STREX. -+ // See http://crbug.com/246514 -+ MemoryBarrier(); -+ Atomic32 result = NoBarrier_AtomicIncrement(ptr, increment); -+ MemoryBarrier(); -+ return result; -+} -+ - inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, - Atomic32 new_value) { - Atomic32 old_value; -+ int reloop; - do { -+ // old_value = LDREX(ptr) -+ // reloop = STREX(ptr, new_value) -+ __asm__ __volatile__(" ldrex %0, [%3]\n" -+ " strex %1, %4, [%3]\n" -+ : "=&r"(old_value), "=&r"(reloop), "+m"(*ptr) -+ : "r"(ptr), "r"(new_value) -+ : "cc", "memory"); -+ } while (reloop != 0); -+ return old_value; -+} -+ -+// This tests against any known ARMv5 variant. -+#elif defined(__ARM_ARCH_5__) || defined(__ARM_ARCH_5T__) || \ -+ defined(__ARM_ARCH_5TE__) || defined(__ARM_ARCH_5TEJ__) -+ -+// The kernel also provides a helper function to perform an atomic -+// compare-and-swap operation at the hard-wired address 0xffff0fc0. -+// On ARMv5, this is implemented by a special code path that the kernel -+// detects and treats specially when thread pre-emption happens. -+// On ARMv6 and higher, it uses LDREX/STREX instructions instead. -+// -+// Note that this always perform a full memory barrier, there is no -+// need to add calls MemoryBarrier() before or after it. It also -+// returns 0 on success, and 1 on exit. -+// -+// Available and reliable since Linux 2.6.24. Both Android and ChromeOS -+// use newer kernel revisions, so this should not be a concern. -+namespace { -+ -+inline int LinuxKernelCmpxchg(Atomic32 old_value, -+ Atomic32 new_value, -+ volatile Atomic32* ptr) { -+ typedef int (*KernelCmpxchgFunc)(Atomic32, Atomic32, volatile Atomic32*); -+ return ((KernelCmpxchgFunc)0xffff0fc0)(old_value, new_value, ptr); -+} -+ -+} // namespace -+ -+inline Atomic32 NoBarrier_CompareAndSwap(volatile Atomic32* ptr, -+ Atomic32 old_value, -+ Atomic32 new_value) { -+ Atomic32 prev_value; -+ for (;;) { -+ prev_value = *ptr; -+ if (prev_value != old_value) -+ return prev_value; -+ if (!LinuxKernelCmpxchg(old_value, new_value, ptr)) -+ return old_value; -+ } -+} -+ -+inline Atomic32 NoBarrier_AtomicExchange(volatile Atomic32* ptr, -+ Atomic32 new_value) { -+ Atomic32 old_value; -+ do { - old_value = *ptr; -- } while (pLinuxKernelCmpxchg(old_value, new_value, -- const_cast<Atomic32*>(ptr))); -+ } while (LinuxKernelCmpxchg(old_value, new_value, ptr)); - return old_value; - } - -@@ -63,36 +237,57 @@ - // Atomic exchange the old value with an incremented one. - Atomic32 old_value = *ptr; - Atomic32 new_value = old_value + increment; -- if (pLinuxKernelCmpxchg(old_value, new_value, -- const_cast<Atomic32*>(ptr)) == 0) { -+ if (!LinuxKernelCmpxchg(old_value, new_value, ptr)) { - // The exchange took place as expected. - return new_value; - } - // Otherwise, *ptr changed mid-loop and we need to retry. - } -- - } - - inline Atomic32 Acquire_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { -- return NoBarrier_CompareAndSwap(ptr, old_value, new_value); -+ Atomic32 prev_value; -+ for (;;) { -+ prev_value = *ptr; -+ if (prev_value != old_value) { -+ // Always ensure acquire semantics. -+ MemoryBarrier(); -+ return prev_value; -+ } -+ if (!LinuxKernelCmpxchg(old_value, new_value, ptr)) -+ return old_value; -+ } - } - - inline Atomic32 Release_CompareAndSwap(volatile Atomic32* ptr, - Atomic32 old_value, - Atomic32 new_value) { -- return NoBarrier_CompareAndSwap(ptr, old_value, new_value); -+ // This could be implemented as: -+ // MemoryBarrier(); -+ // return NoBarrier_CompareAndSwap(); -+ // -+ // But would use 3 barriers per succesful CAS. To save performance, -+ // use Acquire_CompareAndSwap(). Its implementation guarantees that: -+ // - A succesful swap uses only 2 barriers (in the kernel helper). -+ // - An early return due to (prev_value != old_value) performs -+ // a memory barrier with no store, which is equivalent to the -+ // generic implementation above. -+ return Acquire_CompareAndSwap(ptr, old_value, new_value); - } - -+#else -+# error "Your CPU's ARM architecture is not supported yet" -+#endif -+ -+// NOTE: Atomicity of the following load and store operations is only -+// guaranteed in case of 32-bit alignement of |ptr| values. -+ - inline void NoBarrier_Store(volatile Atomic32* ptr, Atomic32 value) { - *ptr = value; - } - --inline void MemoryBarrier() { -- pLinuxKernelMemoryBarrier(); --} -- - inline void Acquire_Store(volatile Atomic32* ptr, Atomic32 value) { - *ptr = value; - MemoryBarrier(); -@@ -103,9 +298,7 @@ - *ptr = value; - } - --inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { -- return *ptr; --} -+inline Atomic32 NoBarrier_Load(volatile const Atomic32* ptr) { return *ptr; } - - inline Atomic32 Acquire_Load(volatile const Atomic32* ptr) { - Atomic32 value = *ptr; -@@ -118,7 +311,6 @@ - return *ptr; - } - --} // namespace base::subtle --} // namespace base -+} } // namespace base::subtle - - #endif // BASE_ATOMICOPS_INTERNALS_ARM_GCC_H_ diff --git a/experimental/firefox-esr/shut-up-warning.patch b/experimental/firefox-esr/shut-up-warning.patch new file mode 100644 index 000000000..ffba50436 --- /dev/null +++ b/experimental/firefox-esr/shut-up-warning.patch @@ -0,0 +1,11 @@ +--- firefox-52.9.0esr/gfx/2d/HelpersCairo.h.old 2017-04-11 02:13:04.000000000 +0000 ++++ firefox-52.9.0esr/gfx/2d/HelpersCairo.h 2018-12-08 18:45:01.880000000 +0000 +@@ -160,7 +160,7 @@ + case SurfaceFormat::R5G6B5_UINT16: + return CAIRO_FORMAT_RGB16_565; + default: +- gfxCriticalError() << "Unknown image format " << (int)format; ++ //gfxCriticalError() << "Unknown image format " << (int)format; + return CAIRO_FORMAT_ARGB32; + } + } diff --git a/experimental/firefox-esr/stackwalk-x86-ppc.patch b/experimental/firefox-esr/stackwalk-x86-ppc.patch index 5a4189847..3659ef8d2 100644 --- a/experimental/firefox-esr/stackwalk-x86-ppc.patch +++ b/experimental/firefox-esr/stackwalk-x86-ppc.patch @@ -4,13 +4,13 @@ #define MOZ_STACKWALK_SUPPORTS_MACOSX 0 #endif --#if (defined(linux) && \ +-#if (defined(linux) && \ - ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ - defined(HAVE__UNWIND_BACKTRACE))) -#define MOZ_STACKWALK_SUPPORTS_LINUX 1 -#else #define MOZ_STACKWALK_SUPPORTS_LINUX 0 -#endif - + #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) #define HAVE___LIBC_STACK_END 1 diff --git a/experimental/lmms/APKBUILD b/experimental/lmms/APKBUILD new file mode 100644 index 000000000..0ab893cb8 --- /dev/null +++ b/experimental/lmms/APKBUILD @@ -0,0 +1,66 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=lmms +pkgver=1.2.0_rc7 +pkgrel=0 +pkgdesc="Music production software" +url="https://lmms.io/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="alsa-lib-dev cmake fftw-dev fltk-dev fluidsynth-dev lame-dev + libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev libxml2-dev + pulseaudio-dev qt5-qtbase-dev qt5-qttools-dev qt5-qtx11extras-dev + extra-cmake-modules xcb-util-dev xcb-util-keysyms-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="lmms-${pkgver/_/-}.tar.gz::https://github.com/LMMS/lmms/archive/v${pkgver/_/-}.tar.gz + https://distfiles.adelielinux.org/source/qt5-x11embed-20171106.tar.xz + rpmalloc-1.3.1.tar.gz::https://github.com/rampantpixels/rpmalloc/archive/1.3.1.tar.gz + isinff.patch + thread.patch + use-system-ecm.patch + " +builddir="$srcdir"/lmms-${pkgver/_/-} + +prepare() { + cd "$builddir" + rmdir src/3rdparty/qt5-x11embed + rmdir src/3rdparty/rpmalloc/rpmalloc + mv "$srcdir"/qt5-x11embed-20171106 src/3rdparty/qt5-x11embed + mv "$srcdir"/rpmalloc-1.3.1 src/3rdparty/rpmalloc/rpmalloc + default_prepare +} + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + -DWANT_QT5=ON \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e16b5bd050a0a5f3ac9312654cd3ce65e497258dead836fb222918af4eb71ea23175292b7943bff495e0b53445b70e80d26bebe059e46724f39f8e8f29d37dd6 lmms-1.2.0-rc7.tar.gz +d00b5dfb2931ae1614b419b06f795c5627e51eb2159612eb058484c2b1c6817532d4e321ce514518ce2009d8c7f886e384d6cc8b8428b05b268db3f28bb90e63 qt5-x11embed-20171106.tar.xz +c9a42c635774285a8467eaa1931109528c08931c73873c366d0e4949921c8956a31db7422378cd548bbbaf24d0fcc41470ab6751e67238db53677832e5fb5db4 rpmalloc-1.3.1.tar.gz +8896727616d361d22876ce353adeaa587a506f4fa649575f8444e89c5b86165c6e4c29b5862221530e5840023bd012bf6183666b958b7841dbf2cde1f2924353 isinff.patch +e6b5b87af969bf8c1c24cef2748485d86d58139704efdebf0645c376c9c40de54b0ff08d9fd3b41865670539c7dac50e4178d06dfb779e1d8d4fc7cdd08c4a32 thread.patch +70f1467340f7f5c9e94af702e036aa3355c036b13523a9d5183d5b0fb7c18f8878ec92c6d84a49837739b207bd0546ef5264a4e17f30ddf27b6f8eb9d09c4c76 use-system-ecm.patch" diff --git a/experimental/lmms/isinff.patch b/experimental/lmms/isinff.patch new file mode 100644 index 000000000..6c83c5052 --- /dev/null +++ b/experimental/lmms/isinff.patch @@ -0,0 +1,11 @@ +--- lmms-1.2.0-rc7/include/lmms_math.h.old 2018-09-25 07:47:51.000000000 +0000 ++++ lmms-1.2.0-rc7/include/lmms_math.h 2019-01-20 19:22:47.190000000 +0000 +@@ -34,7 +34,7 @@ + #include <cmath> + using namespace std; + +-#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__) ++#if defined (LMMS_BUILD_WIN32) || defined (LMMS_BUILD_APPLE) || defined(LMMS_BUILD_HAIKU) || defined (__FreeBSD__) || defined(__OpenBSD__) || (defined(LMMS_BUILD_LINUX) && !defined(__GLIBC__)) + #ifndef isnanf + #define isnanf(x) isnan(x) + #endif diff --git a/experimental/lmms/thread.patch b/experimental/lmms/thread.patch new file mode 100644 index 000000000..f8c293f4e --- /dev/null +++ b/experimental/lmms/thread.patch @@ -0,0 +1,25 @@ +From c9c22e4a0e7c0de0cfaf8df101443d2d53fbdb31 Mon Sep 17 00:00:00 2001 +From: Lukas W <lukaswhl@gmail.com> +Date: Fri, 24 Nov 2017 13:30:15 +0100 +Subject: [PATCH] shared_object: Use deleteLater in unref for thread safety + +This makes unref safe when it's not called from within the object's thread. + +Fixes #4009 +--- + include/shared_object.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/shared_object.h b/include/shared_object.h +index f39cb0e8bf..fe7a3d8e06 100644 +--- a/include/shared_object.h ++++ b/include/shared_object.h +@@ -61,7 +61,7 @@ class sharedObject + + if ( deleteObject ) + { +- delete object; ++ object->deleteLater(); + } + } + diff --git a/experimental/lmms/use-system-ecm.patch b/experimental/lmms/use-system-ecm.patch new file mode 100644 index 000000000..8fcafc8d3 --- /dev/null +++ b/experimental/lmms/use-system-ecm.patch @@ -0,0 +1,11 @@ +--- lmms-1.2.0-rc7/src/3rdparty/qt5-x11embed/CMakeLists.txt.old 2017-11-06 18:24:12.000000000 +0000 ++++ lmms-1.2.0-rc7/src/3rdparty/qt5-x11embed/CMakeLists.txt 2019-01-20 19:14:20.430000000 +0000 +@@ -1,7 +1,7 @@ + cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) + project(qt5-x11embed) + +-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/ECM/find-modules") ++list(APPEND CMAKE_MODULE_PATH "/usr/share/ECM/find-modules") + + find_package(Qt5Core COMPONENTS Private REQUIRED) + find_package(Qt5Widgets COMPONENTS Private REQUIRED) diff --git a/experimental/mariadb/APKBUILD b/experimental/mariadb/APKBUILD new file mode 100644 index 000000000..a99de6b25 --- /dev/null +++ b/experimental/mariadb/APKBUILD @@ -0,0 +1,110 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=mariadb +pkgver=10.3.12 +pkgrel=0 +pkgdesc="Open source database server" +url="https://mariadb.org/" +arch="all" +options="!checkroot" # Tests must be run as normal user. +license="GPL-2.0-only" +pkgusers="mysql" +pkggroups="mysql" +depends="$pkgname-common" +depends_dev="openssl-dev zlib-dev" +makedepends="$depends_dev byacc cmake curl-dev libarchive-dev libedit-dev + libevent-dev libxml2-dev ncurses-dev pcre-dev xz-dev" +install="$pkgname.pre-install" +subpackages="$pkgname-doc $pkgname-openrc" +source="https://downloads.mariadb.org/interstitial/mariadb-$pkgver/source/mariadb-$pkgver.tar.gz + mariadb.initd + " + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS -DNDEBUG" \ + -DCMAKE_C_FLAGS="$CFLAGS -DNDEBUG" \ + -DMYSQL_DATADIR="/var/lib/mysql" \ + -DSYSCONFDIR="/etc/mysql" \ + -DINSTALL_BINDIR=bin \ + -DINSTALL_DOCDIR=share/doc/$pkgname-$pkgver \ + -DINSTALL_DOCREADMEDIR=share/doc/$pkgname-$pkgver \ + -DINSTALL_INCLUDEDIR=include/mysql \ + -DINSTALL_LIBDIR=lib \ + -DINSTALL_MANDIR=share/man \ + -DINSTALL_MYSQLSHAREDIR=share/mariadb \ + -DINSTALL_PLUGINDIR=lib/mariadb/plugin \ + -DINSTALL_SCRIPTDIR=share/mariadb/scripts \ + -DINSTALL_MYSQLDATADIR="/var/lib/mysql" \ + -DINSTALL_SBINDIR=sbin \ + -DINSTALL_SUPPORTFILESDIR="/usr/share/mariadb" \ + -DWITH_COMMENT="${DISTRO_NAME:-Adélie Linux}" \ + -DWITH_UNIT_TESTS=ON \ + -DWITH_LIBEDIT=1 \ + -DWITH_ZLIB=system \ + -DWITHOUT_LIBWRAP=1 \ + -DENABLED_LOCAL_INFILE=1 \ + -DMYSQL_UNIX_ADDR="/var/run/mysqld/mysqld.sock" \ + -DINSTALL_UNIX_ADDRDIR="/var/run/mysqld/mysqld.sock" \ + -DWITH_DEFAULT_COMPILER_OPTIONS=0 \ + -DWITH_DEFAULT_FEATURE_SET=0 \ + -DPKG_CONFIG_EXECUTABLE="/usr/bin/pkgconf" \ + -DPLUGIN_AUTH_GSSAPI=NO \ + -DAUTH_GSSAPI_PLUGIN_TYPE=OFF \ + -DCONC_WITH_EXTERNAL_ZLIB=YES \ + -DWITH_EXTERNAL_ZLIB=YES \ + -DSUFFIX_INSTALL_DIR="" \ + -DWITH_UNITTEST=OFF \ + -DCONNECT_WITH_MYSQL=ON \ + -DCONNECT_WITH_LIBXML2=system \ + -DCONNECT_WITH_ODBC=NO \ + -DCONNECT_WITH_JDBC=NO \ + -DPLUGIN_ARCHIVE=YES \ + -DPLUGIN_ARIA=YES \ + -DPLUGIN_BLACKHOLE=YES \ + -DPLUGIN_CASSANDRA=NO \ + -DPLUGIN_CSV=YES \ + -DPLUGIN_MYISAM=YES \ + -DWITH_ASAN=OFF \ + -DWITH_EMBEDDED_SERVER=ON \ + -DWITH_INNODB_BZIP2=OFF \ + -DWITH_INNODB_LZ4=OFF \ + -DWITH_INNODB_LZMA=ON \ + -DWITH_INNODB_LZO=OFF \ + -DWITH_INNODB_SNAPPY=OFF \ + -DWITH_JEMALLOC=NO \ + -DWITH_LIBARCHIVE=system \ + -DWITH_LIBNUMA=NO \ + -DWITH_LIBWRAP=OFF \ + -DWITH_LIBWSEP=OFF \ + -DWITH_MARIABACKUP=ON \ + -DWITH_PCRE=system \ + -DWITH_SYSTEMD=no \ + -DWITH_SSL=system \ + -DWITH_VALGRIND=OFF \ + -DWITH_ZLIB=system \ + -DSKIP_TESTS=ON + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + install -m644 -D "$srcdir"/mariadb.initd "$pkgdir"/etc/init.d/mariadb + rm -r "$pkgdir"/usr/mysql-test +} + +sha512sums="9dd2939684c4591db306be6afb34663626dfaae133f88dd31125c759dce16b9e9d767a9254e30d9ee5fa2ea027e223dd4799effba8a8b0e4638d5de9e2512003 mariadb-10.3.12.tar.gz +06751768cb00d2e433655635c38d267ef25084a5830ff40e719ac579223c7192dc34b43f919ab6faf480094632327511cbd22456064dde2d04dc15648b9e3b9f mariadb.initd" diff --git a/experimental/mariadb/mariadb.initd b/experimental/mariadb/mariadb.initd new file mode 100644 index 000000000..143ca8ff5 --- /dev/null +++ b/experimental/mariadb/mariadb.initd @@ -0,0 +1,40 @@ +#!/sbin/openrc-run + +getconf() { + v=$(my_print_defaults --mysqld | grep ^--$1) + [ -z $v ] && echo $2 || echo ${v#*=} +} + +retry="60" +extra_stopped_commands="setup" +command="/usr/bin/mysqld_safe" +command_args="--syslog --nowatch" +depend() { + use net + need localmount +} + +setup() { + ebegin "Creating a new MySQL database" + mysql_install_db --user=mysql --rpm + eend $? +} + +start_pre() { + pidfile=$(getconf pid-file "/run/mysqld/mysqld.pid") + command_args="$command_args --pid-file=$pidfile" + required_dirs=$(getconf datadir "/var/lib/mysql") + if [ ! -d $required_dirs/mysql ]; then + eerror "Datadir '$required_dirs' is empty or invalid." + eerror "Run '/etc/init.d/mariadb setup' to create new database." + fi +} + +start_post() { + ewaitfile 10 $(getconf socket "/run/mysqld/mysqld.sock") +} + +stop_pre() { + pidfile=$(getconf pid-file "/run/mysqld/mysqld.pid") +} + diff --git a/experimental/mariadb/mariadb.pre-install b/experimental/mariadb/mariadb.pre-install new file mode 100644 index 000000000..ec71275ca --- /dev/null +++ b/experimental/mariadb/mariadb.pre-install @@ -0,0 +1,4 @@ +#!/bin/sh + +groupadd -g 60 -r mysql +useradd -u 60 -c "MariaDB Database User" -d /var/lib/mysql -M -N -G mysql -r -s /sbin/nologin mysql diff --git a/system/fortify-headers/APKBUILD b/legacy/fortify-headers/APKBUILD index 33ee4e317..33ee4e317 100644 --- a/system/fortify-headers/APKBUILD +++ b/legacy/fortify-headers/APKBUILD diff --git a/system/fortify-headers/extension-cpp-fix.patch b/legacy/fortify-headers/extension-cpp-fix.patch index fc7bbb5f8..fc7bbb5f8 100644 --- a/system/fortify-headers/extension-cpp-fix.patch +++ b/legacy/fortify-headers/extension-cpp-fix.patch diff --git a/legacy/mkcfm/APKBUILD b/legacy/mkcfm/APKBUILD new file mode 100644 index 000000000..ab4c152a3 --- /dev/null +++ b/legacy/mkcfm/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=mkcfm +pkgver=1.0.1 +pkgrel=0 +pkgdesc="Utility for creating summaries of font metric files" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libfontenc-dev libfs-dev libx11-dev libxfont-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/mkcfm-$pkgver.tar.gz + constise.patch + " + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="fabd9e2a711b960356178f9b52a2e720c4f33699c125dd82831d7e5a84f33dee230ff1d4c1a4019900fc190779f1c7770a775037c06a226723038e6440900fd2 mkcfm-1.0.1.tar.gz +6dffe376f23a18c536004df70788c2725098c5a8d068538a98be0e1fbcda93709ba7968c862095d5bb807be652978ba9fd5b3f097eb8dc88343ade0989dc3a83 constise.patch" diff --git a/legacy/mkcfm/constise.patch b/legacy/mkcfm/constise.patch new file mode 100644 index 000000000..aff209ecf --- /dev/null +++ b/legacy/mkcfm/constise.patch @@ -0,0 +1,11 @@ +--- mkcfm-1.0.1/mkcfm.c.old 2005-12-08 17:54:40.000000000 +0000 ++++ mkcfm-1.0.1/mkcfm.c 2018-12-31 07:32:01.460000000 +0000 +@@ -194,7 +194,7 @@ + + + Atom +-MakeAtom(char *p, unsigned len, int makeit) ++MakeAtom(const char *p, unsigned len, int makeit) + { + return *p; + } diff --git a/legacy/xbacklight/APKBUILD b/legacy/xbacklight/APKBUILD new file mode 100644 index 000000000..215baad9a --- /dev/null +++ b/legacy/xbacklight/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xbacklight +pkgver=1.2.2 +pkgrel=0 +pkgdesc="X11 backlight brightness adjustment utility" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="!acpilight" # both provide /usr/bin/xbacklight +makedepends="util-macros xcb-util-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xbacklight-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4dca70ef8e3494b19ea126c46395807cddc007b2b09a133810daeb77ae27fa36ac4eec7813828248fc195abe27f59700cfa58ee65ef3a020a51f73e5107678ec xbacklight-1.2.2.tar.bz2" diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD index 22eeeba55..4cda8968f 100644 --- a/system/adelie-base/APKBUILD +++ b/system/adelie-base/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-base pkgver=0.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="The Adélie Linux Base System" url="https://www.adelielinux.org/" arch="noarch" @@ -94,6 +94,7 @@ devkit() { } docs() { + depends="" pkgdesc="Metapackage that will magically install all documentation for your system" mkdir -p "$subpkgdir" return 0 diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD index 746468fab..40dfcb272 100644 --- a/system/apk-tools/APKBUILD +++ b/system/apk-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> pkgname=apk-tools -pkgver=2.10.1 +pkgver=2.10.3 pkgrel=0 pkgdesc="Alpine Package Keeper - package manager" url="https://git.alpinelinux.org/cgit/apk-tools/" @@ -13,6 +13,7 @@ makedepends_host="zlib-dev openssl openssl-dev linux-headers" makedepends="$makedepends_build $makedepends_host" subpackages="$pkgname-static" source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz + pmmx.patch " prepare() { @@ -66,4 +67,5 @@ static() { "$subpkgdir"/sbin/apk.static } -sha512sums="f994dba20b9ba7ee0ad4cbd9d137f65b814851f348f0d5eb75eb60c7d6a21f88648b472239e14298eaf1348c517de00652432e7f8c8abd54565914c7d49e3cd3 apk-tools-2.10.1.tar.xz" +sha512sums="1b190cfd04c69369bd4f2b708d4df0f8cf2937e1580c95138fd2c2257e7604d015deaca10a9fe0da6742981caadb6b067c15e417a1951866f781b8a5c71c98ee apk-tools-2.10.3.tar.xz +746d00ce2af554a25db7ecea2b0a4d8f7399d2560efb6bf59ea144012d0163d3e0bad84c799bd706e8be6c0a543d4e35728d6beb269fddbbea626384009129cb pmmx.patch" diff --git a/system/apk-tools/pmmx.patch b/system/apk-tools/pmmx.patch new file mode 100644 index 000000000..1b19edc94 --- /dev/null +++ b/system/apk-tools/pmmx.patch @@ -0,0 +1,11 @@ +--- apk-tools-2.10.1/src/apk_defines.h.old 2018-09-10 08:04:03.000000000 +0000 ++++ apk-tools-2.10.1/src/apk_defines.h 2019-01-04 03:31:41.900000000 +0000 +@@ -88,7 +88,7 @@ + #if defined(__x86_64__) + #define APK_DEFAULT_ARCH "x86_64" + #elif defined(__i386__) +-#define APK_DEFAULT_ARCH "x86" ++#define APK_DEFAULT_ARCH "pmmx" + #elif defined(__powerpc__) && !defined(__powerpc64__) + #define APK_DEFAULT_ARCH "ppc" + #elif defined(__powerpc64__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ diff --git a/system/bison/APKBUILD b/system/bison/APKBUILD index 921a1fdf3..a0a27f08f 100644 --- a/system/bison/APKBUILD +++ b/system/bison/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bison pkgver=3.1 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU general-purpose parser generator" arch="all" [ -n "$BOOTSTRAP" ] && options="!check" @@ -11,6 +11,7 @@ url="https://www.gnu.org/software/bison/bison.html" depends="m4" checkdepends="bison flex" makedepends="perl" +provider_priority=1 subpackages="$pkgname-doc $pkgname-lang" source="ftp://ftp.gnu.org/gnu/bison/${pkgname}-${pkgver}.tar.xz" diff --git a/system/bsd-compat-headers/APKBUILD b/system/bsd-compat-headers/APKBUILD new file mode 100644 index 000000000..f7f5036c0 --- /dev/null +++ b/system/bsd-compat-headers/APKBUILD @@ -0,0 +1,31 @@ +# Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org> +pkgname=bsd-compat-headers +pkgver=0.7.1 +pkgrel=1 +pkgdesc="Compatibility files for building BSD software" +url=" " +arch="noarch" +options="!check" # Just header files. +license="BSD-2-Clause AND BSD-3-Clause" +depends="" +makedepends="" +subpackages="" +source="sys-cdefs.h + sys-queue.h + sys-tree.h + " + +package() { + mkdir -p "$pkgdir" + case "$CLIBC" in + musl) + install -D "$srcdir"/sys-cdefs.h "$pkgdir"/usr/include/sys/cdefs.h + install -D "$srcdir"/sys-queue.h "$pkgdir"/usr/include/sys/queue.h + install -D "$srcdir"/sys-tree.h "$pkgdir"/usr/include/sys/tree.h + ;; + esac +} + +sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28 sys-cdefs.h +2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750 sys-queue.h +07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844 sys-tree.h" diff --git a/system/libc-dev/sys-cdefs.h b/system/bsd-compat-headers/sys-cdefs.h index 209a623c0..209a623c0 100644 --- a/system/libc-dev/sys-cdefs.h +++ b/system/bsd-compat-headers/sys-cdefs.h diff --git a/system/libc-dev/sys-queue.h b/system/bsd-compat-headers/sys-queue.h index a38499a26..a38499a26 100644 --- a/system/libc-dev/sys-queue.h +++ b/system/bsd-compat-headers/sys-queue.h diff --git a/system/libc-dev/sys-tree.h b/system/bsd-compat-headers/sys-tree.h index eaea56aae..eaea56aae 100644 --- a/system/libc-dev/sys-tree.h +++ b/system/bsd-compat-headers/sys-tree.h diff --git a/system/build-tools/APKBUILD b/system/build-tools/APKBUILD index 39495ec5b..e5ff48c72 100644 --- a/system/build-tools/APKBUILD +++ b/system/build-tools/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=build-tools pkgver=1.0 -pkgrel=7 +pkgrel=8 pkgdesc="Meta-package for user development utilities" url="https://adelielinux.org/" arch="noarch" @@ -11,7 +11,7 @@ depends="bash gettext-tiny gettext-tiny-dev binutils gcc g++ make diffutils patch - fortify-headers linux-headers + linux-headers mawk sed bzip2 gzip unzip xz abuild" diff --git a/system/byacc/APKBUILD b/system/byacc/APKBUILD index 42affc3bd..ff756eb4a 100644 --- a/system/byacc/APKBUILD +++ b/system/byacc/APKBUILD @@ -4,7 +4,7 @@ pkgname=byacc pkgver=20180609 pkgrel=2 pkgdesc="The Berkeley Yacc general-purpose parser generator" -url="http://invisible-island.net/byacc/byacc.html" +url="https://invisible-island.net/byacc/byacc.html" arch="all" options="!checkroot" license="Public-Domain" diff --git a/system/ca-certificates/APKBUILD b/system/ca-certificates/APKBUILD index 1d7bfbd6f..3dab0f01b 100644 --- a/system/ca-certificates/APKBUILD +++ b/system/ca-certificates/APKBUILD @@ -3,13 +3,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ca-certificates pkgver=20180411 -pkgrel=0 +pkgrel=1 pkgdesc="CA root certificates" url="https://www.mozilla.org/en-US/about/governance/policies/security-group/certs/" arch="all" options="!fhs !check" license="MPL-2.0 GPL-2.0+" -depends="" +depends="debianutils" makedepends_build="python3" makedepends_host="openssl-dev" subpackages="$pkgname-doc" @@ -21,6 +21,7 @@ source="https://distfiles.adelielinux.org/source/$pkgname-$pkgver.tar.xz" build() { cd "$builddir" + export CFLAGS="$CFLAGS -DSYMLINK_MAX=PATH_MAX" make } diff --git a/system/easy-kernel/0502-muqss-smt-fix.patch b/system/easy-kernel/0502-muqss-smt-fix.patch new file mode 100644 index 000000000..090b176a4 --- /dev/null +++ b/system/easy-kernel/0502-muqss-smt-fix.patch @@ -0,0 +1,14 @@ +diff -Naur --no-dereference linux-4.14-mc13/kernel/sched/MuQSS.c linux-4.14-muqss-resync/kernel/sched/MuQSS.c +--- linux-4.14-mc13/kernel/sched/MuQSS.c 2018-12-17 13:58:41.877371296 +1100 ++++ linux-4.14-muqss-resync/kernel/sched/MuQSS.c 2018-12-27 21:35:04.897927669 +1100 +@@ -188,6 +188,10 @@ + struct rq *uprq; + #endif /* CONFIG_SMP */ + ++#ifdef CONFIG_SCHED_SMT /* This fixes a regression as of 4.14.84 and 4.19.7 which breaks the kernel build if either SMP or MuQSS is enabled */ ++DEFINE_STATIC_KEY_FALSE(sched_smt_present); ++#endif ++ + #include "stats.h" + + #ifndef prepare_arch_switch diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD index 3e20840fd..2a3903b73 100644 --- a/system/easy-kernel/APKBUILD +++ b/system/easy-kernel/APKBUILD @@ -15,8 +15,11 @@ install="" provides="easy-kernel=$pkgver-r$pkgrel" subpackages="$_pkgname-modules-$pkgver-mc$pkgrel:modules $_pkgname-src-$pkgver-mc$pkgrel:src linux-headers:headers" -source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz - https://distfiles.adelielinux.org/source/linux-4.14-mc$pkgrel.patch.xz +_pkgmajver=${pkgver%%.*} +_pkgminver=${pkgver%.*} +source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgminver}.tar.xz + https://distfiles.adelielinux.org/source/linux-${_pkgminver}-mc$pkgrel.patch.xz + 0502-muqss-smt-fix.patch ast-endianness.patch config-ppc64 config-ppc @@ -27,22 +30,30 @@ source="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz kernel.h uapi-ether.patch " -builddir="$srcdir/linux-4.14" +builddir="$srcdir/linux-${_pkgminver}" prepare() { - default_prepare cd "$srcdir" - cat linux-4.14-mc$pkgrel.patch.xz | unxz -> linux-4.14-mc$pkgrel.patch - cd "$builddir" - patch -Np1 <../linux-4.14-mc$pkgrel.patch + cat linux-${_pkgminver}-mc$pkgrel.patch.xz | unxz -> linux-${_pkgminver}-mc$pkgrel.patch + patch -Np1 -d "$builddir" <linux-${_pkgminver}-mc$pkgrel.patch + default_prepare cd "$srcdir" - cp config-$CARCH linux-4.14/.config - cp -pr linux-4.14 linux-src + cp config-$CARCH linux-${_pkgminver}/.config + cp -pr linux-${_pkgminver} linux-src } build() { cd "$builddir" make LDFLAGS="" + + cd "$srcdir/linux-src" + make LDFLAGS="" modules_prepare clean + cp "$builddir/Module.symvers" . + + # Kernel bug: crtsavres.o is required to build modules, but modules_prepare doesn't create it. + if [ $CARCH = ppc ]; then + cp "$builddir/arch/powerpc/lib/crtsavres.o" arch/powerpc/lib/ + fi } package() { @@ -106,13 +117,15 @@ src() { mkdir -p "$subpkgdir"/usr/src mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$pkgrel } + sha512sums="77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8 linux-4.14.tar.xz bfe606f208894cc572fb98f323e26956c69b4f75febd4a9b500514cbb2aa70bddb2aba05b3f16a5fe52535236b215335f73974324065f80643265f17f281faa6 linux-4.14-mc13.patch.xz +6ede43cf169e79d8a08f7a9d79bb4bdf15618ec450b42a67a53a75bc5f5cb4d5a8c82d2b95c27a80567999876d103091bc104104f0494ca34707b5ccae5da725 0502-muqss-smt-fix.patch e41d9111219342ad13367902242444ecdd847a93575c3f9709d6c6a075bc650f4a15be9db1a8798435fc0a0b56d41705829bfe0d2c2d88f8d1c28931e27ef5be ast-endianness.patch cfa1c2b523875967c42bfd8fcfeeb80b1c4c9887c4399b4767f0ac0525769a9e8c5cddaec831e1adfa546ac2d66f68ef23dc594a286532f4b9890401efd75c67 config-ppc64 1112f6c3fcfd7fdc0ef4d5e85df5d3adea430a9c7b4c2b34508a215f7ba14c863ccd7a5e17f13ed46c518bafec30cfb3ced70c465137c14ef5fc998b6cbcca1f config-ppc -d72613826070cfab9cea882419c13985109200b387bd96614628e5eadb25f8da8b64c4844e345b724c29f7e6cf0619c649e536cb6cfe552a878d3a977cbb31fe config-x86_64 -40402578479993f78310459dcba783c806e0d2ebf6ad54854ffa338d3332f718ea4e8cf2c2f542584e1672504074122bba70a7ef918be7926f4a97abc20416d3 config-pmmx +1c5b4365da04a85ac994f123847cc69df0eda772e88b12914cd1e16ea9be62de2a46106f0f0b736f0e7bee746017d49f5671d1277793b5d383258f3d40b562f6 config-x86_64 +69c737ecb6968ca567dfb52335a8a89e147c0b01f92b1e5239bd6d806c10cd7d4225f3cc8a703249020669d3e785df0c1350afda158b0e6c8e70b4805532f07e config-pmmx 231c346e601c1d032a03d6cb19ed3d6e0f538f84d6c9980e3f47236ba9dc3f076ea23f91d68813b7d5c9eea40200f69cef31697f89f514112c09c5762ab2c48a config-aarch64 64486a4f53046a69f727cecd8c39400b50c2d2b15e3b5ca8c18b8249d25990f3a872ec064800ba3d190f9d25b4518899b9ea3675920f487108102856d6beb51e futex-cmpxchg.patch fdd94b9de7b374f1812dec0f9971c05f5e52177ca4a16c8071daa620c18265b38f656f528e7045a24f30af01f05e53e54546fb0a9e93773cf191866e87de505d kernel.h diff --git a/system/easy-kernel/config-pmmx b/system/easy-kernel/config-pmmx index 1484fc1b2..6af94b96d 100644 --- a/system/easy-kernel/config-pmmx +++ b/system/easy-kernel/config-pmmx @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.19-mc4 Kernel Configuration +# Linux/x86 4.14.88-mc13 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -231,6 +231,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -267,6 +268,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -416,7 +418,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y CONFIG_X86_MPPARSE=y CONFIG_X86_BIGSMP=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=n +# CONFIG_RETPOLINE is not set # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_GOLDFISH is not set @@ -499,7 +501,6 @@ CONFIG_HPET_EMULATE_RTC=y CONFIG_DMI=y CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y -CONFIG_SMT_NICE=y CONFIG_SCHED_MC=y CONFIG_SCHED_MC_PRIO=y # CONFIG_PREEMPT_NONE is not set @@ -4161,8 +4162,8 @@ CONFIG_DRM_VGEM=m CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_FBCON is not set CONFIG_DRM_GMA500=m -# CONFIG_DRM_GMA600 is not set -# CONFIG_DRM_GMA3600 is not set +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m @@ -5774,7 +5775,6 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_DEBUG_MEMORY_INIT=y CONFIG_HAVE_DEBUG_STACKOVERFLOW=y -CONFIG_HAVE_ARCH_KMEMCHECK=y # # Debug Lockups and Hangs @@ -6025,7 +6025,6 @@ CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SALSA20_586 is not set # CONFIG_CRYPTO_CHACHA20 is not set # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set diff --git a/system/easy-kernel/config-x86_64 b/system/easy-kernel/config-x86_64 index ba0b3beeb..0724f35f7 100644 --- a/system/easy-kernel/config-x86_64 +++ b/system/easy-kernel/config-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.33-mc6 Kernel Configuration +# Linux/x86 4.14.88-mc13 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -243,6 +243,7 @@ CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_SLUB_CPU_PARTIAL=y CONFIG_SYSTEM_DATA_VERIFICATION=y CONFIG_PROFILING=y +CONFIG_HOTPLUG_SMT=y CONFIG_OPROFILE=m # CONFIG_OPROFILE_EVENT_MULTIPLEX is not set CONFIG_HAVE_OPROFILE=y @@ -279,6 +280,7 @@ CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_RCU_TABLE_FREE=y +CONFIG_HAVE_RCU_TABLE_INVALIDATE=y CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y CONFIG_HAVE_CMPXCHG_LOCAL=y @@ -315,7 +317,6 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8 CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y CONFIG_HAVE_COPY_THREAD_TLS=y CONFIG_HAVE_STACK_VALIDATION=y -CONFIG_HAVE_RELIABLE_STACKTRACE=y # CONFIG_HAVE_ARCH_HASH is not set # CONFIG_ISA_BUS_API is not set CONFIG_OLD_SIGSUSPEND3=y @@ -440,7 +441,7 @@ CONFIG_X86_FAST_FEATURE_TESTS=y # CONFIG_X86_X2APIC is not set CONFIG_X86_MPPARSE=y # CONFIG_GOLDFISH is not set -CONFIG_RETPOLINE=n +# CONFIG_RETPOLINE is not set # CONFIG_INTEL_RDT is not set CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_VSMP is not set @@ -514,7 +515,6 @@ CONFIG_IOMMU_HELPER=y # CONFIG_MAXSMP is not set CONFIG_NR_CPUS=64 CONFIG_SCHED_SMT=y -CONFIG_SMT_NICE=y CONFIG_SCHED_MC=y CONFIG_SCHED_MC_PRIO=y # CONFIG_PREEMPT_NONE is not set @@ -4538,8 +4538,8 @@ CONFIG_DRM_VGEM=m CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_FBCON is not set CONFIG_DRM_GMA500=m -# CONFIG_DRM_GMA600 is not set -# CONFIG_DRM_GMA3600 is not set +CONFIG_DRM_GMA600=y +CONFIG_DRM_GMA3600=y CONFIG_DRM_UDL=m CONFIG_DRM_AST=m CONFIG_DRM_MGAG200=m @@ -6229,7 +6229,7 @@ CONFIG_UNUSED_SYMBOLS=y # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_SECTION_MISMATCH_WARN_ONLY=y CONFIG_FRAME_POINTER=y -CONFIG_STACK_VALIDATION=n +# CONFIG_STACK_VALIDATION is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0 @@ -6583,7 +6583,6 @@ CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_FCRYPT is not set # CONFIG_CRYPTO_KHAZAD is not set # CONFIG_CRYPTO_SALSA20 is not set -# CONFIG_CRYPTO_SALSA20_X86_64 is not set # CONFIG_CRYPTO_CHACHA20 is not set # CONFIG_CRYPTO_CHACHA20_X86_64 is not set # CONFIG_CRYPTO_SEED is not set diff --git a/system/ed/APKBUILD b/system/ed/APKBUILD index b47e03f7a..38acc491c 100644 --- a/system/ed/APKBUILD +++ b/system/ed/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=ed -pkgver=1.14.2 -pkgrel=2 +pkgver=1.15 +pkgrel=0 pkgdesc="GNU ed is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files" url="https://www.gnu.org/software/ed/" arch="all" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="653bcb89788b2d18c726336fb6f17678ac031fe6ea03a93ff248886a075c867ba5423d5471401e44cbdcce3b4cb766b621ca7b70d76881f5044ec3412767b11f ed-1.14.2.tar.lz" +sha512sums="27a16db41e88626b9718b1868f2fc629b609e436aca2450846f87492c61bf60cec3db0c54ff9a421d9bcbf59fe91a8c672aee5772e1b1eec8a365f227c30ecba ed-1.15.tar.lz" diff --git a/system/gdb/APKBUILD b/system/gdb/APKBUILD index b038ca23f..021848629 100644 --- a/system/gdb/APKBUILD +++ b/system/gdb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gdb pkgver=8.2 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU Debugger" url="https://www.sourceware.org/gdb/" arch="all" @@ -17,6 +17,7 @@ source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz ppc-musl.patch ppc-ptregs.patch remove-extraneous-include.patch + stopcode-lock.patch " build() { @@ -60,4 +61,5 @@ sha512sums="11cc481bebc51eb6db73249ecb62b8c07455cf3db169f4860b3a83114849fbd2b586 986e68275f7692f39b5d8aedeb9f9e88f0e5bebb3f8c7f104933c525d35ca54fc90e18698c1e3e1009e8a188e5e70d6f252cb39e4c75e37db7bf479017e0da32 s390x-use-elf-gdb_fpregset_t.patch 04911f87904b62dd7662435f9182b20485afb29ddb3d6398a9d31fef13495f7b70639c77fdae3a40e2775e270d7cd40d0cfd7ddf832372b506808d33c8301e01 ppc-musl.patch b75e1c1ee503a1948a7d5b8d90427b5c7d38ded69978056cee0adca222771a5c95ed1ac73127fcae7b795ea94296344eee5fca47e4cd04b418c164a756fb0933 ppc-ptregs.patch -3ff31774ba78c1208415289566b901debd815da8b53acefe4a0785e7b2bbcff39585a556d44ff2f7d8d639ebc047620b96e72573acae376d8f23aa98dd1fe286 remove-extraneous-include.patch" +3ff31774ba78c1208415289566b901debd815da8b53acefe4a0785e7b2bbcff39585a556d44ff2f7d8d639ebc047620b96e72573acae376d8f23aa98dd1fe286 remove-extraneous-include.patch +720d6cbc71d5d4f5cc8955b18a76661688534d409e2beb53e9e2d2322a303fa622e622b583e1f6c50cf3f32b8abe4f5320a6885e7680769c92ef5bb09ef59d1d stopcode-lock.patch" diff --git a/system/gdb/stopcode-lock.patch b/system/gdb/stopcode-lock.patch new file mode 100644 index 000000000..6a4e3d855 --- /dev/null +++ b/system/gdb/stopcode-lock.patch @@ -0,0 +1,75 @@ +From: Andrew Burgess <andrew.burgess@embecosm.com> +Date: Tue, 3 Jul 2018 18:02:48 +0000 (+0100) +Subject: gdb: Avoid using W_STOPCODE(0) as this is ambiguous on MIPS +X-Git-Tag: users/ARM/embedded-binutils-master-2018q4~1172 +X-Git-Url: https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff_plain;h=953473375500a809fbb3eca3efa4dbb670c3a32f + +gdb: Avoid using W_STOPCODE(0) as this is ambiguous on MIPS + +The MIPS target supports 127 signals, and this can create an ambiguity +in process wait statuses. A status value of 0x007f could potentially +indicate a process that has exited with signal 127, or a process that +has stopped with signal 0. + +In uClibc-ng the interpretation of 0x007f is that the process has +exited with signal 127 rather than stopped with signal 0, and so, +WIFSTOPPED (W_STOPCODE (0)) will be false rather than true as it would +be on most other platforms. + +Given that it's pretty easy to avoid using W_STOPCODE (0), lets do that. + +gdb/ChangeLog: + + * linux-nat.c (linux_nat_target::follow_fork): Avoid using + 'W_STOPCODE (0)' as this could be ambiguous. +--- + +diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c +index 86d3dfd..d2c88ad 100644 +--- a/gdb/linux-nat.c ++++ b/gdb/linux-nat.c +@@ -445,7 +445,6 @@ linux_nat_target::follow_fork (int follow_child, int detach_fork) + if (!follow_child) + { + struct lwp_info *child_lp = NULL; +- int status = W_STOPCODE (0); + int has_vforked; + ptid_t parent_ptid, child_ptid; + int parent_pid, child_pid; +@@ -465,6 +464,8 @@ linux_nat_target::follow_fork (int follow_child, int detach_fork) + /* Detach new forked process? */ + if (detach_fork) + { ++ int child_stop_signal = 0; ++ bool detach_child = true; + struct cleanup *old_chain = make_cleanup (delete_lwp_cleanup, + child_lp); + +@@ -484,18 +485,24 @@ linux_nat_target::follow_fork (int follow_child, int detach_fork) + if (!gdbarch_software_single_step_p (target_thread_architecture + (parent_ptid))) + { ++ int status; ++ + linux_disable_event_reporting (child_pid); + if (ptrace (PTRACE_SINGLESTEP, child_pid, 0, 0) < 0) + perror_with_name (_("Couldn't do single step")); + if (my_waitpid (child_pid, &status, 0) < 0) + perror_with_name (_("Couldn't wait vfork process")); ++ else ++ { ++ detach_child = WIFSTOPPED (status); ++ child_stop_signal = WSTOPSIG (status); ++ } + } + +- if (WIFSTOPPED (status)) ++ if (detach_child) + { +- int signo; ++ int signo = child_stop_signal; + +- signo = WSTOPSIG (status); + if (signo != 0 + && !signal_pass_state (gdb_signal_from_host (signo))) + signo = 0; diff --git a/system/libc-dev/APKBUILD b/system/libc-dev/APKBUILD deleted file mode 100644 index 4ead3c13b..000000000 --- a/system/libc-dev/APKBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Contributor: Natanael Copa <ncopa@alpinelinux.org> -# Maintainer: William Pitcock <nenolod@dereferenced.org> -pkgname=libc-dev -pkgver=0.7.1 -pkgrel=0 -pkgdesc="Meta package to pull in correct libc" -url="http://alpinelinux.org" -arch="noarch" -license="BSD-2-Clause AND BSD-3-Clause" -makedepends_build=" " -makedepends_host=" " -makedepends="$makedepends_build $makedepends_host" -depends="$CLIBC-dev" -subpackages="libc-utils:utils bsd-compat-headers:bsdcompat" -source="sys-cdefs.h - sys-queue.h - sys-tree.h - " - -prepare() { - mkdir -p "$builddir" - cd "$builddir" -} - -build() { - return 0 -} - -check() { - return 0 -} - -package() { - mkdir -p "$pkgdir" -} - -utils() { - depends="$CLIBC-utils" - - mkdir -p "$subpkgdir" -} - -bsdcompat() { - pkgdesc="BSD compatibility headers (cdefs, queue, tree)" - depends="" - - mkdir -p "$subpkgdir" - case "$CLIBC" in - musl) - install -D "$srcdir"/sys-cdefs.h "$subpkgdir"/usr/include/sys/cdefs.h - install -D "$srcdir"/sys-queue.h "$subpkgdir"/usr/include/sys/queue.h - install -D "$srcdir"/sys-tree.h "$subpkgdir"/usr/include/sys/tree.h - ;; - esac -} - -sha512sums="8c3fddd73b696a38e633953715c79c47703739be27ee085fc6c960a57b6746ca05bf6406f7e6126cc1a13204254fd5830afb566624e1f298f4d6b58216013c28 sys-cdefs.h -2f0d5e6e4dc3350285cf17009265dddcbe12431c111868eea39bc8cb038ab7c1f2acacbb21735c4e9d4a1fd106a8fc0f8611ea33987d4faba37dde5ce6da0750 sys-queue.h -07cb70f2f0ddb31e23dd913c6f561fc9885667c5803fdf3a559676c99d08834b4104589bacb5d17b4a0b379c68c81a1cf3173832b3da33a7b936fa7b93706844 sys-tree.h" diff --git a/system/man-db/APKBUILD b/system/man-db/APKBUILD index e8b60b75f..0e0aa9724 100644 --- a/system/man-db/APKBUILD +++ b/system/man-db/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=man-db pkgver=2.8.4 -pkgrel=0 +pkgrel=1 pkgdesc="The man command and related utilities for examining on-line help files" url="http://www.nongnu.org/man-db/" arch="all" diff --git a/system/man-db/man-db.trigger b/system/man-db/man-db.trigger index fb76aa38c..f9de5961c 100644 --- a/system/man-db/man-db.trigger +++ b/system/man-db/man-db.trigger @@ -1,3 +1,3 @@ #!/bin/sh -exec /usr/bin/mandb /usr/share/man +exec /usr/bin/mandb /usr/share/man >/dev/null diff --git a/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch b/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch deleted file mode 100644 index b39664dac..000000000 --- a/system/musl/2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 58dec23397e3fcc4300cc03839ce5e508389abbc Mon Sep 17 00:00:00 2001 -From: William Pitcock <nenolod@dereferenced.org> -Date: Thu, 22 Jun 2017 22:04:51 +0000 -Subject: [PATCH] pthread internals: increase DEFAULT_GUARD_SIZE to 2 pages - instead of 1 page. - -This is intended to be a proactive mitigation against any bugs similar to CVE-2017-1000366. - -Signed-off-by: William Pitcock <nenolod@dereferenced.org> ---- - src/internal/pthread_impl.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/internal/pthread_impl.h b/src/internal/pthread_impl.h -index ae0ab1c5..ad4ea3fa 100644 ---- a/src/internal/pthread_impl.h -+++ b/src/internal/pthread_impl.h -@@ -146,7 +146,7 @@ void __block_app_sigs(void *); - void __restore_sigs(void *); - - #define DEFAULT_STACK_SIZE 81920 --#define DEFAULT_GUARD_SIZE 4096 -+#define DEFAULT_GUARD_SIZE 8192 - - #define __ATTRP_C11_THREAD ((void*)(uintptr_t)-1) - --- -2.13.0 - diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD index dbbfe640c..bffa25154 100644 --- a/system/musl/APKBUILD +++ b/system/musl/APKBUILD @@ -1,16 +1,14 @@ -# Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl -pkgver=1.1.20 -pkgrel=5 +pkgver=1.1.21 +pkgrel=3 pkgdesc="System library (libc) implementation" url="http://www.musl-libc.org/" arch="all" options="!check" license="MIT" depends="" -depends_dev="!uclibc-dev" -makedepends="$depends_dev" +makedepends="" subpackages="$pkgname-dev" case "$BOOTSTRAP" in nocc) pkgname="musl-dev" @@ -25,14 +23,10 @@ nolibc) ;; esac source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz amalgamation.patch - 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch 3001-make-real-lastlog-h.patch handle-aux-at_base.patch - fix-file-locking-race.patch - dcngettext-null-deref.patch - getaddrinfo-regression.patch - ppc64-atomic.patch - dynamic-binary-stack-size.patch + fgetspent_r.patch + gettext-preserve-errno.patch ldconfig getent.c @@ -103,8 +97,14 @@ package() { rm "$pkgdir"/usr/include/utmpx.h # utmps } +dev() { + provides="libc-dev=$pkgver-r$pkgrel" + default_dev +} + utils() { depends="!uclibc-utils scanelf" + provides="libc-utils=$pkgver-r$pkgrel" replaces="libiconv uclibc-utils" license="BSD-2-Clause AND GPL-2.0+" @@ -119,16 +119,12 @@ utils() { install -D -m755 "$srcdir"/ldconfig "$subpkgdir"/sbin } -sha512sums="d3a7a30aa375ca50d7dcfbd618581d59e1aa5378417f50a0ca5510099336fd74cc9db468e05c93dda3067abd890f6bd47af226c3446bb833adf0a5054bff2e5d musl-1.1.20.tar.gz +sha512sums="fa6c4cc012626c5e517e0e10926fc845e3aa5f863ffaceeb38ac5b9ce0af631a37f6b94f470997db09aa0d5e03f4f28a2db83484b0f98481bea2239c1989d363 musl-1.1.21.tar.gz 3162b778101a46d9fb3a38927e3c4969781ccdabb9bb72de10d48ea31691215ecba605faee945ed86144a7e31fc948c31c2fee2881dc07897be3e82b6c6ff1e6 amalgamation.patch -2c8e1dde1834238097b2ee8a7bfb53471a0d9cff4a5e38b55f048b567deff1cdd47c170d0578a67b1a039f95a6c5fbb8cff369c75b6a3e4d7ed171e8e86ebb8c 2000-pthread-internals-increase-DEFAULT_GUARD_SIZE-to-2-p.patch 88ae443dbb8e0a4368235bdc3a1c5c7b718495afa75e06deb8e01becc76cb1f0d6964589e2204fc749c9c1b3190b8b9ac1ae2c0099cab8e2ce3ec877103d4332 3001-make-real-lastlog-h.patch 6a7ff16d95b5d1be77e0a0fbb245491817db192176496a57b22ab037637d97a185ea0b0d19da687da66c2a2f5578e4343d230f399d49fe377d8f008410974238 handle-aux-at_base.patch -b967339d9048161583523e847be91779adb0e16cc225d6ff85ef51748269b2dab08a0b8e558ad01469135837a9df76a59bf9a31791dd4063d75bc5efe6e94861 fix-file-locking-race.patch -a08d1b170356beea333ace1da12f8a8399ca80c5d9c32ff2fcd8562537a670214f566e4b1219a11b32129078e22fbf7009bb277b7de8550a89352a64b3b5090d dcngettext-null-deref.patch -e3953a3a73ef11696dd3eb216e18b152ae35198d8bff686d157e27bc90fb558f9a0be518025a90534e9afd6ea1bf731ffdb6fcb202bb9368f2c8eec7ca886141 getaddrinfo-regression.patch -aae9110eccb8cd7dcd3c957fcb01ed524598f79f7fa1a16b9993af40793545d1ec211e7e6aeabe7af7715d94cc26a473ea0acf6d6e66019bf65f03d4b8e24a4b ppc64-atomic.patch -654f76c96ed0e69e19b1a20569e83751bb207a8c181b26742f505638095dde3f4dd3f785deb92c49a603bd15cd8d4932129f567de8cd2edffdd8551c4dfd6976 dynamic-binary-stack-size.patch +ded41235148930f8cf781538f7d63ecb0c65ea4e8ce792565f3649ee2523592a76b2a166785f0b145fc79f5852fd1fb1729a7a09110b3b8f85cba3912e790807 fgetspent_r.patch +db180e437b8b7582e4d2baf06b592b88a9f6e5a8f18b7afa81d7a707240a774273778f8fec1c5cbea2a137e00cca49ff08fe762c871be20c70b50104b7e8e1e1 gettext-preserve-errno.patch cce2f1eeb61e55674469c26871a573cce61d739c3defe9c8f56f2b774f6ba5435849ad542a6714120efddc98c297098e9c98a1a424ac593df2243d4aa479f9a9 ldconfig 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413 getent.c 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf iconv.c" diff --git a/system/musl/__stack_chk_fail_local.c b/system/musl/__stack_chk_fail_local.c deleted file mode 100644 index 2b403a6e0..000000000 --- a/system/musl/__stack_chk_fail_local.c +++ /dev/null @@ -1,2 +0,0 @@ -extern void __stack_chk_fail(void); -void __attribute__((visibility ("hidden"))) __stack_chk_fail_local(void) { __stack_chk_fail(); } diff --git a/system/musl/dcngettext-null-deref.patch b/system/musl/dcngettext-null-deref.patch deleted file mode 100644 index bcc385e86..000000000 --- a/system/musl/dcngettext-null-deref.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 017e67ddde79fa2b6187a5e56b1e92bafc7c4cd2 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Fri, 14 Sep 2018 13:00:41 -0400 -Subject: drop lazy plural forms init in dcngettext - -there is no good reason to wait to find and process the plural rules -for a translated message file until a gettext form requesting plural -rule processing is used. it just imposes additional synchronization, -here in the form of clunky use of atomics. - -it looks like there may also have been a race condition where nplurals -could be seen without plural_rule being seen, possibly leading to null -pointer dereference. if so, this commit fixes it. ---- - src/locale/dcngettext.c | 35 +++++++++++++++++------------------ - 1 file changed, 17 insertions(+), 18 deletions(-) - -diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c -index 7fbe7196..8b891d00 100644 ---- a/src/locale/dcngettext.c -+++ b/src/locale/dcngettext.c -@@ -100,8 +100,8 @@ struct msgcat { - struct msgcat *next; - const void *map; - size_t map_size; -- void *volatile plural_rule; -- volatile int nplurals; -+ const char *plural_rule; -+ int nplurals; - struct binding *binding; - const struct __locale_map *lm; - int cat; -@@ -200,20 +200,7 @@ notrans: - p->lm = lm; - p->map = map; - p->map_size = map_size; -- do { -- old_cats = cats; -- p->next = old_cats; -- } while (a_cas_p(&cats, old_cats, p) != old_cats); -- } -- -- const char *trans = __mo_lookup(p->map, p->map_size, msgid1); -- if (!trans) goto notrans; -- -- /* Non-plural-processing gettext forms pass a null pointer as -- * msgid2 to request that dcngettext suppress plural processing. */ -- if (!msgid2) return (char *)trans; - -- if (!p->plural_rule) { - const char *rule = "n!=1;"; - unsigned long np = 2; - const char *r = __mo_lookup(p->map, p->map_size, ""); -@@ -237,10 +224,22 @@ notrans: - rule = r+7; - } - } -- a_store(&p->nplurals, np); -- a_cas_p(&p->plural_rule, 0, (void *)rule); -+ p->nplurals = np; -+ p->plural_rule = rule; -+ -+ do { -+ old_cats = cats; -+ p->next = old_cats; -+ } while (a_cas_p(&cats, old_cats, p) != old_cats); - } -- if (p->nplurals) { -+ -+ const char *trans = __mo_lookup(p->map, p->map_size, msgid1); -+ if (!trans) goto notrans; -+ -+ /* Non-plural-processing gettext forms pass a null pointer as -+ * msgid2 to request that dcngettext suppress plural processing. */ -+ -+ if (msgid2 && p->nplurals) { - unsigned long plural = __pleval(p->plural_rule, n); - if (plural > p->nplurals) goto notrans; - while (plural--) { --- -cgit v1.2.1 - diff --git a/system/musl/dynamic-binary-stack-size.patch b/system/musl/dynamic-binary-stack-size.patch deleted file mode 100644 index e2e3f12d3..000000000 --- a/system/musl/dynamic-binary-stack-size.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 7b3348a98c139b4b4238384e52d4b0eb237e4833 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Tue, 18 Sep 2018 23:54:18 -0400 -Subject: support setting of default thread stack size via PT_GNU_STACK header - -this facilitates building software that assumes a large default stack -size without any patching to call pthread_setattr_default_np or -pthread_attr_setstacksize at each thread creation site, using just -LDFLAGS. - -normally the PT_GNU_STACK header is used only to reflect whether -executable stack is desired, but with GNU ld at least, passing --Wl,-z,stack-size=N will set a size on the program header. with this -patch, that size will be incorporated into the default stack size -(subject to increase-only rule and DEFAULT_STACK_MAX limit). - -both static and dynamic linking honor the program header. for dynamic -linking, all libraries loaded at program start, including preloaded -ones, are considered. dlopened libraries are not considered, for -several reasons. extra logic would be needed to defer processing until -the load of the new library is commited, synchronization woud be -needed since other threads may be running concurrently, and the -effectiveness woud be limited since the larger size would not apply to -threads that already existed at the time of dlopen. programs that will -dlopen code expecting a large stack need to declare the requirement -themselves, or pthread_setattr_default_np can be used. ---- - ldso/dynlink.c | 12 ++++++++++++ - src/env/__init_tls.c | 5 +++++ - 2 files changed, 17 insertions(+) - -diff --git a/ldso/dynlink.c b/ldso/dynlink.c -index e4829c3a..3ecbddfa 100644 ---- a/ldso/dynlink.c -+++ b/ldso/dynlink.c -@@ -22,6 +22,7 @@ - #include "dynlink.h" - - static void error(const char *, ...); -+extern size_t __default_stacksize; - - #define MAXP2(a,b) (-(-(a)&-(b))) - #define ALIGN(x,y) ((x)+(y)-1 & -(y)) -@@ -609,6 +610,12 @@ static void *map_library(int fd, struct dso *dso) - } else if (ph->p_type == PT_GNU_RELRO) { - dso->relro_start = ph->p_vaddr & -PAGE_SIZE; - dso->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE; -+ } else if (ph->p_type == PT_GNU_STACK) { -+ if (!runtime && ph->p_memsz > __default_stacksize) { -+ __default_stacksize = -+ ph->p_memsz < (8<<20) ? -+ ph->p_memsz : (8<<20); -+ } - } - if (ph->p_type != PT_LOAD) continue; - nsegs++; -@@ -1238,6 +1245,12 @@ static void kernel_mapped_dso(struct dso *p) - } else if (ph->p_type == PT_GNU_RELRO) { - p->relro_start = ph->p_vaddr & -PAGE_SIZE; - p->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE; -+ } else if (ph->p_type == PT_GNU_STACK) { -+ if (!runtime && ph->p_memsz > __default_stacksize) { -+ __default_stacksize = -+ ph->p_memsz < (8<<20) ? -+ ph->p_memsz : (8<<20); -+ } - } - if (ph->p_type != PT_LOAD) continue; - if (ph->p_vaddr < min_addr) -diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c -index e0224243..96d0e284 100644 ---- a/src/env/__init_tls.c -+++ b/src/env/__init_tls.c -@@ -8,6 +8,8 @@ - #include "atomic.h" - #include "syscall.h" - -+extern size_t __default_stacksize; -+ - int __init_tp(void *p) - { - pthread_t td = p; -@@ -90,6 +91,11 @@ static void static_init_tls(size_t *aux) - base = (size_t)_DYNAMIC - phdr->p_vaddr; - if (phdr->p_type == PT_TLS) - tls_phdr = phdr; -+ if (phdr->p_type == PT_GNU_STACK && -+ phdr->p_memsz > __default_stacksize) -+ __default_stacksize = -+ phdr->p_memsz < (8<<20) ? -+ phdr->p_memsz : (8<<20); - } - - if (tls_phdr) { --- -cgit v1.2.1 - diff --git a/system/musl/fgetspent_r.patch b/system/musl/fgetspent_r.patch new file mode 100644 index 000000000..360aa8fe1 --- /dev/null +++ b/system/musl/fgetspent_r.patch @@ -0,0 +1,65 @@ +From 3489f9e5ef055c80464252fe640fead8aeb1068e Mon Sep 17 00:00:00 2001 +From: Markus Wichmann <nullplan@gmx.net> +Date: Sun, 20 Jan 2019 16:31:34 +0100 +Subject: [PATCH 5/5] Add fgetspent_r(). + +Interface was defined by glibc, and seems to have been adopted by +Solaris. Some freedesktop software appears to require it, and it adds +little bloat. + +Added without feature test macros, since no other interface in shadow.h +requires it, even the ones documented to have required it in the past. +--- + include/shadow.h | 1 + + src/passwd/fgetspent_r.c | 27 +++++++++++++++++++++++++++ + 2 files changed, 28 insertions(+) + create mode 100644 src/passwd/fgetspent_r.c + +diff --git a/include/shadow.h b/include/shadow.h +index 2b1be413..4edc90db 100644 +--- a/include/shadow.h ++++ b/include/shadow.h +@@ -33,6 +33,7 @@ int putspent(const struct spwd *, FILE *); + + struct spwd *getspnam(const char *); + int getspnam_r(const char *, struct spwd *, char *, size_t, struct spwd **); ++int fgetspent_r(FILE *f, struct spwd* sp, char *line, size_t size, struct spwd **spret); + + int lckpwdf(void); + int ulckpwdf(void); +diff --git a/src/passwd/fgetspent_r.c b/src/passwd/fgetspent_r.c +new file mode 100644 +index 00000000..643637de +--- /dev/null ++++ b/src/passwd/fgetspent_r.c +@@ -0,0 +1,27 @@ ++#include "pwf.h" ++#include <pthread.h> ++#include <limits.h> ++#include <stdio.h> ++ ++int fgetspent_r(FILE *f, struct spwd *sp, char *line, size_t size, struct spwd **spret) ++{ ++ int res = EIO; ++ int cs; ++ *spret = 0; ++ if (size > INT_MAX) ++ size = INT_MAX; //2GB ought to be enough for anyone ++ pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); ++ if (!fgets(line, size, f)) ++ goto out; ++ res = ERANGE; ++ if (line[strlen(line) - 1] != '\n') ++ goto out; ++ res = EILSEQ; ++ if ( __parsespent(line, sp) < 0) ++ goto out; ++ *spret = sp; ++ res = 0; ++out: ++ pthread_setcancelstate(cs, 0); ++ return res; ++} +-- +2.19.1 + diff --git a/system/musl/fix-file-locking-race.patch b/system/musl/fix-file-locking-race.patch deleted file mode 100644 index 2ef91390a..000000000 --- a/system/musl/fix-file-locking-race.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0db393d3a77bb9f300a356c6a5484fc2dddb161d Mon Sep 17 00:00:00 2001 -From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> -Date: Tue, 18 Sep 2018 10:03:27 +0300 -Subject: fix race condition in file locking - -The condition occurs when -- thread #1 is holding the lock -- thread #2 is waiting for it on __futexwait -- thread #1 is about to release the lock and performs a_swap -- thread #3 enters the __lockfile function and manages to grab the lock - before thread #1 calls __wake, resetting the MAYBE_WAITERS flag -- thread #1 calls __wake -- thread #2 wakes up but goes again to __futexwait as the lock is - held by thread #3 -- thread #3 releases the lock but does not call __wake as the - MAYBE_WAITERS flag is not set - -This condition results in thread #2 not being woken up. This patch fixes -the problem by making the woken up thread ensure that the flag is -properly set before going to sleep again. - -Mainainer's note: This fixes a regression introduced in commit -c21f750727515602a9e84f2a190ee8a0a2aeb2a1. ---- - src/stdio/__lockfile.c | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/stdio/__lockfile.c b/src/stdio/__lockfile.c -index 2ff75d8a..0dcb2a42 100644 ---- a/src/stdio/__lockfile.c -+++ b/src/stdio/__lockfile.c -@@ -8,13 +8,13 @@ int __lockfile(FILE *f) - int owner = f->lock, tid = __pthread_self()->tid; - if ((owner & ~MAYBE_WAITERS) == tid) - return 0; -- for (;;) { -- owner = a_cas(&f->lock, 0, tid); -- if (!owner) return 1; -- if (a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) break; -+ owner = a_cas(&f->lock, 0, tid); -+ if (!owner) return 1; -+ while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) { -+ if ((owner & MAYBE_WAITERS) || -+ a_cas(&f->lock, owner, owner|MAYBE_WAITERS)==owner) -+ __futexwait(&f->lock, owner|MAYBE_WAITERS, 1); - } -- while ((owner = a_cas(&f->lock, 0, tid|MAYBE_WAITERS))) -- __futexwait(&f->lock, owner, 1); - return 1; - } - --- -cgit v1.2.1 - diff --git a/system/musl/getaddrinfo-regression.patch b/system/musl/getaddrinfo-regression.patch deleted file mode 100644 index 28d4558b8..000000000 --- a/system/musl/getaddrinfo-regression.patch +++ /dev/null @@ -1,51 +0,0 @@ -From f381c118b2d4f7d914481d3cdc830ce41369b002 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Wed, 19 Sep 2018 18:03:22 -0400 -Subject: fix getaddrinfo regression with AI_ADDRCONFIG on some configurations - -despite not being documented to do so in the standard or Linux -documentation, attempts to udp connect to 127.0.0.1 or ::1 generate -EADDRNOTAVAIL when the loopback device is not configured and there is -no default route for IPv6. this caused getaddrinfo with AI_ADDRCONFIG -to fail with EAI_SYSTEM and EADDRNOTAVAIL on some no-IPv6 -configurations, rather than the intended behavior of detecting IPv6 as -unsuppported and producing IPv4-only results. - -previously, only EAFNOSUPPORT was treated as unavailability of the -address family being probed. instead, treat all errors related to -inability to get an address or route as conclusive that the family -being probed is unsupported, and only fail with EAI_SYSTEM on other -errors. - -further improvements may be desirable, such as reporting EAI_AGAIN -instead of EAI_SYSTEM for errors which are expected to be transient, -but this patch should suffice to fix the serious regression. ---- - src/network/getaddrinfo.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/network/getaddrinfo.c b/src/network/getaddrinfo.c -index ba26847a..e33bfa28 100644 ---- a/src/network/getaddrinfo.c -+++ b/src/network/getaddrinfo.c -@@ -76,7 +76,16 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru - close(s); - if (!r) continue; - } -- if (errno != EAFNOSUPPORT) return EAI_SYSTEM; -+ switch (errno) { -+ case EADDRNOTAVAIL: -+ case EAFNOSUPPORT: -+ case EHOSTUNREACH: -+ case ENETDOWN: -+ case ENETUNREACH: -+ break; -+ default: -+ return EAI_SYSTEM; -+ } - if (family == tf[i]) return EAI_NONAME; - family = tf[1-i]; - } --- -cgit v1.2.1 - diff --git a/system/musl/gettext-preserve-errno.patch b/system/musl/gettext-preserve-errno.patch new file mode 100644 index 000000000..c55df3e21 --- /dev/null +++ b/system/musl/gettext-preserve-errno.patch @@ -0,0 +1,28 @@ +diff --git a/src/locale/dcngettext.c b/src/locale/dcngettext.c +index 8b891d00..4c304393 100644 +--- a/src/locale/dcngettext.c ++++ b/src/locale/dcngettext.c +@@ -122,6 +122,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, + const struct __locale_map *lm; + size_t domlen; + struct binding *q; ++ int old_errno = errno; + + if ((unsigned)category >= LC_ALL) goto notrans; + +@@ -138,6 +139,7 @@ char *dcngettext(const char *domainname, const char *msgid1, const char *msgid2, + lm = loc->cat[category]; + if (!lm) { + notrans: ++ errno = old_errno; + return (char *) ((n == 1) ? msgid1 : msgid2); + } + +@@ -250,6 +252,7 @@ notrans: + trans += l+1; + } + } ++ errno = old_errno; + return (char *)trans; + } + diff --git a/system/musl/ppc64-atomic.patch b/system/musl/ppc64-atomic.patch deleted file mode 100644 index 6e96a9048..000000000 --- a/system/musl/ppc64-atomic.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 12817793301398241b6cb00c740f0d3ca41076e9 Mon Sep 17 00:00:00 2001 -From: Rich Felker <dalias@aerifal.cx> -Date: Fri, 14 Sep 2018 10:47:16 -0400 -Subject: fix broken atomic store on powerpc[64] - -in our memory model, all atomics are supposed to be full barriers; -stores are not release-only. this is important because store is used -as an unlock operation in places where it needs to acquire the waiter -count to determine if a futex wake is needed. at least in the -malloc-internal locks, but possibly elsewhere, soft deadlocks from -missing futex wake (breakable by poking the threads to restart the -syscall, e.g. by attaching a tracer) were reported to occur. - -once the malloc lock is replaced with Jens Gustedt's new lock -implementation (see commit 47d0bcd4762f223364e5b58d5a381aaa0cbd7c38), -malloc will not be affected by the issue, but it's not clear that -other uses won't be. reducing the strength of the ordering properties -required from a_store would require a thorough analysis of how it's -used. - -to fix the problem, I'm removing the powerpc[64]-specific a_store -definition; now, the top-level atomic.h will implement a_store using -a_barrier on both sides of the store. - -it's not clear to me yet whether there might be issues with the other -atomics. it's possible that a_post_llsc needs to be replaced with a -full barrier to guarantee the formal semanics we want, but either way -I think the difference is unlikely to impact the way we use them. ---- - arch/powerpc/atomic_arch.h | 8 -------- - arch/powerpc64/atomic_arch.h | 8 -------- - 2 files changed, 16 deletions(-) - -diff --git a/arch/powerpc/atomic_arch.h b/arch/powerpc/atomic_arch.h -index 5b65cde7..c2673919 100644 ---- a/arch/powerpc/atomic_arch.h -+++ b/arch/powerpc/atomic_arch.h -@@ -30,14 +30,6 @@ static inline void a_post_llsc() - __asm__ __volatile__ ("isync" : : : "memory"); - } - --#define a_store a_store --static inline void a_store(volatile int *p, int v) --{ -- a_pre_llsc(); -- *p = v; -- a_post_llsc(); --} -- - #define a_clz_32 a_clz_32 - static inline int a_clz_32(uint32_t x) - { -diff --git a/arch/powerpc64/atomic_arch.h b/arch/powerpc64/atomic_arch.h -index 17cababd..2bed82be 100644 ---- a/arch/powerpc64/atomic_arch.h -+++ b/arch/powerpc64/atomic_arch.h -@@ -48,14 +48,6 @@ static inline void a_post_llsc() - __asm__ __volatile__ ("isync" : : : "memory"); - } - --#define a_store a_store --static inline void a_store(volatile int *p, int v) --{ -- a_pre_llsc(); -- *p = v; -- a_post_llsc(); --} -- - #define a_crash a_crash - static inline void a_crash() - { --- -cgit v1.2.1 - diff --git a/system/nspr/APKBUILD b/system/nspr/APKBUILD index a6da52de1..bf0c907e8 100644 --- a/system/nspr/APKBUILD +++ b/system/nspr/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=nspr pkgver=4.20 -pkgrel=0 +pkgrel=1 pkgdesc="Netscape Portable Runtime" url="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSPR" arch="all" @@ -14,6 +14,7 @@ makedepends="autoconf automake" subpackages="$pkgname-dev" source="http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$pkgver/src/nspr-$pkgver.tar.gz fix-getproto.patch + stacksize.patch " prepare() { @@ -61,4 +62,5 @@ package() { } sha512sums="22fdf7627f450b0594ebccaee170098e1a8cd0f429fd44816f1322756002ced3d69cf686c3f69f7cb30b8132d3605a9fce5457ab99d0002e6af11a3408a5c949 nspr-4.20.tar.gz -ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch" +ee654f609a90b9a95c1901ad1d56cdef7cce8bca9efc092198607944f142f8fec924b13219ca6663facd0f0d59b671b8b3de58ab3449c4c863d42e2937f02184 fix-getproto.patch +1f694fc151f6578080449e3aa999c520486bbe117b8237150966ec43092db4156e81412ac889045e0c0c3bf65d459af5bdc1cf19c9fa3dab120405a60732f15a stacksize.patch" diff --git a/system/nspr/stacksize.patch b/system/nspr/stacksize.patch new file mode 100644 index 000000000..c2fcecd68 --- /dev/null +++ b/system/nspr/stacksize.patch @@ -0,0 +1,22 @@ +set a minimum stack size on ppc64 to prevent crashes + +Firefox, a user of nspr, attempts to set a stack size of 32k in its +JS watchdog, which the pthreads impl doesn't like and fails. + +Coincidentally, nspr here is compiled with debug on, which means it has +assertions turned on; under normal circumstances, those would be disabled, +the stack size set call would fail and everything would fall back on the +default 2M stacksize, but it would still be wrong - therefore, establish +a minimum, just like for aarch64. + +--- nspr-4.20/nspr/pr/include/md/_linux.h.old 2018-08-28 12:42:28.000000000 +0000 ++++ nspr-4.20/nspr/pr/include/md/_linux.h 2019-02-18 17:35:30.380000000 +0000 +@@ -71,7 +71,7 @@ + #define _MD_DEFAULT_STACK_SIZE 65536L + #define _MD_MMAP_FLAGS MAP_PRIVATE + +-#if defined(__aarch64__) || defined(__mips__) ++#if defined(__aarch64__) || defined(__mips__) || defined(__powerpc64__) + #define _MD_MINIMUM_STACK_SIZE 0x20000 + #endif + diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD index a252385b5..dac0cec8d 100644 --- a/system/openrc/APKBUILD +++ b/system/openrc/APKBUILD @@ -4,7 +4,7 @@ pkgver=0.24.1 _ver=${pkgver/_git*/} pkgrel=6 pkgdesc="OpenRC manages the services, startup and shutdown of a host" -url="http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git" +url="https://github.com/OpenRC/openrc" arch="all" license="BSD-2-Clause" depends="psmisc /sbin/init" diff --git a/system/openssh/APKBUILD b/system/openssh/APKBUILD index 4394eb5c2..145fc5c86 100644 --- a/system/openssh/APKBUILD +++ b/system/openssh/APKBUILD @@ -4,7 +4,7 @@ pkgname=openssh pkgver=7.9_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=0 +pkgrel=2 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" arch="all" @@ -20,12 +20,13 @@ subpackages="$pkgname-doc $pkgname-client $pkgname-keysign $pkgname-sftp-server:sftp - $pkgname-server-common:server_common:noarch $pkgname-server + $pkgname-openrc " source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz bsd-compatible-realpath.patch + CVE-2018-20685.patch disable-forwarding-by-default.patch fix-utmpx.patch openssh7.4-peaktput.patch @@ -36,6 +37,8 @@ source="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar sshd.confd " # secfixes: +# 7.9_p1-r2: +# - CVE-2018-20685 # 7.9_p1: # - CVE-2018-15473 # 7.7_p1: @@ -131,30 +134,26 @@ sftp() { "$subpkgdir"/usr/lib/ssh/ } -server_common() { - pkgdesc="OpenSSH server configuration files" - depends="" - for i in etc/ssh/sshd_config \ - etc/init.d/sshd \ - etc/conf.d/sshd; do - - install -d "$subpkgdir"/${i%/*} - mv "$pkgdir"/$i \ - "$subpkgdir"/${i%/*}/ - - done -} - server() { pkgdesc="OpenSSH server" - depends="openssh-keygen openssh-server-common" + depends="openssh-keygen" + replaces="openssh-server-common" cd "$builddir" install -d "$subpkgdir"/usr/sbin + install -d "$subpkgdir"/etc/ssh mv "$pkgdir"/usr/sbin/sshd "$subpkgdir"/usr/sbin/ + mv "$pkgdir"/etc/ssh/sshd_config "$subpkgdir"/etc/ssh/ +} + +openrc() { + default_openrc + depends="openssh-server" + install_if="openssh-server=$pkgver-r$pkgrel openrc" } sha512sums="0412c9c429c9287f0794023951469c8e6ec833cdb55821bfa0300dd90d0879ff60484f620cffd93372641ab69bf0b032c2d700ccc680950892725fb631b7708e openssh-7.9p1.tar.gz f2b8daa537ea3f32754a4485492cc6eb3f40133ed46c0a5a29a89e4bcf8583d82d891d94bf2e5eb1c916fa68ec094abf4e6cd641e9737a6c05053808012b3a73 bsd-compatible-realpath.patch +b8907d3d6ebceeca15f6bc97551a7613c68df5c31e4e76d43b7c0bd9ad42dedcabc20a2cc5404b89f40850a4765b24892bde50eab1db55c96ad5cf23bb1f8d04 CVE-2018-20685.patch 8df35d72224cd255eb0685d2c707b24e5eb24f0fdd67ca6cc0f615bdbd3eeeea2d18674a6af0c6dab74c2d8247e2370d0b755a84c99f766a431bc50c40b557de disable-forwarding-by-default.patch 0c1e832cec420bc7b57558041d2288912a438db97050b87f6a57e94a2741a374cc5d141fe352968b0d1ba6accaff965794463fe9169d136678a8915a60d2f0b7 fix-utmpx.patch 398096a89aa104abeff31aa043ac406a6348e0fdd4d313b7888ee0b931d38fd71fc21bceee46145e88f03bc27e00890e068442faee2d33f86cfbc04d58ffa4b6 openssh7.4-peaktput.patch diff --git a/system/openssh/CVE-2018-20685.patch b/system/openssh/CVE-2018-20685.patch new file mode 100644 index 000000000..f2f1ecfc5 --- /dev/null +++ b/system/openssh/CVE-2018-20685.patch @@ -0,0 +1,33 @@ +From 6010c0303a422a9c5fa8860c061bf7105eb7f8b2 Mon Sep 17 00:00:00 2001 +From: "djm@openbsd.org" <djm@openbsd.org> +Date: Fri, 16 Nov 2018 03:03:10 +0000 +Subject: [PATCH] upstream: disallow empty incoming filename or ones that refer + to the + +current directory; based on report/patch from Harry Sintonen + +OpenBSD-Commit-ID: f27651b30eaee2df49540ab68d030865c04f6de9 +--- + scp.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/scp.c b/scp.c +index 60682c687..4f3fdcd3d 100644 +--- a/scp.c ++++ b/scp.c +@@ -1,4 +1,4 @@ +-/* $OpenBSD: scp.c,v 1.197 2018/06/01 04:31:48 dtucker Exp $ */ ++/* $OpenBSD: scp.c,v 1.198 2018/11/16 03:03:10 djm Exp $ */ + /* + * scp - secure remote copy. This is basically patched BSD rcp which + * uses ssh to do the data transfer (instead of using rcmd). +@@ -1106,7 +1106,8 @@ sink(int argc, char **argv) + SCREWUP("size out of range"); + size = (off_t)ull; + +- if ((strchr(cp, '/') != NULL) || (strcmp(cp, "..") == 0)) { ++ if (*cp == '\0' || strchr(cp, '/') != NULL || ++ strcmp(cp, ".") == 0 || strcmp(cp, "..") == 0) { + run_err("error: unexpected filename: %s", cp); + exit(1); + } diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD index 76e9a74a9..3792720b6 100644 --- a/system/perl-cpanel-json-xs/APKBUILD +++ b/system/perl-cpanel-json-xs/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-cpanel-json-xs _pkgreal=Cpanel-JSON-XS -pkgver=4.08 +pkgver=4.09 pkgrel=0 pkgdesc="cPanel's fork of JSON::XS, fast and correct serialising" url="https://metacpan.org/release/Cpanel-JSON-XS" @@ -40,4 +40,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="7236923791b244e022cea00f3c8697905a8187edddaf0b197ee6f8a4afe958c42ea37f655e0db8e4c66a07427b7888e68ae1dc08849ef7cbb518155b2d9c65f5 Cpanel-JSON-XS-4.08.tar.gz" +sha512sums="9d0771129a473b696bcfd502303a88e8e97f0dc2cf2b97003328edf72182400b8c07a2f5cf120f102c32a04118d4530f3d7da369c9b063554d2cfc0feddbb6aa Cpanel-JSON-XS-4.09.tar.gz" diff --git a/system/perl-dbd-sqlite/APKBUILD b/system/perl-dbd-sqlite/APKBUILD index de26fcf57..066b7b4b8 100644 --- a/system/perl-dbd-sqlite/APKBUILD +++ b/system/perl-dbd-sqlite/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-dbd-sqlite _pkgname=DBD-SQLite -pkgver=1.60 +pkgver=1.62 pkgrel=0 pkgdesc="Perl DBI SQLite module" url="https://metacpan.org/release/DBD-SQLite" @@ -40,5 +40,5 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b5fd203898815ada13ec04477fa0ad90ec2f53761d9b1ed7cce7d06a674e31d3810e745658aea150a3a58fc18adb889e5e50e795e8575318ab4cc757c1ff1c9e DBD-SQLite-1.60.tar.gz +sha512sums="b452a6245deb0dcc5906167f6ff14d55d70b4f05a1e8113c41810a34f9b75263c2d43f88bb909d872004795ec7d9f4ed93b68ffb5639be7dad9e44e0c8e8439f DBD-SQLite-1.62.tar.gz 00961932f9f89d9b46e6134150c2628aadd4cfa7159cb1604de023fedc919087fbf982b72fd51610e1ca390234cd939e74430b270131d0b30cedb97ba6203b49 perl-DBD-SQLite-bz543982.patch" diff --git a/system/perl-encode-eucjpascii/APKBUILD b/system/perl-encode-eucjpascii/APKBUILD index a1febaadb..9e174dc10 100644 --- a/system/perl-encode-eucjpascii/APKBUILD +++ b/system/perl-encode-eucjpascii/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-eucjpascii pkgver=0.03 pkgrel=0 diff --git a/system/perl-encode-hanextra/APKBUILD b/system/perl-encode-hanextra/APKBUILD index e82241be9..dce57db59 100644 --- a/system/perl-encode-hanextra/APKBUILD +++ b/system/perl-encode-hanextra/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-hanextra pkgver=0.23 pkgrel=0 diff --git a/system/perl-encode-iso2022/APKBUILD b/system/perl-encode-iso2022/APKBUILD index 0c10974b1..2c0321813 100644 --- a/system/perl-encode-iso2022/APKBUILD +++ b/system/perl-encode-iso2022/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-iso2022 pkgver=0.04 pkgrel=0 diff --git a/system/perl-encode-jisx0213/APKBUILD b/system/perl-encode-jisx0213/APKBUILD index 64dbf52f3..b5fe8f8f3 100644 --- a/system/perl-encode-jisx0213/APKBUILD +++ b/system/perl-encode-jisx0213/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-encode-jisx0213 pkgver=0.04 pkgrel=0 diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD index 1c6b4fdea..68819a602 100644 --- a/system/perl-json/APKBUILD +++ b/system/perl-json/APKBUILD @@ -1,7 +1,8 @@ -# Maintainer: Kiyoshi Aman <kiyoshi.aman@gmail.com> +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-json _pkgreal=JSON -pkgver=2.97001 +pkgver=4.01 pkgrel=0 pkgdesc="Perl module implementing a JSON encoder/decoder" url="https://metacpan.org/release/JSON" @@ -31,4 +32,4 @@ package() { find "$pkgdir" -name .packlist -delete } -sha512sums="42fe08c1d7b8f689592a28c17dd7853a90c4236e64a9be175a635af005da48e06c436e80dac905893e2232ca8efee3832f6ad51992fd4ca851f8f0fd796860df JSON-2.97001.tar.gz" +sha512sums="95d38b994fc0452ad2a111cf640e0860f028039fa19c636b0c8facfd9a42851ec7f1917a2bef6a2b27d0990513329f6051ad7b85ecbe02b755200762c7331088 JSON-4.01.tar.gz" diff --git a/system/perl-mime-charset/APKBUILD b/system/perl-mime-charset/APKBUILD index 7adb38810..0d4541a3f 100644 --- a/system/perl-mime-charset/APKBUILD +++ b/system/perl-mime-charset/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-mime-charset pkgver=1.012.2 pkgrel=0 diff --git a/system/perl-module-build/APKBUILD b/system/perl-module-build/APKBUILD index dffb1853d..ddc802076 100644 --- a/system/perl-module-build/APKBUILD +++ b/system/perl-module-build/APKBUILD @@ -1,6 +1,6 @@ # Automatically generated by apkbuild-cpan, template 1 # Contributor: Francesco Colista <fcolista@alpinelinux.org> -# Maintainer: +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-build _pkgreal=Module-Build pkgver=0.4224 diff --git a/system/perl-module-scandeps/APKBUILD b/system/perl-module-scandeps/APKBUILD index 776899508..e94e31579 100644 --- a/system/perl-module-scandeps/APKBUILD +++ b/system/perl-module-scandeps/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-module-scandeps _pkgreal=Module-ScanDeps -pkgver=1.26 +pkgver=1.27 pkgrel=0 pkgdesc="Recursively scan Perl code for dependencies" url="https://metacpan.org/release/Module-ScanDeps" @@ -42,4 +42,4 @@ check() { make test } -sha512sums="b4b54813f55b82c20073ede9be90ab3680a636c3c8743ae03ccd0d7a26097f3d05b3e55d8b0d7d414e4156eaa686dc6eec0541ebe6c89a5c896dcd98845eb10f Module-ScanDeps-1.26.tar.gz" +sha512sums="ab5625f497a9dc9133960c7c9a5867f27f6f0061fa954225cfc53fda39d9b657743ee66a7a96cc1485bba57532fc0447c3b245dd81cf6e6c39522fdd2e308411 Module-ScanDeps-1.27.tar.gz" diff --git a/system/perl-pod2-base/APKBUILD b/system/perl-pod2-base/APKBUILD index 9d19f9e5c..28d409678 100644 --- a/system/perl-pod2-base/APKBUILD +++ b/system/perl-pod2-base/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-pod2-base pkgver=0.043 pkgrel=0 diff --git a/system/perl-sgmls/APKBUILD b/system/perl-sgmls/APKBUILD index 111830823..110fdbd99 100644 --- a/system/perl-sgmls/APKBUILD +++ b/system/perl-sgmls/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-sgmls pkgver=1.1 pkgrel=0 diff --git a/system/perl-test-needs/APKBUILD b/system/perl-test-needs/APKBUILD index 1c2e096c3..ef283c065 100644 --- a/system/perl-test-needs/APKBUILD +++ b/system/perl-test-needs/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-needs pkgver=0.002005 pkgrel=0 diff --git a/system/perl-test-pod/APKBUILD b/system/perl-test-pod/APKBUILD index 639ccdbd3..e2c3ae3c3 100644 --- a/system/perl-test-pod/APKBUILD +++ b/system/perl-test-pod/APKBUILD @@ -1,6 +1,6 @@ -# Automatically generated by apkbuild-cpan, template 1 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-pod _pkgreal=Test-Pod pkgver=1.52 diff --git a/system/perl-test-simple/APKBUILD b/system/perl-test-simple/APKBUILD index 6b0514b39..ac80247c5 100644 --- a/system/perl-test-simple/APKBUILD +++ b/system/perl-test-simple/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-simple _pkgreal=Test-Simple -pkgver=1.302141 +pkgver=1.302162 pkgrel=0 pkgdesc="Basic utilities for writing Perl tests" url="https://metacpan.org/release/Test-Simple" @@ -47,4 +47,4 @@ doc() { replaces="perl-doc" } -sha512sums="3560308cc62441c4b4214b002a9c98cd9e0191fcf655295031b58f5ed6f43c26def278fb2669bca0c6fa1e803c2feb90a8700f840bd91cddd649573ad896e261 Test-Simple-1.302141.tar.gz" +sha512sums="1e8ac18986f4e8ae44f385a4db025adc714dd355b8590472392468a8865a2a21d0a30484c196f4cb31fcb1fcff85e7e06f8402931d8f9b04fea4139399aad116 Test-Simple-1.302162.tar.gz" diff --git a/system/perl-unicode-linebreak/APKBUILD b/system/perl-unicode-linebreak/APKBUILD index c981c7e78..cea969562 100644 --- a/system/perl-unicode-linebreak/APKBUILD +++ b/system/perl-unicode-linebreak/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-unicode-linebreak -pkgver=2018.003 +pkgver=2019.001 _univer=8.0.0 # update this and unicode.org URLs if sombok is ever updated pkgrel=0 pkgdesc="Perl implementation of the UAX#14 Unicode line-breaking algorithm" @@ -39,6 +39,6 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="37fa931978e1f88667b13ef25eb3b2414a6b055f03fec5925b3605e06026f06af332179e07f35d58f61924f43f305a5bc5ef1d76a61e1d56568abf60c9bf8fc7 Unicode-LineBreak-2018.003.tar.gz +sha512sums="2d285f928db2ed32aefa741629ce9f9bee82e69c247eaa2c9145fdb4e9bae4441bf822e108cbffc3955369539474c3299f0a8f69026a5f9686aa8458a1d87f27 Unicode-LineBreak-2019.001.tar.gz cc5a4fa7d53c127f749d0c45582f55f391ffdcfa2f2c91c41cb0a4f71e566f1657d4653a6a251c6ae4f769420701df6e0cf184e55413c602cbc5191f9dc99201 GraphemeBreakTest.txt d2ffb02fb4d402e6a90937743721692c008b78045e295bd77bcdfcabc99fb1fdbfb0b4679b410bce4487eba115a7ef2e6d6bb03b0a47a7220fa4308eafbac74e LineBreakTest.txt" diff --git a/system/perl-uri/APKBUILD b/system/perl-uri/APKBUILD index 5909ad364..9d8fe204e 100644 --- a/system/perl-uri/APKBUILD +++ b/system/perl-uri/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-uri -pkgver=1.74 +pkgver=1.76 pkgrel=0 pkgdesc="Perl library for URI manipulation" url="https://metacpan.org/release/URI" @@ -11,8 +11,8 @@ depends="perl" makedepends="$depends" checkdepends="perl-test-needs" subpackages="$pkgname-doc" -provides="perl-uri-escape" -source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/URI-$pkgver.tar.gz" +provides="perl-uri-escape=$pkgver-r$pkgrel" +source="https://cpan.metacpan.org/authors/id/O/OA/OALDERS/URI-$pkgver.tar.gz" builddir="$srcdir/URI-$pkgver" build() { @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b537bd09c355989a2bb1919e2c228cf189e57f993add4246fa482d8ee5ec814266c6fb3229befce2f294456ee784a819d9a54013c43a2ad41b5d8914fabf046b URI-1.74.tar.gz" +sha512sums="1fcb02692bdf5f223c2878569615d153b3c4c5adc04c33aee23f3f015e08b4895b03536ef3a8c7cb7a334c2faa056e5e46c805d56d810704cba63d96136e0a83 URI-1.76.tar.gz" diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD index 5f4410851..be47ade30 100644 --- a/system/perl/APKBUILD +++ b/system/perl/APKBUILD @@ -1,6 +1,7 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Contributor: Valery Kartel <valery.kartel@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> # Proxy-For: solar pkgname=perl pkgver=5.26.3 diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD index 87ba80226..1ed293793 100644 --- a/system/ruby/APKBUILD +++ b/system/ruby/APKBUILD @@ -28,13 +28,13 @@ pkgname=ruby pkgver=2.5.3 _abiver="${pkgver%.*}.0" -pkgrel=0 +pkgrel=1 pkgdesc="An object-oriented language for quick and easy programming" url="http://www.ruby-lang.org/" arch="all" license="Ruby AND BSD-2-Clause" depends="ca-certificates" -depends_dev="gmp-dev" +depends_dev="ruby=$pkgver-r$pkgrel gmp-dev" makedepends="$depends_dev zlib-dev openssl-dev db-dev libedit-dev libffi-dev coreutils yaml-dev linux-headers autoconf" install="$pkgname.post-upgrade" diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index dd8c20f8b..5c7ec31a1 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.7.2.1 +pkgver=2.7.2.2 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/$pkgname/" @@ -42,5 +42,5 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790 s6-2.7.2.1.tar.gz -bad19965aa8ea138cdf5688db9ae05fc7ce2111ac0945b5b0e78cda55ad290602f28ac8b52aae395ca5e857f32e9be4d6df882286b362ba7008a52b29472ff1e s6-svscanboot" +sha512sums="ed7b9fbc73e9947e56ad641459c04ff210fb801c8cfdbb5f0a00bdecbe1f5969ae73a6b52b048cd6617c88308f3a7bfd0ed98a48e78b1b5ba90b96e95845d165 s6-2.7.2.2.tar.gz +9c29bc9eee6d5ab502a5a86bb043ebd21e085022efc506a330ae5ab0eadf7038d0a3dc8e025d78d9610cf7ec0ca031887f755486c4cb4e571090ea3a9c1806ac s6-svscanboot" diff --git a/system/s6/s6-svscanboot b/system/s6/s6-svscanboot index 8fa8ec5d5..32eb5f290 100644 --- a/system/s6/s6-svscanboot +++ b/system/s6/s6-svscanboot @@ -12,14 +12,19 @@ umask 022 if { rm -rf /run/service /run/services } if { mkdir -p -m 0755 /run/service/.s6-svscan /run/service/s6-svscan-log } -if { ln -sf /bin/false /run/service/.s6-svscan/crash } +if +{ + redirfd -w 1 /run/service/.s6-svscan/crash + heredoc 0 "#!/bin/execlineb -P\nfalse\n" + cat +} if { redirfd -w 1 /run/service/.s6-svscan/finish heredoc 0 "#!/bin/execlineb -P\ns6-svc -X -- \"/run/service/s6-svscan-log\"\n" cat } -if { chmod 0755 /run/service/.s6-svscan/finish } +if { cd /run/service/.s6-svscan chmod 0755 crash finish } # Directory for the catch-all logger to store its logs diff --git a/system/sed/APKBUILD b/system/sed/APKBUILD index 39ba12368..bd20a4f6b 100644 --- a/system/sed/APKBUILD +++ b/system/sed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=sed -pkgver=4.5 +pkgver=4.7 pkgrel=0 pkgdesc="GNU stream editor" url="http://www.gnu.org/software/sed" @@ -44,6 +44,6 @@ package() { rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true } -sha512sums="f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196 sed-4.5.tar.xz +sha512sums="e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb sed-4.7.tar.xz aeb55f85a5c724f0dacbf2f39e0f99ae4c66159115b00aa36d65f234f87e52e660878cb18b772a494349632dfa1b616b9306a4cafe87e91182ea8936c308506a disable-mbrtowc-test.patch 8dc38bbd731885c69e83d2ed45d5df28542d9401f196295871135aa157d48ac77f1f926afcaab3ee0098ab0eb6232efc4664060177c3bf109a3e673f5adf9b85 gnulib-tests-dont-require-gpg-passphrase.patch" diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD index 350ffe057..138d6f402 100644 --- a/system/util-linux/APKBUILD +++ b/system/util-linux/APKBUILD @@ -9,7 +9,7 @@ case $pkgver in *.*) _v=$pkgver;; esac -pkgrel=0 +pkgrel=1 pkgdesc="Official Linux system management utilities" url="http://git.kernel.org/cgit/utils/util-linux/util-linux.git" arch="all" @@ -43,8 +43,8 @@ prepare() { build() { cd "$builddir" - # login utils are provided by shadow (with PAM) or busybox (no PAM) --nenolod - ./configure \ + # login utils are provided by shadow + LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ --host=$CHOST \ --with-sysroot=$CBUILDROOT \ @@ -54,7 +54,6 @@ build() { --disable-tls \ --disable-kill \ --disable-login \ - --disable-last \ --disable-sulogin \ --disable-su \ --without-python diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index 2306b8be3..91bb18b19 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps -pkgver=0.0.1.3 +pkgver=0.0.2.0 pkgrel=2 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/$pkgname/" @@ -46,6 +46,6 @@ doc() { cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname" } -sha512sums="ec6135e56858f4bb81ca8c5015e605bc1ecc809ef10565207335a86ccee250683fde7c1df999649b6055ef2df900a70cd3d2f9f1066e066c6871a0cfe2785824 utmps-0.0.1.3.tar.gz +sha512sums="5fffb86f68475f3eadf8da53e3ae40284040cceb644f453218a5fd9e1be081920b5c787283e2578a60922e2feb75c94a7430034a658f7399645fc3bcc9afa28f utmps-0.0.2.0.tar.gz 525d43e3eced30c564e5390fc715b6caa1ae2b6515a9e3bf01263ff3fb9379bd6908ed302d0d50b6568ac36ed44d272dcc44a683f9ae34d586d8ad17023ed6b1 utmpd.run 93e4fae527ada9381e0b0a7ad5de9079e8d88959abd74fa5c0710c30c6153832abb010b57ddf83055ca34c032e7e5c9c1eedceb2f122a11ab20837ab66dcf5e2 wtmpd.run" diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD index 2f64f96d8..9c75b2621 100644 --- a/system/vim/APKBUILD +++ b/system/vim/APKBUILD @@ -4,7 +4,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vim -pkgver=8.1.0606 +pkgver=8.1.0952 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -17,6 +17,7 @@ makedepends_host="acl-dev ncurses-dev" subpackages="$pkgname-doc ${pkgname}diff::noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz vimrc + no-default-mouse.patch " builddir="$srcdir/$pkgname-$pkgver" @@ -80,5 +81,6 @@ vimdiff() { mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin } -sha512sums="df02717611d7b2f54f3b60ff9f73259a6ff3228b841d7d2d429fa0eedd98ce0a140a6a3839b50bd67ce5724d86f816042d6cbb0930fd040d30216f98f2d7e6ec vim-8.1.0606.tar.gz -3a6c9bc187a6f45fd78e91dcc44d4d661c1ae1f2655e3a66bb36245ad1dc41e8d0e6061ec3aee6d323f96058b4a5501a87e3327e539cfd026f68cf81d455d721 vimrc" +sha512sums="485d839901b3d1fc8efcc035991d5f34849f6d05d9c556dcf5b2918cd01e7f7b490cd0a7eb976c7577adb41962dceea4552474103f0b3c7807311d07f8158bd1 vim-8.1.0952.tar.gz +12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8 vimrc +16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181 no-default-mouse.patch" diff --git a/system/vim/no-default-mouse.patch b/system/vim/no-default-mouse.patch new file mode 100644 index 000000000..c34b9cae7 --- /dev/null +++ b/system/vim/no-default-mouse.patch @@ -0,0 +1,16 @@ +diff -Nurd vim-8.1.0712/runtime/defaults.vim vim-8.1.0712.new/runtime/defaults.vim +--- vim-8.1.0712/runtime/defaults.vim 2019-01-09 16:02:43.000000000 -0600 ++++ vim-8.1.0712.new/runtime/defaults.vim 2019-01-27 01:18:04.196123398 -0600 +@@ -73,12 +73,6 @@ + " Revert with ":iunmap <C-U>". + inoremap <C-U> <C-G>u<C-U> + +-" In many terminal emulators the mouse works just fine. By enabling it you +-" can position the cursor, Visually select and scroll with the mouse. +-if has('mouse') +- set mouse=a +-endif +- + " Switch syntax highlighting on when the terminal has colors or when using the + " GUI (which always has colors). + if &t_Co > 2 || has("gui_running") diff --git a/system/vim/vimrc b/system/vim/vimrc index 66b72282c..df08a4866 100644 --- a/system/vim/vimrc +++ b/system/vim/vimrc @@ -4,8 +4,6 @@ set ai " Always set auto-indenting on set history=50 " keep 50 lines of command history set ruler " Show the cursor position all the time -set mouse="" " Use Vim 7 default of no mouse movements by default - " Don't use Ex mode, use Q for formatting map Q gq diff --git a/system/zip/APKBUILD b/system/zip/APKBUILD index 401ce74e3..98e60671b 100644 --- a/system/zip/APKBUILD +++ b/system/zip/APKBUILD @@ -4,7 +4,7 @@ pkgname=zip pkgver=3.0 pkgrel=5 pkgdesc="Creates PKZIP-compatible .zip files" -url="http://www.info-zip.org/pub/infozip/Zip.html" +url="http://infozip.sourceforge.net/" arch="all" options="!check" # No test suite. license="Info-ZIP" diff --git a/user/abiword/APKBUILD b/user/abiword/APKBUILD new file mode 100644 index 000000000..351961055 --- /dev/null +++ b/user/abiword/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: multiplexd <multi@in-addr.xyz> +pkgname=abiword +pkgver=3.0.2 +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+" +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" + +# openxml plugin +makedepends="$makedepends boost-dev" + +# collab plugin +makedepends="$makedepends gnutls-dev libsoup-dev dbus-glib-dev" + +subpackages="$pkgname-dev $pkgname-doc" + +_plugins="applix babelfish bmp clarisworks collab docbook eml epub \ + freetranslation garble gdict gimp google hancom hrtext iscii kword \ + 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" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --enable-shared \ + --disable-static \ + --enable-plugins="$_plugins" + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="29ce9e80b3b85ab2933e7d39216771d8c4e05db5255eaed0cf8e1d032ffaac2cb1880bf24e754196ad5dae4969a1c2101ce4dc9c1db14604adc2f852b6a17fe3 abiword-3.0.2.tar.gz +cae9a08047cd97d11acea25a2f0b0ca4e8e4556b462eb476507fa178a7412221839febfeb36bebf491bb94d53525c4584d86230f96c403a7ceb2dec4223be8fe fix-black-drawing-regression.patch" diff --git a/user/abiword/fix-black-drawing-regression.patch b/user/abiword/fix-black-drawing-regression.patch new file mode 100644 index 000000000..dbce8c696 --- /dev/null +++ b/user/abiword/fix-black-drawing-regression.patch @@ -0,0 +1,54 @@ +From cec2fda355b67b5b814a803c5ed128c425cbb030 Mon Sep 17 00:00:00 2001 +From: Hubert Figuiere <hub@figuiere.net> +Date: Thu, 8 Dec 2016 02:03:10 +0000 +Subject: [PATCH] Bug 13815 - draw event should return TRUE + +This fix the black drawing regression with Gtk3.22 + +git-svn-id: svn+ssh://svn.abisource.com/svnroot/abiword/branches/ABI-3-0-0-STABLE@35394 bcba8976-2d24-0410-9c9c-aab3bd5fdfd6 +--- + src/af/xap/gtk/xap_UnixFrameImpl.cpp | 6 +++--- + src/af/xap/gtk/xap_UnixFrameImpl.h | 4 ++-- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.cpp b/src/af/xap/gtk/xap_UnixFrameImpl.cpp +index 780000e..10f8e00 100644 +--- a/src/af/xap/gtk/xap_UnixFrameImpl.cpp ++++ b/src/af/xap/gtk/xap_UnixFrameImpl.cpp +@@ -1208,9 +1208,9 @@ gint XAP_UnixFrameImpl::_fe::delete_event(GtkWidget * w, GdkEvent * /*event*/, g + } + + #if GTK_CHECK_VERSION(3,0,0) +-gint XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) ++gboolean XAP_UnixFrameImpl::_fe::draw(GtkWidget * w, cairo_t * cr) + #else +-gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) ++gboolean XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) + #endif + { + XAP_UnixFrameImpl * pUnixFrameImpl = static_cast<XAP_UnixFrameImpl *>(g_object_get_data(G_OBJECT(w), "user_data")); +@@ -1243,7 +1243,7 @@ gint XAP_UnixFrameImpl::_fe::expose(GtkWidget * w, GdkEventExpose* pExposeEvent) + pView->draw(&rClip); + #endif + } +- return FALSE; ++ return TRUE; + } + + static bool bScrollWait = false; +diff --git a/src/af/xap/gtk/xap_UnixFrameImpl.h b/src/af/xap/gtk/xap_UnixFrameImpl.h +index 30ee5d8..a0ff57f 100644 +--- a/src/af/xap/gtk/xap_UnixFrameImpl.h ++++ b/src/af/xap/gtk/xap_UnixFrameImpl.h +@@ -152,9 +152,9 @@ class XAP_UnixFrameImpl : public XAP_FrameImpl + static gint key_release_event(GtkWidget* w, GdkEventKey* e); + static gint delete_event(GtkWidget * w, GdkEvent * /*event*/, gpointer /*data*/); + #if GTK_CHECK_VERSION(3,0,0) +- static gint draw(GtkWidget * w, cairo_t * cr); ++ static gboolean draw(GtkWidget * w, cairo_t * cr); + #else +- static gint expose(GtkWidget * w, GdkEventExpose* pExposeEvent); ++ static gboolean expose(GtkWidget * w, GdkEventExpose* pExposeEvent); + #endif + static gint do_ZoomUpdate( gpointer /* xap_UnixFrame * */ p); + static void vScrollChanged(GtkAdjustment * w, gpointer /*data*/); diff --git a/user/accountsservice/APKBUILD b/user/accountsservice/APKBUILD new file mode 100644 index 000000000..2ea23a416 --- /dev/null +++ b/user/accountsservice/APKBUILD @@ -0,0 +1,49 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=accountsservice +pkgver=0.6.54 +pkgrel=0 +pkgdesc="D-Bus service for accessing user account information" +url="https://www.freedesktop.org/wiki/Software/AccountsService/" +arch="all" +license="GPL-3.0+ AND GPL-2.0+" +depends="dbus" +makedepends="cmake dbus-dev glib-dev gobject-introspection-dev meson ninja + polkit-dev utmps-dev xmlto" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://www.freedesktop.org/software/accountsservice/accountsservice-$pkgver.tar.xz + disable-msgfmt + " + +build() { + cd "$builddir" + CPPFLAGS="-D_PATH_WTMPX=\\\"/run/utmps/wtmp\\\"" meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + -Dadmin_group=wheel \ + -Ddocbook=true \ + -Dsystemd=false \ + -Dsystemdsystemunitdir=no \ + . output + mkdir -p output/data + # msgfmt(1) XML error + cp data/org.freedesktop.accounts.policy.in \ + output/data/org.freedesktop.accounts.policy + patch -Np1 < "$srcdir"/disable-msgfmt + ninja -C output +} + +check() { + cd "$builddir" + ninja -C output test +} + +package() { + cd "$builddir" + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="5fbcccc286dba60efba905aa79b1b51a5478fe52bf2e256d40d9fc2d7a311aea4ce397365045659a4ef2ecb2cc079130fb1d0107749c3c906c394517056ac1c0 accountsservice-0.6.54.tar.xz +d3cd21c871f66359aae0b4688aeb5f31ba124579212350870540344a489299413a13ad4b66872a9fb549ed3b3664dfbadd03c9b20df3714cb4d26e3f2cf107ce disable-msgfmt" diff --git a/user/accountsservice/disable-msgfmt b/user/accountsservice/disable-msgfmt new file mode 100644 index 000000000..3342f7eab --- /dev/null +++ b/user/accountsservice/disable-msgfmt @@ -0,0 +1,15 @@ +--- accountsservice-0.6.54/output/build.ninja.old 2019-01-20 21:23:36.570000000 +0000 ++++ accountsservice-0.6.54/output/build.ninja 2019-01-20 21:25:01.140000000 +0000 +@@ -60,9 +60,9 @@ + + # Build rules for targets + +-build data/org.freedesktop.accounts.policy: CUSTOM_COMMAND ../data/org.freedesktop.accounts.policy.in +- COMMAND = /usr/bin/meson --internal msgfmthelper ../data/org.freedesktop.accounts.policy.in data/org.freedesktop.accounts.policy xml /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/po +- description = Generating$ org.freedesktop.accounts.policy_data_merge$ with$ a$ custom$ command. ++#build data/org.freedesktop.accounts.policy: CUSTOM_COMMAND ../data/org.freedesktop.accounts.policy.in ++# COMMAND = /usr/bin/meson --internal msgfmthelper ../data/org.freedesktop.accounts.policy.in data/org.freedesktop.accounts.policy xml /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/po ++# description = Generating$ org.freedesktop.accounts.policy_data_merge$ with$ a$ custom$ command. + + build src/accounts-generated.c: CUSTOM_COMMAND /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/data/org.freedesktop.Accounts.xml | /usr/bin/gdbus-codegen + COMMAND = /usr/bin/gdbus-codegen --c-generate-autocleanup all --interface-prefix org.freedesktop. --c-namespace Accounts --body --output src/accounts-generated.c /usr/src/packages/user/accountsservice/src/accountsservice-0.6.54/data/org.freedesktop.Accounts.xml diff --git a/user/adelie-kde-theme/APKBUILD b/user/adelie-kde-theme/APKBUILD index 047bfd4ca..5eb3e9509 100644 --- a/user/adelie-kde-theme/APKBUILD +++ b/user/adelie-kde-theme/APKBUILD @@ -2,22 +2,27 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=adelie-kde-theme pkgver=1.0 -pkgrel=1 +pkgrel=2 pkgdesc="The Adélie Linux official KDE theme" url="https://adelielinux.org/" arch="noarch" options="!check" # No test suite. license="NCSA" -depends="corindon-red papirus-icons" +depends="adelie-wallpapers papirus-icons" source="kdeglobals - kwinrc" + kscreenlockerrc + adelie-kde-theme.js + " builddir="$srcdir/" package() { cd "$builddir" - install -D -m644 kwinrc "$pkgdir"/etc/xdg/kwinrc - install -m 644 kdeglobals "$pkgdir"/etc/xdg/kdeglobals + install -D -m644 kdeglobals "$pkgdir"/etc/xdg/kdeglobals + install -m644 kscreenlockerrc "$pkgdir"/etc/xdg/kscreenlockerrc + install -D -m644 adelie-kde-theme.js \ + "$pkgdir"/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/adelie-kde-theme.js } -sha512sums="f54683f11ff8fd800a936a2072626a5020d4519b7796a52a193be28a0961c64294441553ed14d7c91d12a336449e6735364509ac4f1bf8213af97d29708d4b4e kdeglobals -b889ed3b4e79cc4c073947042f10505ab044c4740fea2391e1d8dfec1aaff75e65420a2872a787b321e4862dded6b2f6aea806b5027ba86be2808f79786efe93 kwinrc" +sha512sums="ed5dfa83a4d2f6b171b3a3238dea626b9ca9e1afd72ae026ef680a5eef0c3fff4aaf7c82f4bf394c26d002fde7517a4c842f9bdb9059107200d17f48e432b940 kdeglobals +b94c261d2ce098af1c1856f92b20485167be4f59b66fd3a47379d339a21b4c7a9c274dca2964bbc5f2adff74e514eb73e988db749e22d35817f37b10303fecca kscreenlockerrc +05a4649938755b3b3c058d6a7507065e07ba29ac448d314db3fc93623008eb1903ae5bcc9c62d0b29b37dd0e85246bc2dbfc2792c69e0f387e99683275db09cd adelie-kde-theme.js" diff --git a/user/adelie-kde-theme/adelie-kde-theme.js b/user/adelie-kde-theme/adelie-kde-theme.js new file mode 100644 index 000000000..596d386b5 --- /dev/null +++ b/user/adelie-kde-theme/adelie-kde-theme.js @@ -0,0 +1,33 @@ +// Copyright 2016 Aurélien COUDERC <zecoucou@free.fr> +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <https://www.gnu.org/licenses/>. + +// This script is provided by desktop-base +// It is run by Plasma 5 on upgrade. +// Plasma checks that the script is only run once for each version. +desktops = desktops() + +for (desktop in desktops) { + // Only set up the wallpaper if the plugin is the default. + // Otherwise it means the user chose another plugin and we don’t want to override that. + if (desktops[desktop].wallpaperPlugin == 'org.kde.image') { + desktops[desktop].currentConfigGroup = Array('Wallpaper', 'org.kde.image', 'General') + if (!desktops[desktop].readConfig('Image')) { + // Only set up the wallpaper if the wallpaper image is empty (=default). + // Otherwise it means the user selected a picture and we don’t want to override that. + desktops[desktop].writeConfig('Image', 'Sunset'); + } + } +} + diff --git a/user/adelie-kde-theme/kdeglobals b/user/adelie-kde-theme/kdeglobals index bb7802e93..2ec479dc2 100644 --- a/user/adelie-kde-theme/kdeglobals +++ b/user/adelie-kde-theme/kdeglobals @@ -3,3 +3,6 @@ ColorScheme=Steel [Icons] Theme=Papirus + +[WM] +activeBackground=104,0,0 diff --git a/user/adelie-kde-theme/kscreenlockerrc b/user/adelie-kde-theme/kscreenlockerrc new file mode 100644 index 000000000..54b5cbd92 --- /dev/null +++ b/user/adelie-kde-theme/kscreenlockerrc @@ -0,0 +1,13 @@ +[$Version] +update_info=kscreenlocker.upd:0.1-autolock + +[Greeter] +WallpaperPlugin=org.kde.image + +[Greeter][Wallpaper][org.kde.color][General] +Color=128,0,0 + +[Greeter][Wallpaper][org.kde.image][General] +Color=128,0,0 +FillMode=1 +Image=LockScreen diff --git a/user/adelie-kde-theme/kwinrc b/user/adelie-kde-theme/kwinrc deleted file mode 100644 index 0c9b9c589..000000000 --- a/user/adelie-kde-theme/kwinrc +++ /dev/null @@ -1,3 +0,0 @@ -[org.kde.kdecoration2] -library=org.kde.kwin.aurorae -theme=__aurorae__svg__corindon-red diff --git a/user/adelie-wallpapers/APKBUILD b/user/adelie-wallpapers/APKBUILD new file mode 100644 index 000000000..dc66e9e5f --- /dev/null +++ b/user/adelie-wallpapers/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=adelie-wallpapers +pkgver=1.0 +pkgrel=0 +pkgdesc="Wallpapers from the Adélie Linux team" +url="https://www.adelielinux.org/" +arch="noarch" +options="!check" # No test suite. +license="CC-BY-SA-4.0" +depends="" +makedepends="" +subpackages="" +source="https://distfiles.adelielinux.org/source/adelie-wallpapers-$pkgver.tar.xz" + +package() { + cd "$builddir" + mkdir -p "$pkgdir" + cp -r usr "$pkgdir"/ +} + +sha512sums="3815145eaf92524eb848ec179cefecd66b43873a9f17133b62baf2ce894d7f629585f6670e5e499d7d5779377c1819627256d7812bb4318b0bfd68466c9b1cff adelie-wallpapers-1.0.tar.xz" diff --git a/user/adwaita-icon-theme/APKBUILD b/user/adwaita-icon-theme/APKBUILD new file mode 100644 index 000000000..ae769910e --- /dev/null +++ b/user/adwaita-icon-theme/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=adwaita-icon-theme +pkgver=3.31.1 +pkgrel=0 +pkgdesc="GNOME system icon set" +url="https://www.gnome.org/" +arch="noarch" +license="CC-BY-SA-3.0 OR LGPL-3.0-only" +depends="" +makedepends="" +subpackages="" +source="https://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.31/adwaita-icon-theme-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="aa73637cca8189e7141c0554ba7bda1234cbe192710463c9ad1c81b46a410b21e5fb48a090917324163ee4c0301fb1380d18ef5f9bb8faf1b401a52af18c60b1 adwaita-icon-theme-3.31.1.tar.xz" diff --git a/user/ae_fonts/APKBUILD b/user/ae_fonts/APKBUILD new file mode 100644 index 000000000..c5f66b6ab --- /dev/null +++ b/user/ae_fonts/APKBUILD @@ -0,0 +1,27 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ae_fonts +pkgver=2.0 +pkgrel=0 +pkgdesc="Arabeyes fonts" +url="https://www.arabeyes.org/Khotot" +arch="noarch" +options="!check" # No test suite. +license="GPL-2.0-only WITH Font-exception-2.0" +depends="" +makedepends="" +subpackages="" +source="https://downloads.sourceforge.net/arabeyes/ae_fonts_$pkgver.tar.bz2" +builddir="$srcdir"/${pkgname}_$pkgver + +package() { + cd "$builddir" + local _fontdir + for _fontdir in AAHS AGA FS Kasr MCS Shmookh; do + pushd $_fontdir + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf + popd + done +} + +sha512sums="46c94aa1ce872aa1ad4dd01d698d4691a6301786f8be681723df9bdcdfb86db12b15bef2a6acfed704b29867e9c01e385b4c2c490548ce68f7994b8127a9270e ae_fonts_2.0.tar.bz2" diff --git a/user/akonadi-contacts/APKBUILD b/user/akonadi-contacts/APKBUILD index d2a3e7ce1..8a4e7c05c 100644 --- a/user/akonadi-contacts/APKBUILD +++ b/user/akonadi-contacts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-contacts -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Library for integrating contact lists with Akonadi" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8a0c524b896b204824f6d054c00eb07f1e650569bb2635b3a714576fae9ebb1b417d967193701ce1b3ea44f3d11cb336456174b26a6e14ee35adc9b78ab93f1e akonadi-contacts-18.08.3.tar.xz" +sha512sums="a87886c0bce8f11d39a365b19b65081eb27bd443fbdb3d731045f22c6cb9bf75c1c2c8f30840fa3f3b345b0edbeb9fb344bd9cb41a9294c807a70dcaae273866 akonadi-contacts-18.12.2.tar.xz" diff --git a/user/akonadi-mime/APKBUILD b/user/akonadi-mime/APKBUILD index 770376a95..8949a95ab 100644 --- a/user/akonadi-mime/APKBUILD +++ b/user/akonadi-mime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi-mime -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Libraries to implement basic MIME message handling" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0db5e96975bf3f295bb98aa5352edaa66fd8da725db2d246c9816362953085f528ee1792e1a1b1cb782d2a6b4aeb654e0ff641a067d0d92c2da9d85769ed6d32 akonadi-mime-18.08.3.tar.xz" +sha512sums="fa9d7deb774433794548acf8c8d3702a65b8c60a05f1686d7f68d8349e1f140c12c7ea2bfb5f73d9c5e2ba05a7516d5ea41324a4b54c74683295c7f179ae1016 akonadi-mime-18.12.2.tar.xz" diff --git a/user/akonadi/APKBUILD b/user/akonadi/APKBUILD index 62c87e778..5e40b1210 100644 --- a/user/akonadi/APKBUILD +++ b/user/akonadi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=akonadi -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Libraries and storage system for PIM data" url="https://community.kde.org/KDE_PIM/Akonadi" @@ -49,5 +49,5 @@ package() { "$pkgdir"/usr/share/config/akonadi } -sha512sums="ba883902ad83c989bb480712c0b3871e683307ecb121f1d7b3e433b9211056cda209d9640a7bae520fb4b6611950863180b879269797a606af2ac25ae4f24cc0 akonadi-18.08.3.tar.xz +sha512sums="a78ac757452360252eac2fcafbc01dcc5c84756db16da89c29c7ee8d7fa6deef3bc5b5bc1101c5e99e68b260fcdf1f96a780bef19b7d07198d4c00e546224431 akonadi-18.12.2.tar.xz b0c333508da8ba5c447827b2bad5f36e3dc72bef8303b1526043b09c75d3055790908ac9cbb871e61319cfd4b405f4662d62d2d347e563c9956f4c8159fca9ab akonadiserverrc" diff --git a/user/alegreya-sans/APKBUILD b/user/alegreya-sans/APKBUILD new file mode 100644 index 000000000..f14a5f467 --- /dev/null +++ b/user/alegreya-sans/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=alegreya-sans +pkgver=2.008 +pkgrel=0 +pkgdesc="Humanist sans-serif typeface" +url="https://www.huertatipografica.com/en/fonts/alegreya-sans-ht" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="Alegreya-Sans-$pkgver.tar.gz::https://github.com/huertatipografica/Alegreya-Sans/archive/v$pkgver.tar.gz" +builddir="$srcdir/Alegreya-Sans-$pkgver" + +package() { + cd "$builddir"/fonts/otf + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf +} + +sha512sums="8052fe15717ecdfd301d878b03282ff4fd472a7e13a1e581c84d6f3993780897354d103aeda2f027350d9e56466914be38e97417fe450ec32e5823769015d0a4 Alegreya-Sans-2.008.tar.gz" diff --git a/user/alegreya/APKBUILD b/user/alegreya/APKBUILD new file mode 100644 index 000000000..12e45aa4f --- /dev/null +++ b/user/alegreya/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=alegreya +pkgver=2.007 +pkgrel=0 +pkgdesc="Alegreya serif typeface" +url="https://www.huertatipografica.com/en/fonts/alegreya-ht-pro" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="Alegreya-$pkgver.tar.gz::https://github.com/huertatipografica/Alegreya/archive/v$pkgver.tar.gz" +builddir="$srcdir/Alegreya-$pkgver" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ fonts/otf/*.otf +} + +sha512sums="7220aaf9f9861ed4f3104aeb16f33267b5cc2139b91ddafbd7ff86f94faeb37bca558c642a03108094d0a60f9db77167c19996fdaeeca3fcac0346205ba4e785 Alegreya-2.007.tar.gz" diff --git a/user/analitza/APKBUILD b/user/analitza/APKBUILD index eab986435..2abbe64ca 100644 --- a/user/analitza/APKBUILD +++ b/user/analitza/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=analitza -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Mathematical object library" url="https://api.kde.org/4.x-api/kdeedu-apidocs/analitza/html/index.html" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d511878b34ce8c84a9b637bd095f89f274c13d9bf5f38c5ae9162b576e3639affa4d1c66b30cce403b4d8852705df040c8ad27a8163a4942d420321f43fd8a18 analitza-18.08.3.tar.xz" +sha512sums="d4ebc69885b091652c69aed34a940baae15e0b379645af3f0c0669336b74204b63d9122ef7ee8bdd3e27e28c2d6a0007bebb4d524b1b4aea047c8a8f863afa06 analitza-18.12.2.tar.xz" diff --git a/user/andika/APKBUILD b/user/andika/APKBUILD new file mode 100644 index 000000000..5d385c71b --- /dev/null +++ b/user/andika/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=andika +pkgver=5.000 +pkgrel=0 +pkgdesc="Sans-serif typeface designed for literacy and beginning readers" +url="https://software.sil.org/andika/" +arch="noarch" +options="!check" # No test suite +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://software.sil.org/downloads/r/andika/Andika-5.000.zip" +builddir="$srcdir/Andika-5.000" + +package() { + cd "$builddir" + install -D -m644 Andika-R.ttf "$pkgdir"/usr/share/fonts/X11/TTF/Andika-R.ttf +} + +sha512sums="e1cf195a523aa70b464889bdcee0c9606c82eef0da658861329c4c142ae25f14f1e3feea1118219fe7e9b5c13965c4ed09ac7507d746a1f2c77e402957c7d3d5 Andika-5.000.zip" diff --git a/user/anonymous-pro/APKBUILD b/user/anonymous-pro/APKBUILD new file mode 100644 index 000000000..5d4ece60c --- /dev/null +++ b/user/anonymous-pro/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=anonymous-pro +pkgver=1.002 +pkgrel=0 +pkgdesc="Fixed-width (monospace) font designed for programming" +url="https://www.marksimonson.com/fonts/view/anonymous-pro" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://www.marksimonson.com/assets/content/fonts/AnonymousPro-$pkgver.zip" +builddir="$srcdir/AnonymousPro-1.002.001" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="7606d520ad79fbf4e13d676c1aff61b764dce74e170f8783b8e606f7907c4b8db0871e5568504d15aa23ca26e925ada4eb6b60fcf27171dccee0d3d32d9a92a1 AnonymousPro-1.002.zip" diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD index fc27c9821..d688954ee 100644 --- a/user/apache-httpd/APKBUILD +++ b/user/apache-httpd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=apache-httpd _pkgreal=httpd -pkgver=2.4.37 +pkgver=2.4.38 pkgrel=0 pkgdesc="Open-source HTTP server" url="https://httpd.apache.org" @@ -135,7 +135,7 @@ ldap() { "$subpkgdir"/usr/libexec/apache2 } -sha512sums="e802915801bbe885a65dada04b0116d145b293fabfff734dddb61a79ca1c6d65326f51155d1b864b093c3ec00d0bdfdf1401ab55677bae1ea3da1d199d7bcad4 httpd-2.4.37.tar.bz2 +sha512sums="8bdc36fa2bd13fd83feee17fdce4a5316ed8f96c1ac32b636ba106572ba257815438c72068d2d0e900783a3fa25c90a5da34c3f83fc2c04a1dbdbf234f7ad448 httpd-2.4.38.tar.bz2 c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4 adelie.layout 336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2 apache-httpd.confd 9893248f1724748c9ef91171728b4c557ced7de543e23ed72cb75c02728048b2813ac99015a4a28e7984daa51faa6e42403c17b875539fe71c33424865eccecf apache-httpd.initd diff --git a/user/ark/APKBUILD b/user/ark/APKBUILD index 6b707e295..96a0ac979 100644 --- a/user/ark/APKBUILD +++ b/user/ark/APKBUILD @@ -1,14 +1,14 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ark -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Graphical file compression/decompression utility with support for multiple formats" url="https://utils.kde.org/projects/ark/" arch="all" options="!check" # requires other formats not packaged and manual user input license="GPL-2.0-only" -depends="lzop unrar unzip zip" +depends="lzop shared-mime-info unzip zip" makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kcrash-dev kdbusaddons-dev kdoctools-dev ki18n-dev kiconthemes-dev kitemmodels-dev kio-dev kservice-dev kparts-dev kpty-dev libarchive-dev @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="56ec9a592cc0862dfe39dbef424b1fb09e8d32050448558c402b864756e00ba402e9fdec7159e3bd5b7013217f6cf1b33cdd4b0d663a11b8bfe5c4c76535f820 ark-18.08.3.tar.xz" +sha512sums="5c76cdc38755b7087a24a0e75a5d8d1bbc930a37ec85d701451e0dd457153b36923722f666852c51aa86ebd83b5bb8c2f439a42d98f118eccb3d95d87a424e31 ark-18.12.2.tar.xz" diff --git a/user/artikulate/APKBUILD b/user/artikulate/APKBUILD index b095c651e..9444c4de6 100644 --- a/user/artikulate/APKBUILD +++ b/user/artikulate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=artikulate -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Pronunciation trainer for languages" url="https://www.kde.org/applications/education/artikulate/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="79029c470422ca95a87190bd006e0764382098688bbff6d36fbc114508f89f85e9104fda53176db0e18b9e874cd4cb0b632d2d6a2bedc53e1bddda9418492ad1 artikulate-18.08.3.tar.xz" +sha512sums="d232bc9522c20a62a5a1398d71350490f6084a5e93abd9c7acd92797ece33e1afe556329b0a6b41f18f7a9e4c249a6bcde0392aa667ea4a462243ea23fe5c126 artikulate-18.12.2.tar.xz" diff --git a/user/aspell-dict-de/APKBUILD b/user/aspell-dict-de/APKBUILD index 90b8097a5..080984aa3 100644 --- a/user/aspell-dict-de/APKBUILD +++ b/user/aspell-dict-de/APKBUILD @@ -1,26 +1,31 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=aspell-dict-de -pkgver=20030222.1 -_pkgver=${pkgver%.*}-${pkgver#*.} +pkgver=20161207 pkgrel=0 pkgdesc="German dictionaries for aspell" -url="http://aspell.net" +url="http://j3e.de/ispell/igerman98/index.html" arch="noarch" options="!check" # no tests license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/de/aspell6-de-$_pkgver.tar.bz2" -builddir="$srcdir/aspell6-de-$_pkgver" +source="https://j3e.de/ispell/igerman98/dict/igerman98-${pkgver}.tar.bz2" +builddir="$srcdir/igerman98-$pkgver" +_langs="de_DE de_AT de_CH" build() { cd "$builddir" - ./configure --vars DESTDIR="$pkgdir" + for i in $_langs; do + make aspell/${i}.rws + done } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install + 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 } -sha512sums="2005b56938565b11b761ace31006c1accfd32d401685cc5676cc4d85406bedda81b1df062949359f1bd6972073d3713204d87c7f81d9535fa956cdf130dd8db6 aspell6-de-20030222-1.tar.bz2" +sha512sums="62be84ac76fd2a0acc25439aa4c04339e54a1c7a2f619d76e0e01cfb53eeeca263c5cc335e315f9adeee9bab5cc392d4c473ca55cbed371c04c123d6fa2272aa igerman98-20161207.tar.bz2" diff --git a/user/aspell-dict-ga/APKBUILD b/user/aspell-dict-ga/APKBUILD index d845f8f46..7ade44261 100644 --- a/user/aspell-dict-ga/APKBUILD +++ b/user/aspell-dict-ga/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=aspell-dict-ga -pkgver=4.5.0 +pkgver=5.0.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} +_pkgver2=${pkgver%.*} pkgrel=0 pkgdesc="Irish dictionaries for aspell" -url="http://aspell.net" +url="https://cadhan.com/gaelspell/" arch="noarch" options="!check" # no tests license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ga/aspell5-ga-$_pkgver.tar.bz2" +source="https://github.com/kscanne/gaelspell/releases/download/v$_pkgver2/aspell5-ga-$_pkgver.tar.bz2" builddir="$srcdir/aspell5-ga-$_pkgver" build() { @@ -23,4 +24,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="e68003e08d75e172e6223c7011795f40a386776559c2f05e049de196f0d5dcbe570a5ec704e6543b519eba5c847054d30b19e462c7ee228eddac4d72ccd82db0 aspell5-ga-4.5-0.tar.bz2" +sha512sums="15c4e3d85c1ad589300f7288af054d0574e849163816e5e5aec56d464a71fcd02eba129ed74ed7ec341bb19ad2578091c6701b36ac23cc5a7972026742e9bb57 aspell5-ga-5.0-0.tar.bz2" diff --git a/user/aspell-dict-it/APKBUILD b/user/aspell-dict-it/APKBUILD index 8657914d9..639d81c27 100644 --- a/user/aspell-dict-it/APKBUILD +++ b/user/aspell-dict-it/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=aspell-dict-it -pkgver=2.2.20050523.0 -_pkgver=${pkgver%.*.*}_${pkgver#*.*.} -_pkgver=${_pkgver%.*}-${_pkgver#*.*_*.} +pkgver=2.4.20070901.0 +_pkgver=${pkgver%.*.*}-${pkgver#*.*.} +_pkgver=${_pkgver%.*}-${_pkgver#*.*-*.} pkgrel=0 pkgdesc="Italian dictionaries for aspell" url="http://aspell.net" @@ -12,7 +12,7 @@ options="!check" # no tests license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/it/aspell6-it-$_pkgver.tar.bz2" +source="https://downloads.sourceforge.net/linguistico/aspell6-it-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-it-$_pkgver" build() { @@ -24,4 +24,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2a2ccdbb8bb52e8e08525a40f985c1a2987c00d5e9fd39f57b8dc8689f3503f63751efe9ae4bec45fc5efea64666cd64abbda3e437ad0819f15b5a96987cda5a aspell6-it-2.2_20050523-0.tar.bz2" +sha512sums="6a5014880e51103e70d57a6b01e2d4bb5d51ae939f72ee9270b46891804203399c817dd73c3a0b91c004744a4e66a1a5b402d19be0a53db952152cdd3c1741e9 aspell6-it-2.4-20070901-0.tar.bz2" diff --git a/user/aspell-dict-lt/APKBUILD b/user/aspell-dict-lt/APKBUILD index 256ba69e1..8d31a0a30 100644 --- a/user/aspell-dict-lt/APKBUILD +++ b/user/aspell-dict-lt/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=aspell-dict-lt -pkgver=1.2.1.0 +pkgver=1.3 _pkgver=${pkgver%.*}-${pkgver#*.*.*.} pkgrel=0 pkgdesc="Lithuanian dictionaries for aspell" -url="http://aspell.net" +url="https://launchpad.net/ispell-lt" arch="noarch" options="!check" # no tests license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/lt/aspell6-lt-$_pkgver.tar.bz2" -builddir="$srcdir/aspell6-lt-$_pkgver" +source="https://launchpad.net/ispell-lt/main/$pkgver/+download/aspell6-lt-$pkgver.tar.bz2" +builddir="$srcdir/aspell6-lt-$pkgver" build() { cd "$builddir" @@ -23,4 +23,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="d0dcea087a926f7defbab0180d9c04c93a53da8843fe374f7f59284362453ee6b198568066053ad591df4c194d7c3b0ac59331611698b78e2ded558aa5e7775b aspell6-lt-1.2.1-0.tar.bz2" +sha512sums="dd19994f703b78b1296644699df18ddcdfdcb2441003ed9edee03ee18601ff2e15e9b4ed8fbf844d72b31f0c0313a6755c89b67c44eea35485c30f2abc3b206f aspell6-lt-1.3.tar.bz2" diff --git a/user/aspell-dict-ml/APKBUILD b/user/aspell-dict-ml/APKBUILD index 074c106af..8cd3ee5fc 100644 --- a/user/aspell-dict-ml/APKBUILD +++ b/user/aspell-dict-ml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=aspell-dict-ml -pkgver=0.03.1 +pkgver=0.04.1 _pkgver=${pkgver%.*}-${pkgver#*.*.} pkgrel=0 pkgdesc="Malayalam dictionaries for aspell" @@ -11,7 +11,7 @@ options="!check" # no tests license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ml/aspell6-ml-$_pkgver.tar.bz2" +source="http://gnu.mirrors.pair.com/savannah/savannah/smc/Spellchecker/aspell6-ml-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-ml-$_pkgver" build() { @@ -23,4 +23,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="78c3bc296a70a3b205427bcffe29b69ae6f673ffd22fd8a1ef5550ae271ed1f7704fff15c4948dcee2d7722c5d4b279766ef74d0661969b13bbca4d3a53971da aspell6-ml-0.03-1.tar.bz2" +sha512sums="a9b6e522f9a4b4d9034f9cd2e1546e0cdfc9bad9f9c7515c8144efb186fb164ab55d422e93da89f0cf7c2b7e6f7b5d439747cc8b7e211c5b09a3638573765563 aspell6-ml-0.04-1.tar.bz2" diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD index f57d8bec4..e7c364f02 100644 --- a/user/aspell-dict-pl/APKBUILD +++ b/user/aspell-dict-pl/APKBUILD @@ -1,19 +1,17 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=aspell-dict-pl -pkgver=6.0.20061121.0 -_pkgver=${pkgver%.*.*}_${pkgver#*.*.} -_pkgver=${_pkgver%.*}-${pkgver#*.*.*.} +pkgver=20190107 pkgrel=0 pkgdesc="Polish dictionaries for aspell" -url="http://aspell.net" +url="https://sjp.pl/slownik/ort/" arch="noarch" options="!check" # no tests license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/pl/aspell6-pl-$_pkgver.tar.bz2" -builddir="$srcdir/aspell6-pl-$_pkgver" +source="https://distfiles.adelielinux.org/source/sjp-aspell6-pl-6.0_$pkgver-0.tar.bz2" +builddir="$srcdir/aspell6-pl-6.0_$pkgver-0" build() { cd "$builddir" @@ -24,4 +22,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="424842fd3b4b2a00445590527a64393044e067b32ab973d07d90d5f35cd146ea7ae88c4f4b473a68759aa0d27a5c0fcd75b9ef0bb8ceb76e731eafd3aefc81c6 aspell6-pl-6.0_20061121-0.tar.bz2" +sha512sums="a898462495e4797173141f2f82ce74fadb80dfc469e7c4b44871f2622137d5958fad30fd0525ac9cf7a07c31b74d805bb789f022ccbcacadd0d4d1f172986665 sjp-aspell6-pl-6.0_20190107-0.tar.bz2" diff --git a/user/aspell-dict-ro/APKBUILD b/user/aspell-dict-ro/APKBUILD index a116d1d50..f80bc913f 100644 --- a/user/aspell-dict-ro/APKBUILD +++ b/user/aspell-dict-ro/APKBUILD @@ -1,18 +1,17 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=aspell-dict-ro -pkgver=3.3.2 -_pkgver=${pkgver%.*}-${pkgver#*.*.} +pkgver=3.3.10 pkgrel=0 pkgdesc="Romanian dictionaries for aspell" -url="http://aspell.net" +url="https://sourceforge.net/projects/rospell/" arch="noarch" options="!check" # no tests license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/ro/aspell5-ro-$_pkgver.tar.bz2" -builddir="$srcdir/aspell5-ro-$_pkgver" +source="https://download.sourceforge.net/rospell/aspell5-ro-$pkgver.tar.bz2" +builddir="$srcdir/aspell5-ro-$pkgver" build() { cd "$builddir" @@ -23,4 +22,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="0027334b6201e24b038d78d5b01b8495a661dc41df44b099b6c27156d11f33c26db1dd7bc9dbf45263695820b20da3891da58a30584f5e285579dec199b5acd3 aspell5-ro-3.3-2.tar.bz2" +sha512sums="c535894d11ee168311a2cc0f799005639b21f3284a2a51db25d513d3e0494cf6d2fb7517bc79bc76f2d9ae89bb43c8bcbac7f451195ee22a7cce361aa09914ba aspell5-ro-3.3.10.tar.bz2" diff --git a/user/aspell-dict-sk/APKBUILD b/user/aspell-dict-sk/APKBUILD index df481fad4..ac036cc6e 100644 --- a/user/aspell-dict-sk/APKBUILD +++ b/user/aspell-dict-sk/APKBUILD @@ -1,17 +1,17 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=aspell-dict-sk -pkgver=2.01.2 +pkgver=2.02.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} pkgrel=0 pkgdesc="Slovak dictionaries for aspell" -url="http://aspell.net" +url="http://www.sk-spell.sk.cx/aspell-sk" arch="noarch" options="!check" # no tests license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/sk/aspell6-sk-$_pkgver.tar.bz2" +source="http://www.sk-spell.sk.cx/file_download/103/aspell6-sk-$_pkgver.tar.bz2" builddir="$srcdir/aspell6-sk-$_pkgver" build() { @@ -23,4 +23,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="020de459d4ff9c6e0c88428d43c9feea346bf8fadb9fa1233e9e54471ee23f970524a9a47cc6a45d04d6857387c9d9d1ecc1af2062325298354ee6c2d9c314b4 aspell6-sk-2.01-2.tar.bz2" +sha512sums="fcdf5c043168c887f93dfad5b9c6e07d9edd0c6194139e61bee2ba3928798792d8e8b446754bc55a67acc6d333034ebed9655cc3c15ad638f834b5a9efcc63cd aspell6-sk-2.02-0.tar.bz2" diff --git a/user/aspell-dict-tl/APKBUILD b/user/aspell-dict-tl/APKBUILD index 7146e8b7f..fefaf89ff 100644 --- a/user/aspell-dict-tl/APKBUILD +++ b/user/aspell-dict-tl/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=aspell-dict-tl -pkgver=0.02.1 +pkgver=0.4.0 _pkgver=${pkgver%.*}-${pkgver#*.*.} pkgrel=0 pkgdesc="Tagalog dictionaries for aspell" -url="http://aspell.net" +url=" " # no suitable website arch="noarch" options="!check" # no tests license="GPL-2.0-only" depends="aspell" makedepends="debianutils-which" -source="ftp://ftp.gnu.org/gnu/aspell/dict/tl/aspell5-tl-$_pkgver.tar.bz2" -builddir="$srcdir/aspell5-tl-$_pkgver" +source="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/tagalog-wordlist/aspell6-tl-$_pkgver.tar.bz2" +builddir="$srcdir/aspell6-tl-$_pkgver" build() { cd "$builddir" @@ -23,4 +23,4 @@ package() { cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="2bff0f0191104312b8674ef65ee77a8e80225bc9bb6afe651aeb94a03db8781e8545b5b09f0143f557092c868f0873c17c55055b8cdd66f18a648ba2c805a6f0 aspell5-tl-0.02-1.tar.bz2" +sha512sums="e9ad3e7e619ed19ffde923a07553c4930c60292a0e5592a68cf0e09d6f6d3b3b7ff74adb8f53e9255528c319c12ef442eff4e3b2ce169156d1664b5d565a7f5a aspell6-tl-0.4-0.tar.bz2" diff --git a/user/atkmm/APKBUILD b/user/atkmm/APKBUILD new file mode 100644 index 000000000..cbf9d21de --- /dev/null +++ b/user/atkmm/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=atkmm +pkgver=2.28.0 +pkgrel=0 +pkgdesc="C++ interfaces to ATK" +url="https://gnome.org" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="glibmm-dev atk-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8457cff58648c3d3944d6a9fb400062985c70a714856a5d84d4553cb6b1202bdc47aa48c612851fea1cc1b7ab59381116c65d2a22212907e3c4b7090601946bc atkmm-2.28.0.tar.xz" diff --git a/user/attica/APKBUILD b/user/attica/APKBUILD index 879ae4da5..c3a1bc8f6 100644 --- a/user/attica/APKBUILD +++ b/user/attica/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=attica -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Qt 5-based implementation of Open Collaboration Services" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5f5233082695c507263f02877988e069a4c4b03ce51060193401edb18664218fc093964f49bd0b217c860ceea05c389e7a32a51bc7c89bfb1568db2b06b3addd attica-5.52.0.tar.xz" +sha512sums="f278423e5bcbd1899d6c41caceee740e3caee01dd1af20303827ec5a807e262e560b068dcb6619f5410ebe815b71b1244ccc453c49956c3bfd1452a88ecf5b18 attica-5.54.0.tar.xz" diff --git a/user/audacious-plugins/APKBUILD b/user/audacious-plugins/APKBUILD index 8a4742252..61d848646 100644 --- a/user/audacious-plugins/APKBUILD +++ b/user/audacious-plugins/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=audacious-plugins pkgver=3.10 -pkgrel=0 +pkgrel=1 pkgdesc="Playlist-oriented media player (plugins)" url="https://audacious-media-player.org/" arch="all" @@ -12,13 +12,12 @@ license="ISC" depends="audacious" install_if="audacious=$pkgver" makedepends="audacious-dev>=${pkgver%.*} - dbus-glib-dev libguess-dev libmowgli-dev libxml2-dev - ffmpeg-dev libcddb-dev libcdio-dev libcdio-paranoia-dev mpg123-dev - libcue-dev libmms-dev libsamplerate-dev libsndfile-dev libxcomposite-dev - libnotify-dev libogg-dev libvorbis-dev pulseaudio-dev - alsa-lib-dev curl-dev flac-dev lame-dev neon-dev sdl-dev wavpack-dev - faad2-dev fluidsynth-dev qt5-qtmultimedia-dev - automake autoconf" + alsa-lib-dev curl-dev dbus-glib-dev faad2-dev ffmpeg-dev flac-dev + fluidsynth-dev lame-dev libcddb-dev libcdio-dev libcdio-paranoia-dev + libcue-dev libguess-dev libmodplug-dev libmms-dev libmowgli-dev + libnotify-dev libogg-dev libsamplerate-dev libsndfile-dev libvorbis-dev + libxcomposite-dev libxml2-dev mpg123-dev neon-dev pulseaudio-dev + qt5-qtmultimedia-dev sdl-dev wavpack-dev" subpackages="$pkgname-lang" source="https://distfiles.audacious-media-player.org/$pkgname-$pkgver.tar.bz2" diff --git a/user/autoconf2.13/APKBUILD b/user/autoconf2.13/APKBUILD index d3b3ca73b..bd5b533a9 100644 --- a/user/autoconf2.13/APKBUILD +++ b/user/autoconf2.13/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=autoconf2.13 pkgver=2.13 -pkgrel=1 +pkgrel=2 pkgdesc="A GNU tool for automatically configuring source code" arch="noarch" license="GPL-2.0" @@ -38,5 +38,10 @@ package() { rm -f "$pkgdir"/usr/share/info/standards.info } +doc() { + default_doc + mv "$subpkgdir/usr/share/info/autoconf.info" "$subpkgdir/usr/share/info/autoconf-2.13.info" +} + sha512sums="602584f4c77b7a554aaa068eda5409b68eb0b3229e9c224bffb91c83c4314d25de15bd560a323626ff78f6df339c79e1ef8938c54b78ecadf4dc75c5241290ad autoconf-2.13.tar.gz 483d0ba23c90e41c746868ea57436033930906f306b86de5e23284a60da069f4203d478615d653b8acee7226d9b02427be42a9764ff82710019de485e5f26d1b getloadavg.patch" diff --git a/user/baekmuk-ttf/APKBUILD b/user/baekmuk-ttf/APKBUILD new file mode 100644 index 000000000..28b840f6b --- /dev/null +++ b/user/baekmuk-ttf/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=baekmuk-ttf +pkgver=2.2 +pkgrel=0 +pkgdesc="'Baekmuk' (Chalk) Korean typeface" +url="http://kldp.net/baekmuk/" +arch="noarch" +options="!check" # No test suite. +license="BSD-1-Clause" +depends="fontconfig" +makedepends="" +subpackages="" +source="http://kldp.net/baekmuk/release/865-baekmuk-ttf-$pkgver.tar.gz" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ ttf/*.ttf +} + +sha512sums="779e0bef5fe17e08e0e08ccdad9ad0e91123a5d5cbcb3d66256d517a0903c5fd91c4a8c75eb42f82fcb0d82e26455cf13aeec5ba3a04002133dbbaf1357ec14b 865-baekmuk-ttf-2.2.tar.gz" diff --git a/user/baloo-widgets/APKBUILD b/user/baloo-widgets/APKBUILD new file mode 100644 index 000000000..dcb6a2b8b --- /dev/null +++ b/user/baloo-widgets/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=baloo-widgets +pkgver=18.12.1 +pkgrel=0 +pkgdesc="Widgets that utilise the Baloo desktop indexing engine" +url="https://www.KDE.org/" +arch="all" +options="!check" # Requires /etc/fstab to exist, and udisks2 to be running. +license="GPL-2.0+" +depends="" +depends_dev="qt5-qtbase-dev baloo-dev kio-dev" +makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev + kfilemetadata-dev ki18n-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/applications/$pkgver/src/baloo-widgets-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="449dfb83d9787e5a65dc59c7927a0d8586376933bf61b658d8338d4e9cd101c2b2d51ac0bc8f1a9fcf4f8827ec1cb557617f91a6ccceb351383320f13c61c2b1 baloo-widgets-18.12.1.tar.xz" diff --git a/user/baloo/APKBUILD b/user/baloo/APKBUILD index 224cb028e..b0a147dd0 100644 --- a/user/baloo/APKBUILD +++ b/user/baloo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=baloo -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Semantic desktop search framework" url="https://www.kde.org/" @@ -56,5 +56,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="16cc6bcf966900349dd95f33f2e37f6cf8b19f1f60219f8b797f1575b6e6862faedbf4d9912021d63f2d64ca511ed61dca6c579ddfa16491851d829d12bfd46e baloo-5.52.0.tar.xz +sha512sums="ec610aa2ab6409cf206623e08eb78d7ccc3b278ca94d6f8ba79d6d705459eb5cb9d74ed9ffc4cc20c337582b12517fb59da1570aa689111c0f105746234333de baloo-5.54.0.tar.xz 5622f1eb7a692c0ebd5d904b421612292375d3ea3f4ffdc4624fa8e2dc4a5fe56e5636f11a388224642be03c8fc28a678cffb9b167eb3de48ff4ae2979e6435e initialise-variable.patch" diff --git a/user/beforelight/APKBUILD b/user/beforelight/APKBUILD new file mode 100644 index 000000000..88fef1821 --- /dev/null +++ b/user/beforelight/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=beforelight +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Example screen saver for X.Org" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros libx11-dev libxscrnsaver-dev libxt-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f6cc794159cda89ac060a43d190fa72419dbcf503a97093b4c0f05315389085ff804c2891e00da2843709e97633973010165f9d68ceb0dcc76eed150f9c75968 beforelight-1.0.5.tar.bz2" diff --git a/user/bengali-fonts/APKBUILD b/user/bengali-fonts/APKBUILD new file mode 100644 index 000000000..974e0971a --- /dev/null +++ b/user/bengali-fonts/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bengali-fonts +pkgver=1.0 +pkgrel=0 +pkgdesc="Libre typefaces for Bengali (Bengla script)" +url="https://www.nongnu.org/freebangfont/index.html" +arch="noarch" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://savannah.nongnu.org/download/freebangfont/Akaash-0.8.5.tar.gz + https://savannah.nongnu.org/download/freebangfont/Ani.tar.gz + https://savannah.nongnu.org/download/freebangfont/Likhan-0.5.tar.gz + https://savannah.nongnu.org/download/freebangfont/MuktiNarrow-0.94.tar.bz2 + " +builddir="$srcdir" + +prepare() { + cd "$builddir" + default_prepare + # don't capitalise extension + mv Ani/mitra.TTF Ani/mitra.ttf +} + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF \ + $(find . -name *.ttf) +} + +sha512sums="0f21c67b0ec4af383573688d43f3ae72727382aeb33a914255dfaec2eed639306b175947f3c31a4896488896e40b3e4439d5d9b68f905bb2d8dc7875f99765cb Akaash-0.8.5.tar.gz +147ad2cb7122a0c64a0cebf15821b2269b9f639615293bd27623b55a1c58b17a848968f9023921a06e5171172587af2eb2c01aa539731416d26ebd00fc77a9ee Ani.tar.gz +c20f4bb17498fcb67afb4e709b7edfbaee20346cd0552ef850fcb8af928c355f4ce7f8c1c92936094e1d23b0d5040340eaf8fe6d2bb6b405c8695dce39fc29eb Likhan-0.5.tar.gz +f7abd429e2591eaa047d1ac982d97fa67dc1480c42e55b2a97861abd90918704dce90b6bb27dec7b6d696f188017a74de54a7b7f45281f0515923b90300959d1 MuktiNarrow-0.94.tar.bz2" diff --git a/user/bitmap/APKBUILD b/user/bitmap/APKBUILD new file mode 100644 index 000000000..4cf034029 --- /dev/null +++ b/user/bitmap/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=bitmap +pkgver=1.0.8 +pkgrel=0 +pkgdesc="X Bitmap (XBM) editor and utilities" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros libx11-dev libxaw-dev libxmu-dev xbitmaps + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/bitmap-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="caa9f112254d59b3d0ad2d455dd8a896923250984f82135b8b7bf79a8645aff2e1a1c4cae6c8b1ba0cb2fcd89c4a6724091cb8c50b22d6524a53cca64585e303 bitmap-1.0.8.tar.bz2" diff --git a/user/blinken/APKBUILD b/user/blinken/APKBUILD index 966eaf14a..f8ef3fa83 100644 --- a/user/blinken/APKBUILD +++ b/user/blinken/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=blinken -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Memory enhancement game" url="https://www.kde.org/applications/education/blinken/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2e6c77d1f295535e584ed6f462246c7223833e9d473b99a006a8c5ba0518cdb3b3bc847c8d6201f9ff80c5672d088b21db1be1072992c91ea94b90752d080ba8 blinken-18.08.3.tar.xz" +sha512sums="32542c41e0676f2f997c58ee530b900a7f050caa8cf8cdb65d38e57cd59bcbd8e768a7f465f745ca5f8149a11201b6f14c6e0fb702e3e3917fcad6058d1c0bf5 blinken-18.12.2.tar.xz" diff --git a/user/bomber/APKBUILD b/user/bomber/APKBUILD index 23bd645da..63b663d65 100644 --- a/user/bomber/APKBUILD +++ b/user/bomber/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bomber -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Arcade bombing game" url="https://www.kde.org/applications/games/bomber/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6085333814e1a427feda8fcdd5569601241ef6fc2d22f7d219540522866f2ebb911977a3bfffc35127d996a3cf1cbd895d4081bc0513da484327bcbe531e46e0 bomber-18.08.3.tar.xz" +sha512sums="894b24388165fdcb51c2a22d1dea70cb14be6dfcccb09cf44d8a6cefeb2e3c40e97a07c0bdc71cb187505f65c29485584ce4fb2b5948cc4bd63b5a1f701cbb81 bomber-18.12.2.tar.xz" diff --git a/user/boost/APKBUILD b/user/boost/APKBUILD index e526129df..87bbc0827 100644 --- a/user/boost/APKBUILD +++ b/user/boost/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.62.0 _pkgver="${pkgver//./_}" pkgrel=7 pkgdesc="Free peer-reviewed portable C++ source libraries" -url="http://www.boost.org/" +url="https://www.boost.org/" arch="all" license="BSL-1.0" options="!check" # No test suite. diff --git a/user/bovo/APKBUILD b/user/bovo/APKBUILD index c80254472..484a5bf80 100644 --- a/user/bovo/APKBUILD +++ b/user/bovo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=bovo -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Gomoku or Connect Five game" url="https://www.kde.org/applications/games/bovo/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7053c1597c94d3c98c6008b071b43968c49a20f86a51260b4df2b94334ffb2f499885fd7cd395aad48eb80bb21cc201ed60b1c9792be0950b33db77f65eb3963 bovo-18.08.3.tar.xz" +sha512sums="1df7910c78d217f5d228e24dfc63d4ebac26021c481e7658ae1afb3373f1fd5db65d02036a5fede343f909d4661d492673f6cfb8089331e058127916e3554e66 bovo-18.12.2.tar.xz" diff --git a/user/breeze-icons/APKBUILD b/user/breeze-icons/APKBUILD index 658dabcac..7a57ede78 100644 --- a/user/breeze-icons/APKBUILD +++ b/user/breeze-icons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=breeze-icons -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Modern, coherent icon set for desktops" url="https://www.kde.org/" @@ -46,4 +46,4 @@ dark() { mv "$pkgdir"/usr/share/icons/breeze-dark "$subpkgdir"/usr/share/icons/ } -sha512sums="774a6c5587bd8c04892d5844bcd820300e98300b0a7e0402d71d40ceb09beb18c6a011e78d0e128a367ddee2847788c5af6708c51d125d0ae68937dcd935562e breeze-icons-5.52.0.tar.xz" +sha512sums="60a2f07bcf3e8ce59b3860d4e74411e3b52af16c08ff3213ecdbebca8d1e9a2918ec5b24f67af0dcee0673108a3f2c8f8b6c04d2a829bdaeac300383fdd6dad5 breeze-icons-5.54.0.tar.xz" diff --git a/user/cairomm/APKBUILD b/user/cairomm/APKBUILD new file mode 100644 index 000000000..f79d27580 --- /dev/null +++ b/user/cairomm/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=cairomm +pkgver=1.12.2 +pkgrel=0 +pkgdesc="C++ interfaces to Cairo" +url="https://gnome.org" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="glibmm-dev libsigc++-dev cairo-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://www.cairographics.org/releases/cairomm-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="df2749e3865dfddf04c40b671453e057e7e76c5052bfc38d5b986c544b7ec43de40b1ef5b4d0e34f58781230d4b220c4176ddef773cd6a316c73641c4aec77c0 cairomm-1.12.2.tar.gz" diff --git a/user/calligra/APKBUILD b/user/calligra/APKBUILD index c03a90f7f..a17bf9711 100644 --- a/user/calligra/APKBUILD +++ b/user/calligra/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=calligra pkgver=3.1.0 -pkgrel=0 +pkgrel=1 pkgdesc="KDE Office suite" url="https://www.calligra.org/" arch="all" @@ -31,6 +31,10 @@ source="https://download.kde.org/stable/calligra/$pkgver/calligra-$pkgver.tar.xz https://download.kde.org/stable/calligra/$pkgver/calligraplan-$pkgver.tar.xz c99-math.patch poppler.patch + poppler2.patch + poppler3.patch + poppler4.patch + poppler-73.patch " prepare() { @@ -77,4 +81,8 @@ package() { sha512sums="ad1b689a5b36deafcf6985d4a0a1e8148d10e19fb4a0be8343c6e1d24146b9a8ffa0890ab5bbb21816b3134d21150b57f6159db1a30cc54c0fde5bf7bdf4537b calligra-3.1.0.tar.xz a8ccc6ee2f0381b811926a296122464bdb79aad7c75ff0f7a554e4596165ff7fd7ef62c9af9232ea36542d6b538446c8920fe77cbbe7ffacdf6e6b99a1b68156 calligraplan-3.1.0.tar.xz b03d2f33a0233638be06b4219328404eac4a77c508619c4037b3b53556b257fc4888cd690bb3755562040a198cbd51a323d13553fed3f2082398556a49482c6e c99-math.patch -960614eb2d367443810cc356d004d43867a4fa4085b054ffd1522b94ef09e9338e723117c91148383d33d54104729750a199ab1b75569aaa7164a908afd3cd4c poppler.patch" +960614eb2d367443810cc356d004d43867a4fa4085b054ffd1522b94ef09e9338e723117c91148383d33d54104729750a199ab1b75569aaa7164a908afd3cd4c poppler.patch +53296af0b1ad39c523bc93a0040f1316dfb52e2077d277a83841a741c5cb48d81efb1f6328b2af2c8f1dc92db12c4d771a9a65028498d7802b2c30dd702b9455 poppler2.patch +a22b78d9664284ee5de7a4299907ec37a7835cb6ae3af8e7c1ee0202cea8c1e544fbad7395e56115fb5fe13ec06aeff22e381431e20c6c151c93003cf8a45446 poppler3.patch +df0e592f8c314581b1811776f8aa1c3dd32f05f966f23ef4dd023c41dad759aea8b674b32e2bd7bee36efe4ba0ce0bdd08f3fc30d10115330605d09d46883a28 poppler4.patch +8440f1c36aba9cb54efa36fae73d605f57e78d055225c776791b14554d6be6f081f8cdc3fa65fb9c0b600a3b030d7776b45f631b9bc00d495ab16bfc35bd66f4 poppler-73.patch" diff --git a/user/calligra/poppler-73.patch b/user/calligra/poppler-73.patch new file mode 100644 index 000000000..aa71e20b4 --- /dev/null +++ b/user/calligra/poppler-73.patch @@ -0,0 +1,45 @@ +--- calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp.old 2019-01-14 18:40:55.580000000 +0000 ++++ calligra-3.1.0/filters/karbon/pdf/SvgOutputDev.cpp 2019-01-14 18:53:05.000000000 +0000 +@@ -402,7 +402,7 @@ + + QString str; + +- const char * p = s->getCString(); ++ const char * p = s->c_str(); + int len = s->getLength(); + CharCode code; + Unicode *u = nullptr; +@@ -451,11 +451,11 @@ + *d->body << " y=\"" << y << "px\""; + + if (font && font->getFamily()) { +- *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->getCString()) << "\""; +- //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->getCString() ); ++ *d->body << " font-family=\"" << QString::fromLatin1(font->getFamily()->c_str()) << "\""; ++ //debugPdf << "font family:" << QString::fromLatin1( font->getFamily()->c_str() ); + } else if (font && font->getName()) { +- *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->getCString()) << "\""; +- //debugPdf << "font name:" << QString::fromLatin1( font->getName()->getCString() ); ++ *d->body << " font-family=\"" << QString::fromLatin1(font->getName()->c_str()) << "\""; ++ //debugPdf << "font name:" << QString::fromLatin1( font->getName()->c_str() ); + } + *d->body << " font-size=\"" << qMax(state->getFontSize(), state->getTransformedFontSize()) << "px\""; + +@@ -488,7 +488,7 @@ + if (maskColors) { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +- Guchar * pix = imgStr->getLine(); ++ unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + + for (int x = 0; x < width; x++) { +@@ -507,7 +507,7 @@ + } else { + for (int y = 0; y < height; y++) { + dest = (unsigned int *)(buffer + y * 4 * width); +- Guchar * pix = imgStr->getLine(); ++ unsigned char * pix = imgStr->getLine(); + colorMap->getRGBLine(pix, dest, width); + } + diff --git a/user/calligra/poppler2.patch b/user/calligra/poppler2.patch new file mode 100644 index 000000000..6f18c070f --- /dev/null +++ b/user/calligra/poppler2.patch @@ -0,0 +1,114 @@ +From fa4c2961b8280456d4c1484565b973d312e0bd1c Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Thu, 25 Oct 2018 23:04:39 +0200 +Subject: Mark the functions as override + +So when poppler API breaks (as it often does) it stops compiling and +someone has to fix it +--- + filters/karbon/pdf/SvgOutputDev.cpp | 13 +++-------- + filters/karbon/pdf/SvgOutputDev.h | 43 +++++++++++++++++-------------------- + 2 files changed, 23 insertions(+), 33 deletions(-) + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 5692824..1d07f16 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -387,7 +387,7 @@ QString SvgOutputDev::printStroke() + return stroke; + } + +-void SvgOutputDev::drawString(GfxState * state, GooString * s) ++void SvgOutputDev::drawString(GfxState * state, const GooString * s) + { + int render = state->getRender(); + // check for invisible text -- this is used by Acrobat Capture +@@ -478,9 +478,9 @@ void SvgOutputDev::drawString(GfxState * state, GooString * s) + *d->body << "</text>" << endl; + } + +-void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, ++void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- int *maskColors, GBool /*inlineImg*/) ++ GBool /*interpolate*/, int *maskColors, GBool inlineImg) + { + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); +@@ -547,10 +547,3 @@ void SvgOutputDev::drawImage(GfxState *state, Object */*ref*/, Stream *str, + delete imgStr; + } + +-void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, +- int width, int height, GfxImageColorMap *colorMap, +- GBool /*interpolate*/, int *maskColors, GBool inlineImg) +-{ +- drawImage(state, ref, str, width, height, colorMap, maskColors, inlineImg); +-} +- +diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h +index 2a44908..422027c 100644 +--- a/filters/karbon/pdf/SvgOutputDev.h ++++ b/filters/karbon/pdf/SvgOutputDev.h +@@ -46,38 +46,35 @@ public: + + GBool isOk(); + +- virtual GBool upsideDown(); +- virtual GBool useDrawChar(); +- virtual GBool interpretType3Chars(); +- virtual void startPage(int pageNum, GfxState *state, XRef *xref); +- virtual void endPage(); ++ GBool upsideDown() override; ++ GBool useDrawChar() override; ++ GBool interpretType3Chars() override; ++ void startPage(int pageNum, GfxState *state, XRef *xref) override; ++ void endPage() override; + + // path painting +- virtual void stroke(GfxState * state); +- virtual void fill(GfxState * state); +- virtual void eoFill(GfxState *state); ++ void stroke(GfxState * state) override; ++ void fill(GfxState * state) override; ++ void eoFill(GfxState *state) override; + + // text +- virtual void drawString(GfxState * state, GooString * s); ++ void drawString(GfxState * state, const GooString * s) override; + + // images +- virtual void drawImage(GfxState *state, Object *ref, Stream *str, ++ void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- int *maskColors, GBool inlineImg); +- virtual void drawImage(GfxState *state, Object *ref, Stream *str, +- int width, int height, GfxImageColorMap *colorMap, +- GBool interpolate, int *maskColors, GBool inlineImg); ++ GBool interpolate, int *maskColors, GBool inlineImg) override; + + // styles +- virtual void updateAll(GfxState *state); +- virtual void updateFillColor(GfxState *state); +- virtual void updateStrokeColor(GfxState *state); +- virtual void updateFillOpacity(GfxState *state); +- virtual void updateStrokeOpacity(GfxState *state); +- virtual void updateLineJoin(GfxState *state); +- virtual void updateLineCap(GfxState *state); +- virtual void updateMiterLimit(GfxState *state); +- virtual void updateLineWidth(GfxState *state); ++ void updateAll(GfxState *state) override; ++ void updateFillColor(GfxState *state) override; ++ void updateStrokeColor(GfxState *state) override; ++ void updateFillOpacity(GfxState *state) override; ++ void updateStrokeOpacity(GfxState *state) override; ++ void updateLineJoin(GfxState *state) override; ++ void updateLineCap(GfxState *state) override; ++ void updateMiterLimit(GfxState *state) override; ++ void updateLineWidth(GfxState *state) override; + + /// Dumps content to svg file + void dumpContent(); +-- +cgit v1.1 + diff --git a/user/calligra/poppler3.patch b/user/calligra/poppler3.patch new file mode 100644 index 000000000..54702b515 --- /dev/null +++ b/user/calligra/poppler3.patch @@ -0,0 +1,92 @@ +From 82d68cebf870ac97fd27b626a08c3fb4dd94ea3e Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Thu, 25 Oct 2018 23:06:34 +0200 +Subject: GBool -> bool + +It was just a typedef in poppler and it'll die in next versions +--- + filters/karbon/pdf/SvgOutputDev.cpp | 12 ++++++------ + filters/karbon/pdf/SvgOutputDev.h | 10 +++++----- + 2 files changed, 11 insertions(+), 11 deletions(-) + +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 1d07f16..870a940 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -52,7 +52,7 @@ public: + QString defsData; + QTextStream * defs; + QTextStream * body; +- GBool state; ++ bool state; + QSizeF pageSize; + QPen pen; + QBrush brush; +@@ -75,22 +75,22 @@ SvgOutputDev::~SvgOutputDev() + delete d; + } + +-GBool SvgOutputDev::isOk() ++bool SvgOutputDev::isOk() + { + return d->state; + } + +-GBool SvgOutputDev::upsideDown() ++bool SvgOutputDev::upsideDown() + { + return gTrue; + } + +-GBool SvgOutputDev::useDrawChar() ++bool SvgOutputDev::useDrawChar() + { + return gFalse; + } + +-GBool SvgOutputDev::interpretType3Chars() ++bool SvgOutputDev::interpretType3Chars() + { + return gFalse; + } +@@ -480,7 +480,7 @@ void SvgOutputDev::drawString(GfxState * state, const GooString * s) + + void SvgOutputDev::drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- GBool /*interpolate*/, int *maskColors, GBool inlineImg) ++ bool /*interpolate*/, int *maskColors, bool inlineImg) + { + ImageStream * imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits()); + imgStr->reset(); +diff --git a/filters/karbon/pdf/SvgOutputDev.h b/filters/karbon/pdf/SvgOutputDev.h +index 422027c..df2805c 100644 +--- a/filters/karbon/pdf/SvgOutputDev.h ++++ b/filters/karbon/pdf/SvgOutputDev.h +@@ -44,11 +44,11 @@ public: + explicit SvgOutputDev(const QString &fileName); + virtual ~SvgOutputDev(); + +- GBool isOk(); ++ bool isOk(); + +- GBool upsideDown() override; +- GBool useDrawChar() override; +- GBool interpretType3Chars() override; ++ bool upsideDown() override; ++ bool useDrawChar() override; ++ bool interpretType3Chars() override; + void startPage(int pageNum, GfxState *state, XRef *xref) override; + void endPage() override; + +@@ -63,7 +63,7 @@ public: + // images + void drawImage(GfxState *state, Object *ref, Stream *str, + int width, int height, GfxImageColorMap *colorMap, +- GBool interpolate, int *maskColors, GBool inlineImg) override; ++ bool interpolate, int *maskColors, bool inlineImg) override; + + // styles + void updateAll(GfxState *state) override; +-- +cgit v1.1 + diff --git a/user/calligra/poppler4.patch b/user/calligra/poppler4.patch new file mode 100644 index 000000000..9a13bcdec --- /dev/null +++ b/user/calligra/poppler4.patch @@ -0,0 +1,76 @@ +From f099b8e143bbeb1de3c7e89f4764006c3de61ae4 Mon Sep 17 00:00:00 2001 +From: Antonio Rojas <arojas@archlinux.org> +Date: Fri, 2 Nov 2018 21:23:13 +0100 +Subject: Fix build with poppler 0.71 + +Port away from removed API + +Differential Revision: https://phabricator.kde.org/D16607 +--- + filters/karbon/pdf/PdfImport.cpp | 6 +++--- + filters/karbon/pdf/SvgOutputDev.cpp | 10 +++++----- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/filters/karbon/pdf/PdfImport.cpp b/filters/karbon/pdf/PdfImport.cpp +index 48b08df..e910dae 100644 +--- a/filters/karbon/pdf/PdfImport.cpp ++++ b/filters/karbon/pdf/PdfImport.cpp +@@ -88,9 +88,9 @@ KoFilter::ConversionStatus PdfImport::convert(const QByteArray& from, const QByt + SvgOutputDev * dev = new SvgOutputDev(m_chain->outputFile()); + if (dev->isOk()) { + int rotate = 0; +- GBool useMediaBox = gTrue; +- GBool crop = gFalse; +- GBool printing = gFalse; ++ bool useMediaBox = true; ++ bool crop = false; ++ bool printing = false; + pdfDoc->displayPages(dev, firstPage, lastPage, hDPI, vDPI, rotate, useMediaBox, crop, printing); + dev->dumpContent(); + } +diff --git a/filters/karbon/pdf/SvgOutputDev.cpp b/filters/karbon/pdf/SvgOutputDev.cpp +index 9063e69..80f01a5 100644 +--- a/filters/karbon/pdf/SvgOutputDev.cpp ++++ b/filters/karbon/pdf/SvgOutputDev.cpp +@@ -39,7 +39,7 @@ class SvgOutputDev::Private + { + public: + Private(const QString &fname) +- : svgFile(fname), defs(0), body(0), state(gTrue) ++ : svgFile(fname), defs(0), body(0), state(true) + , brush(Qt::SolidPattern) {} + + ~Private() { +@@ -62,7 +62,7 @@ SvgOutputDev::SvgOutputDev(const QString &fileName) + : d(new Private(fileName)) + { + if (! d->svgFile.open(QIODevice::WriteOnly)) { +- d->state = gFalse; ++ d->state = false; + return; + } + +@@ -82,17 +82,17 @@ bool SvgOutputDev::isOk() + + bool SvgOutputDev::upsideDown() + { +- return gTrue; ++ return true; + } + + bool SvgOutputDev::useDrawChar() + { +- return gFalse; ++ return false; + } + + bool SvgOutputDev::interpretType3Chars() + { +- return gFalse; ++ return false; + } + + void SvgOutputDev::startPage(int pageNum, GfxState *state, XRef */*xref*/) +-- +cgit v1.1 + diff --git a/user/cantarell-fonts/APKBUILD b/user/cantarell-fonts/APKBUILD new file mode 100644 index 000000000..b5fec057f --- /dev/null +++ b/user/cantarell-fonts/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=cantarell-fonts +pkgver=0.111 +pkgrel=1 +pkgdesc="Humanist sans-serif typeface, designed for GNOME Shell" +url=" " +arch="noarch" +options="!check" # Impossible to test font +license="OFL-1.1" +depends="fontconfig mkfontdir" +makedepends="" +subpackages="" +replaces="ttf-cantarell" +source="https://download.gnome.org/sources/cantarell-fonts/$pkgver/cantarell-fonts-$pkgver.tar.xz" + +package() { + cd "$builddir"/prebuilt + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf +} + +sha512sums="638298a6381a3ede862d1b100fcfea943bebb5e1c0dc4f1597ab2f841e933b484436b139090a669c770c02483a24f2b92bbd12bce71d7a40eb4c325573e3df9e cantarell-fonts-0.111.tar.xz" diff --git a/user/cantor/APKBUILD b/user/cantor/APKBUILD index b7014208e..0dfcb8687 100644 --- a/user/cantor/APKBUILD +++ b/user/cantor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cantor -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="KDE worksheet interface for popular mathematical applications" url="https://edu.kde.org/cantor/" @@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev qt5-qtxmlpatterns-dev karchive-dev kcompletion-dev kconfig-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev kiconthemes-dev kio-dev knewstuff-dev kparts-dev kpty-dev ktexteditor-dev - ktextwidgets-dev kxmlgui-dev + ktextwidgets-dev kxmlgui-dev libspectre-dev analitza-dev gfortran libqalculate-dev python3-dev r r-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b6a3bfcc6dce8792fcad9bcaec6b30dfe50ab42b0781a3d33477b2fee1773c20400f4de069176bcf3ae6bfb232a32aa0d5f2e6e9059706f9da6aa65f63a018ec cantor-18.08.3.tar.xz" +sha512sums="ca2cc38edbd06537d45f19b54abebd2d574e4d8658f9e1513ef5d3ab36f25ad18510f6abd949a3a8897631578404349df8433361208f27078c2badac7cf7fd1d cantor-18.12.2.tar.xz" diff --git a/user/cardo/APKBUILD b/user/cardo/APKBUILD new file mode 100644 index 000000000..7af7e9f04 --- /dev/null +++ b/user/cardo/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=cardo +pkgver=1.04 +pkgrel=0 +pkgdesc="Unicode font designed for scholars and linguists" +url="http://scholarsfonts.net/cardofnt.html" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="http://scholarsfonts.net/cardo104.zip" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="559d91528dfebba1c0668ab0116e7cc8d481c88727cf01848978d920d625ee32c893d6abff3170e5365e136fa6f603c4f34390e17383409bc3db01611c42eefb cardo104.zip" diff --git a/user/catcodec/APKBUILD b/user/catcodec/APKBUILD new file mode 100644 index 000000000..9a18b7b29 --- /dev/null +++ b/user/catcodec/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=catcodec +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Encode and decode sound sample catalogues for OpenTTD" +url="https://www.openttd.org/en/" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="https://binaries.openttd.org/extra/catcodec/1.0.5/catcodec-$pkgver-source.tar.xz" + +build() { + cd "$builddir" + make +} + +package() { + cd "$builddir" + make prefix=/usr DESTDIR="$pkgdir" install +} + +sha512sums="e6e17da17f2449ff5d3a18c34ba3125d475a481ef1dc73ba03dac32fc8523a8929d2cbdfda5f647a0226aa007a217fc90c85ec4cc46937f75e15a596277e0db5 catcodec-1.0.5-source.tar.xz" diff --git a/user/catfish/APKBUILD b/user/catfish/APKBUILD index 2dfb80c66..efcbacd72 100644 --- a/user/catfish/APKBUILD +++ b/user/catfish/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=catfish -pkgver=1.4.6 +pkgver=1.4.7 pkgrel=0 pkgdesc="File-searching application for the XFCE desktop environment" url="https://xfce.org" @@ -11,7 +11,6 @@ depends="python3 py3-pygobject py3-pexpect" makedepends="py3-distutils-extra intltool" subpackages="$pkgname-doc $pkgname-lang" source="http://archive.xfce.org/src/apps/catfish/1.4/catfish-$pkgver.tar.bz2" -sha512sums="1c50375a9b36554123327a138c50de47abbbfd2fb334b91773312e9001e4bbc936550c2b23ad658b29fe9f1537d59997513b01bf4e2c31ce0286f5650776f8f7 catfish-1.4.6.tar.bz2" build() { cd "$builddir" @@ -28,3 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } +sha512sums="cafa8eaaa40522f50111b3bb9c09a116ebad827532b0cfc88bc643fb2e2d89edee53057fbbed23719f4091ca384d7ea025633e571e160d7dfced008f788a3ffd catfish-1.4.7.tar.bz2" diff --git a/user/cdrtools/APKBUILD b/user/cdrtools/APKBUILD index c9e6c1d70..39a3021c8 100644 --- a/user/cdrtools/APKBUILD +++ b/user/cdrtools/APKBUILD @@ -2,9 +2,9 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=cdrtools pkgver=3.01 -pkgrel=0 +pkgrel=1 pkgdesc="Highly portable CD/DVD/Blu-Ray command line recording software" -url="http://cdrecord.sourceforge.net/private/cdrecord.html" +url="http://schilytools.sourceforge.net/" arch="all" options="suid" license="CDDL-1.0" @@ -26,6 +26,9 @@ check() { package() { cd "$builddir" smake INS_BASE=/usr DESTDIR="$pkgdir" install + + mv "$pkgdir"/usr/share/man/man3 "$pkgdir"/usr/share/man/man3sch + rename .3 .3sch "$pkgdir"/usr/share/man/man3sch/*.3 } sha512sums="54f06496e47184e324fc9d8b1153d3c806ed43c3c57e2a8d79a79afe12aa5334e82fa500fe1b1bf49307ad7dfabe687f6e1ad914fc2f0c5c429d8e6a34c293eb cdrtools-3.01.tar.bz2" diff --git a/user/certbot/APKBUILD b/user/certbot/APKBUILD index 5c0ba42d9..cbe6853f5 100644 --- a/user/certbot/APKBUILD +++ b/user/certbot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: zlg <zlg+adelie@zlg.space> pkgname=certbot -pkgver=0.28.0 +pkgver=0.30.2 pkgrel=0 pkgdesc="The EFF's reference ACME client" url="https://certbot.eff.org/" @@ -41,4 +41,4 @@ acme() { python3 setup.py install --prefix=/usr --root="$subpkgdir" } -sha512sums="07c9bbad52acebc60e48d79619e4f12818d67c3b0f41ffa4fcd02098fb9da245e4006418f54c51c2e4bb9aaa01a21f7a083c9eb092f533e6676ed75ae8667a54 certbot-0.28.0.tar.gz" +sha512sums="94c26be7c04de74acf650b4d243675e92c6807eb6bb82fcffd867b22aa5b5527e6f637155fafcb121dfeff77e8a236301c080ad42284b3bf777d2cfc7f4d0de6 certbot-0.30.2.tar.gz" diff --git a/user/cgmanager/APKBUILD b/user/cgmanager/APKBUILD new file mode 100644 index 000000000..958ba8327 --- /dev/null +++ b/user/cgmanager/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=cgmanager +pkgver=0.41 +pkgrel=0 +pkgdesc="CGroup management daemon" +url="https://linuxcontainers.org/cgmanager/introduction/" +arch="all" +license="LGPL-2.1+ AND GPL-2.0-only" +depends="" +makedepends="help2man libnih-dev linux-pam-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc" +source="https://linuxcontainers.org/downloads/cgmanager/cgmanager-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-init-script=openrc + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e8ba64665a21d987cd835580c2b6bafbcb05e22ce7f6216762d04840957c2cd21fb571360e0206ae9143656beed88ff3396eb1f644052c05189093a665a705fd cgmanager-0.41.tar.gz" diff --git a/user/chelf/APKBUILD b/user/chelf/APKBUILD new file mode 100644 index 000000000..83b9c1402 --- /dev/null +++ b/user/chelf/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=chelf +pkgver=0.1_git20190110 +pkgrel=0 +pkgdesc="Display or change the stack size of an ELF binary" +url=" " +arch="all" +options="!check" # No test suite. +license="BSD-2-Clause" +depends="" +makedepends="" +subpackages="" +source="$pkgname-$pkgver.tar.xz::https://distfiles.adelielinux.org/source/$pkgname-$pkgver.txz + fix-uninitialised-read.patch + " + +build() { + cd "$builddir" + make +} + +package() { + cd "$builddir" + install -D -m755 chelf "$pkgdir"/usr/bin/chelf +} + +sha512sums="6154e1580f4ea355aaa5017cced37d278d7e864d2c924e521aadc79d839ce79d1a94a9f8ebef1274f92748058278b628ec384f5d5e4572fe56d7745208146dbe chelf-0.1_git20190110.tar.xz +435610112eec83b27c922b5f84ca1e9abfa8c1834f5fafea0deb6911532fd7c0924da002a0c5523d6cd013c8d56e02cc6ae30321fdf4955399b7fcabe5c64e35 fix-uninitialised-read.patch" diff --git a/user/chelf/fix-uninitialised-read.patch b/user/chelf/fix-uninitialised-read.patch new file mode 100644 index 000000000..0623647fe --- /dev/null +++ b/user/chelf/fix-uninitialised-read.patch @@ -0,0 +1,11 @@ +--- chelf-0.1_git20190110/main.c.old 2018-10-29 10:37:25.000000000 +0000 ++++ chelf-0.1_git20190110/main.c 2019-01-10 18:44:45.320000000 +0000 +@@ -32,7 +32,7 @@ + { + int fd, rv = -1; + struct stat st; +- void *elf; ++ void *elf = NULL; + const int open_flags = (mode == MODE_WRITE) ? O_RDWR : O_RDONLY; + const int mmap_flags = (mode == MODE_WRITE) ? + (PROT_WRITE|PROT_READ) : PROT_READ; diff --git a/user/cifs-utils/APKBUILD b/user/cifs-utils/APKBUILD new file mode 100644 index 000000000..f5987a037 --- /dev/null +++ b/user/cifs-utils/APKBUILD @@ -0,0 +1,53 @@ +# Contributor: Francesco Colista <fcolista@alpinelinux.org> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=cifs-utils +pkgver=6.8 +pkgrel=0 +pkgdesc="CIFS filesystem user-space tools" +url="https://wiki.samba.org/index.php/LinuxCIFS_utils" +arch="all" +options="!check suid" # No test suite. +license="GPL-3.0+ AND GPL-2.0+ AND LGPL-3.0+" +depends="" +makedepends="keyutils-dev krb5-dev libcap-ng-dev linux-pam-dev + py3-docutils talloc-dev" +subpackages="$pkgname-doc $pkgname-dev" +source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2 + musl-fix-includes.patch + xattr_size_max.patch" + +build() { + cd "$builddir" + # --enable-cifsidmap and --enable-cifsacl require libwbclient (samba) + + autoreconf -i + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --enable-cifsidmap=no \ + --enable-cifsacl=no + make +} + +check() { + cd "$builddir" + + make check +} + +package() { + cd "$builddir" + + make DESTDIR="$pkgdir" install + # Allow unprivileged mount + chmod u+s "$pkgdir"/sbin/mount.cifs +} + +sha512sums="54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13 cifs-utils-6.8.tar.bz2 +99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch +2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch" diff --git a/user/cifs-utils/musl-fix-includes.patch b/user/cifs-utils/musl-fix-includes.patch new file mode 100644 index 000000000..c7b9b004f --- /dev/null +++ b/user/cifs-utils/musl-fix-includes.patch @@ -0,0 +1,11 @@ +--- cifs-utils-6.2.orig/mount.h ++++ cifs-utils-6.2/mount.h +@@ -20,6 +20,8 @@ + #ifndef _MOUNT_H_ + #define _MOUNT_H_ + ++#include <paths.h> ++ + /* exit status - bits below are ORed */ + #define EX_USAGE 1 /* incorrect invocation or permission */ + #define EX_SYSERR 2 /* out of memory, cannot fork, ... */ diff --git a/user/cifs-utils/xattr_size_max.patch b/user/cifs-utils/xattr_size_max.patch new file mode 100644 index 000000000..041041a61 --- /dev/null +++ b/user/cifs-utils/xattr_size_max.patch @@ -0,0 +1,32 @@ +diff --git a/getcifsacl.c b/getcifsacl.c +index f08cdea..5c46999 100644 +--- a/getcifsacl.c ++++ b/getcifsacl.c +@@ -38,6 +38,11 @@ + #include "cifsacl.h" + #include "idmap_plugin.h" + ++#ifdef __linux__ ++#include <linux/limits.h> /* for XATTR_SIZE_MAX */ ++#include <endian.h> /* le16toh, le32toh etc */ ++#endif ++ + static void *plugin_handle; + static bool plugin_loaded; + +diff --git a/setcifsacl.c b/setcifsacl.c +index ba34403..64e6eaa 100644 +--- a/setcifsacl.c ++++ b/setcifsacl.c +@@ -39,6 +39,11 @@ + #include "cifsacl.h" + #include "idmap_plugin.h" + ++#ifdef __linux__ ++#include <linux/limits.h> /* for XATTR_SIZE_MAX */ ++#include <endian.h> /* le16toh, le32toh etc */ ++#endif ++ + enum setcifsacl_actions { + ActUnknown = -1, + ActDelete, diff --git a/user/clearsans/APKBUILD b/user/clearsans/APKBUILD new file mode 100644 index 000000000..2f8f486d0 --- /dev/null +++ b/user/clearsans/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=clearsans +pkgver=1.00 +pkgrel=0 +pkgdesc="Typeface designed for screen and Web" +url="https://01.org/clear-sans" +arch="noarch" +options="!check" # No test suite. +license="Apache-2.0" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://01.org/sites/default/files/downloads/clear-sans/clearsans-$pkgver.zip" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ TTF/*.ttf +} + +sha512sums="83faebae8b1041ab16bb3c6586574374f70ad1da406ad5d20f07f14b65e00e8645c5393471cea0194b14f2c2d926d6de814f745299062a4dccef2581e6de332d clearsans-1.00.zip" diff --git a/user/cm-unicode/APKBUILD b/user/cm-unicode/APKBUILD new file mode 100644 index 000000000..30a09c8a0 --- /dev/null +++ b/user/cm-unicode/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=cm-unicode +pkgver=0.7.0 +pkgrel=0 +pkgdesc="The default TeX typeface, Computer Modern" +url="http://cm-unicode.sourceforge.net/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://downloads.sourceforge.net/cm-unicode/cm-unicode-$pkgver-ttf.tar.xz" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="6340b7c6b220c8c887a4b77e77a01a43bedf13d08dd1d62570de70866d0bff908adf3fcb7907149ab2f5ab060650b39eaad3c01c1e8d028bbeb879b058190e70 cm-unicode-0.7.0-ttf.tar.xz" diff --git a/user/comfortaa/APKBUILD b/user/comfortaa/APKBUILD new file mode 100644 index 000000000..cca3023f9 --- /dev/null +++ b/user/comfortaa/APKBUILD @@ -0,0 +1,23 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=comfortaa +pkgver=3.001 +pkgrel=0 +pkgdesc="Stylish, modern, free TrueType font" +url="https://www.deviantart.com/aajohan/art/Comfortaa-font-105395949" +arch="noarch" +options="!check" # No testing fonts. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://distfiles.adelielinux.org/source/comfortaa-$pkgver.zip" +builddir="$srcdir/$pkgver" + +package() { + cd "$builddir" + mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/ + install -D -m644 *.ttf "$pkgdir"/usr/share/fonts/X11/TTF/ +} + +sha512sums="caf998f9a1dd994f790a2ace1fcc8bf5632f21a61d849e6b5590d808d646556115ec08142397817d9dcfc1bb507d62ca52caf061e5c6048f89bc77f6e74c1f4b comfortaa-3.001.zip" diff --git a/user/comic-neue/APKBUILD b/user/comic-neue/APKBUILD new file mode 100644 index 000000000..8b731ab10 --- /dev/null +++ b/user/comic-neue/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=comic-neue +pkgver=2.3 +pkgrel=0 +pkgdesc="Casual typeface" +url="http://comicneue.com/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="http://comicneue.com/comic-neue-$pkgver.zip" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ OTF/*.otf +} + +sha512sums="37adcc314f6d4bdc888e056488b209c4a8f3ee5f51618960a733e9d88ee513bafb2abf2b3d9d5bc4d2106297cf38645a8ab56c0fe79974b2ee6e0528aebaf4f5 comic-neue-2.3.zip" diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD index 1ed0e33c2..4f901633a 100644 --- a/user/compton-conf/APKBUILD +++ b/user/compton-conf/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=compton-conf -pkgver=0.4.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="GUI configuration tool for the Compton X compositor" url="https://lxqt.org" arch="all" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev - libconfig-dev liblxqt-dev lxqt-build-tools" + libconfig-dev liblxqt-dev lxqt-build-tools>=0.6.0" subpackages="" source="https://github.com/lxqt/compton-conf/releases/download/$pkgver/compton-conf-$pkgver.tar.xz" @@ -27,7 +27,6 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -37,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7d56cac1d1f749f22b5da35618fce261f66dc57e4378d8fb5203072b82542b775d89b6b91abf053650dc2a738d7310291c9dc6ecbe17fca9e6bc4868c93488c0 compton-conf-0.4.0.tar.xz" +sha512sums="dd5b722a24a9a69523960f2978d14c40b2a3cc5cfbe8215abde5aaa7dbb2c2e68711f15c61e4275d8527d07cda90066607f8523ad26225c63d8c9a5b124a0218 compton-conf-0.14.0.tar.xz" diff --git a/user/compton/APKBUILD b/user/compton/APKBUILD new file mode 100644 index 000000000..338f123de --- /dev/null +++ b/user/compton/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=compton +pkgver=4 +pkgrel=0 +pkgdesc="Lightweight compositor for X11" +url="https://github.com/yshui/compton" +arch="all" +options="!check" # no tests +license="MIT AND MPL-2.0" +makedepends="meson libx11-dev libxext-dev libev-dev xcb-util-renderutil-dev + xcb-util-image-dev pixman-dev libconfig-dev pcre-dev mesa-dev + dbus-dev" +source="compton-$pkgver.tar.gz::https://github.com/yshui/compton/archive/v$pkgver.tar.gz" + +build() { + cd "$builddir" + meson \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + ninja -C output +} + +package() { + cd "$builddir" + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="ba585df25792519b8093a5a91d62ca2d3b02dd9df41d787dc4007cee5c8aef7cd0a3c267b58d21026c97b7859f7c5376384dffb7da728a99ccc4122a2ae43679 compton-4.tar.gz" diff --git a/user/confuse/APKBUILD b/user/confuse/APKBUILD new file mode 100644 index 000000000..3fe8f33b4 --- /dev/null +++ b/user/confuse/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +pkgname=confuse +pkgver=3.2.2 +pkgrel=0 +pkgdesc="Small configuration file parser library for C" +url="https://github.com/martinh/libconfuse" +arch="all" +options="!checkroot" +license="ISC" +depends="" +makedepends="" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="$url/releases/download/v$pkgver/$pkgname-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-rpath \ + --disable-examples \ + --enable-nls + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="c6baea65e064fe7f2d1bde187c6dcbb7f03c31f5d777cb04576f9cc2d94e9c96b7ee202e030e9a2c7eb619deb240d9e76fb12b3528ae5aa0d3abe231354d12c9 confuse-3.2.2.tar.xz" diff --git a/user/convertlit/APKBUILD b/user/convertlit/APKBUILD new file mode 100644 index 000000000..49cce0d46 --- /dev/null +++ b/user/convertlit/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=convertlit +pkgver=1.8 +pkgrel=0 +pkgdesc="Tool to convert Microsoft Reader .LIT files to open formats" +url="http://www.convertlit.com/" +arch="all" +options="!check" # No test suite. +license="GPL-2.0" +depends="" +makedepends="libtommath-dev" +subpackages="" +source="http://www.convertlit.com/${pkgname}${pkgver/./}src.zip + lib.patch + " +builddir="$srcdir/" + +build() { + cd "$builddir" + make -C lib + make -C clit18 +} + +package() { + cd "$builddir" + install -D -m755 clit18/clit "$pkgdir"/usr/bin/clit +} + +sha512sums="0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36 convertlit18src.zip +b54a826805f3ce13d75da3c0f8f635235efd8ae1550962b5e44a5c8c67325f996848a3be6f5ba989a849c66a2293a30ac117212786ff36b5c01743aa87f6ef29 lib.patch" diff --git a/user/convertlit/lib.patch b/user/convertlit/lib.patch new file mode 100644 index 000000000..222f29074 --- /dev/null +++ b/user/convertlit/lib.patch @@ -0,0 +1,14 @@ +--- src/clit18/Makefile.old 2004-07-04 16:52:14.000000000 +0000 ++++ src/clit18/Makefile 2019-01-15 17:13:44.510000000 +0000 +@@ -1,9 +1,9 @@ + all: clit
+
+-CFLAGS=-funsigned-char -Wall -O2 -I ../libtommath-0.30/ -I ../lib -I ../lib/des -I .
++CFLAGS=-funsigned-char -I ../lib -I ../lib/des -I .
+ clean:
+ rm -f *.o clit
+
+ clit: clit.o hexdump.o drm5.o explode.o transmute.o display.o utils.o manifest.o ../lib/openclit.a
+- gcc -o clit $^ ../libtommath-0.30/libtommath.a
++ $(CC) $(LDFLAGS) -o clit $^ -ltommath
+
diff --git a/user/courier-prime/APKBUILD b/user/courier-prime/APKBUILD new file mode 100644 index 000000000..94cdce083 --- /dev/null +++ b/user/courier-prime/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=courier-prime +pkgver=1.203 +pkgrel=0 +pkgdesc="Redesigned Courier typeface made for screenwriters" +url="https://www.quoteunquoteapps.com/courierprime/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://dev.gentoo.org/~jstein/dist/courier-prime-$pkgver.tar.xz" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="fef9d7f09dafbdb9d8626cb06cac617319d5ec43aef29fe7f6ee25156b380f9ec9684715d6012f05cb40d9511d44cf36a9ed1951281218b2c545e6ce4e7cdbda courier-prime-1.203.tar.xz" diff --git a/user/cracklib/APKBUILD b/user/cracklib/APKBUILD new file mode 100644 index 000000000..eba2a0c49 --- /dev/null +++ b/user/cracklib/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=cracklib +pkgver=2.9.6 +pkgrel=0 +pkgdesc="Library for checking passwords against dictionary words" +url=" " +arch="all" +license="LGPL-2.0+" +depends="" +makedepends="" +subpackages="$pkgname-dev $pkgname-lang" +triggers="$pkgname.trigger=/usr/share/dict" +source="https://github.com/cracklib/cracklib/releases/download/cracklib-$pkgver/cracklib-$pkgver.tar.gz + $pkgname.trigger + " + +prepare() { + cd "$builddir" + default_prepare +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make test +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + install -D -m644 dicts/cracklib-small "$pkgdir"/usr/share/dict/cracklib-small +} + +sha512sums="2b09672e5b412d670e7ed911ebf0c0023fe2901ea05c9c02eefb7a58a13cddbc27a65d75bb20be9f8cebf4c90a9a56dfe1a3b656dff62b1d6048f5376e671786 cracklib-2.9.6.tar.gz +deef4710a3bf78348adfe699ff995acc21a7671ab03c4dd28da7f38f4a83008af4c97c9c1d4e1e98a47c0148c84146b36477f41f98fb0ee028cc0fadebb85ab9 cracklib.trigger" diff --git a/user/cracklib/cracklib.trigger b/user/cracklib/cracklib.trigger new file mode 100644 index 000000000..677155080 --- /dev/null +++ b/user/cracklib/cracklib.trigger @@ -0,0 +1,3 @@ +#!/bin/sh + +create-cracklib-dict /usr/share/dict/* diff --git a/user/ctags/APKBUILD b/user/ctags/APKBUILD new file mode 100644 index 000000000..bdc83ed14 --- /dev/null +++ b/user/ctags/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ctags +pkgver=5.8 +pkgrel=0 +pkgdesc="Source code indexer for faster searching" +url="http://ctags.sourceforge.net/" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="https://prdownloads.sourceforge.net/ctags/ctags-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + install -D -m755 ctags "$pkgdir"/usr/bin/ctags + install -D -m644 ctags.1 "$pkgdir"/usr/share/man/man1/ctags.1 +} + +sha512sums="981912cd335978cde22864e977947fc75326572fb29518e559cc4a8ac1edc84b3604165218a666e36353f17da4f89f8e967acdb88696f816748eb946d79eaa15 ctags-5.8.tar.gz" diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD index 83a95a7ed..98205aecb 100644 --- a/user/cups-filters/APKBUILD +++ b/user/cups-filters/APKBUILD @@ -1,20 +1,18 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=cups-filters -pkgver=1.21.3 +pkgver=1.21.6 pkgrel=0 pkgdesc="OpenPrinting CUPS filters and backends" url="https://wiki.linuxfoundation.org/openprinting/cups-filters" arch="all" license="GPL-2.0-only AND GPL-2.0+ AND GPL-3.0-only AND MIT" -depends="poppler-utils bc ttf-freefont" +depends="gnu-ghostscript poppler-utils bc ttf-freefont" makedepends="cups-dev libjpeg-turbo-dev poppler-dev zlib-dev libpng-dev tiff-dev lcms2-dev freetype-dev fontconfig-dev qpdf-dev dbus-dev linux-headers coreutils gnutls-dev python3" checkdepends="ttf-dejavu" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" -source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz - poppler-69-support.patch - " +source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz" build() { cd "$builddir" @@ -32,7 +30,6 @@ build() { --without-rcdir \ --without-rclevels \ --disable-avahi \ - --disable-ghostscript \ --disable-mutool \ --with-test-font-path='/usr/share/fonts/ttf-dejavu/DejaVuSans.ttf' # workaround parallel build issue by building libcupsfilters.la first @@ -65,5 +62,4 @@ libs() { mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="2b00023ac4177046e3ab3c5b563b7bd92bb49e57e645e6e67e7b9358d00919e2d4ca43ef5d57684523d97f1f1df5d1014fc0a3a895476ce285ccb3ed2e3bc758 cups-filters-1.21.3.tar.xz -6db4cd5d809c7f9511db9cf8cf6b293e5b9143e8d4d7d954a1f7f206a1cbe8baedcc6306c1f8dc7df6dee74ce8c88ffec3dd7efa1f22c32ea37168971013c1ff poppler-69-support.patch" +sha512sums="804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a cups-filters-1.21.6.tar.xz" diff --git a/user/cups-filters/poppler-69-support.patch b/user/cups-filters/poppler-69-support.patch deleted file mode 100644 index e9516d1bb..000000000 --- a/user/cups-filters/poppler-69-support.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 6b0747c1630dd973acd138f927dbded4ea45e360 Mon Sep 17 00:00:00 2001 -From: Olivier Schonken <olivier.schonken@gmail.com> -Date: Fri, 5 Oct 2018 12:05:31 +0200 -Subject: [PATCH] Poppler removed memCheck and gMemReport functions - -Only use gMemReport and memCheck functions if poppler version less -than 0.69.0 - -The poppler project removed the memCheck and gMemReport functions in -commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM -from Object since this uses RAII now and hence cannot leak. -(The existing tracking also is not thread-safe and hence unreliable.) - -and - -f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging -from gmem since external tools and compiler instrumentation achieve the -same effect. - -This commit solves https://github.com/OpenPrinting/cups-filters/issues/62 - -Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com> ---- - filter/pdftoijs.cxx | 2 ++ - filter/pdftoopvp/pdftoopvp.cxx | 2 ++ - filter/pdftoraster.cxx | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx -index 22bc33f4..dd6b6fa0 100644 ---- a/filter/pdftoijs.cxx -+++ b/filter/pdftoijs.cxx -@@ -503,9 +503,11 @@ int main(int argc, char *argv[]) { - ppdClose(ppd); - free(outputfile); - -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69 - // Check for memory leaks - Object::memCheck(stderr); - gMemReport(stderr); -+#endif - - return exitCode; - } -diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx -index 024941ab..bf25983b 100644 ---- a/filter/pdftoopvp/pdftoopvp.cxx -+++ b/filter/pdftoopvp/pdftoopvp.cxx -@@ -763,9 +763,11 @@ fprintf(stderr,"JobInfo=%s\n",jobInfo); - err0: - delete globalParams; - -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69 - // check for memory leaks - Object::memCheck(stderr); - gMemReport(stderr); -+#endif - - } - /* muntrace(); */ -diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx -index 0c63ab8d..4ebf02b0 100644 ---- a/filter/pdftoraster.cxx -+++ b/filter/pdftoraster.cxx -@@ -2162,9 +2162,11 @@ int main(int argc, char *argv[]) { - cmsDeleteTransform(colorTransform); - } - -+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69 - // Check for memory leaks - Object::memCheck(stderr); - gMemReport(stderr); -+#endif - - return exitCode; - } diff --git a/user/cups/APKBUILD b/user/cups/APKBUILD index 378aeb1ae..156eb247c 100644 --- a/user/cups/APKBUILD +++ b/user/cups/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: pkgname=cups pkgver=2.2.10 -pkgrel=0 +pkgrel=1 pkgdesc="The CUPS Printing System" url="https://www.cups.org/" arch="all" license="GPL-2.0-only AND LGPL-2.0-only" # cupsUTF8ToCharset(CUPS_EUC_JP) of utfdemo.txt: FAIL (UTF-8 to EUC-JP on line 1) options="!check" -depends="cups-client poppler-utils openssl dbus" +depends="cups-client dbus openssl poppler-utils" depends_dev="gnutls-dev openssl-dev zlib-dev" makedepends="$depends_dev libpaper-dev dbus-dev libjpeg-turbo-dev linux-headers linux-pam-dev" diff --git a/user/desktop-file-utils/APKBUILD b/user/desktop-file-utils/APKBUILD new file mode 100644 index 000000000..f8a62336f --- /dev/null +++ b/user/desktop-file-utils/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=desktop-file-utils +pkgver=0.23 +pkgrel=0 +pkgdesc="Utilities for working with Desktop Entry files" +url="https://www.freedesktop.org/wiki/Software/desktop-file-utils/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="glib-dev" +subpackages="$pkgname-doc" +source="https://www.freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="66a8ddfbb2be8edc14e16427e0dafa6fb1ef7491c816f19221fb5d5782e964cdcc3ae89807339f1c565af828aa83403cc56edeb2d03b3f93e013f3c5e9e6fe6a desktop-file-utils-0.23.tar.xz" diff --git a/user/dialog/APKBUILD b/user/dialog/APKBUILD index a7dc72010..cc5e3e668 100644 --- a/user/dialog/APKBUILD +++ b/user/dialog/APKBUILD @@ -5,7 +5,7 @@ _realver=1.3-20181107 pkgver=${_realver/-/.} pkgrel=0 pkgdesc="Script interpreter providing curses widgets" -url="http://invisible-island.net/dialog/dialog.html" +url="https://invisible-island.net/dialog/dialog.html" arch="all" options="!check" # No test suite. license="LGPL-2.1-only" diff --git a/user/djvulibre/APKBUILD b/user/djvulibre/APKBUILD new file mode 100644 index 000000000..a90485e6a --- /dev/null +++ b/user/djvulibre/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=djvulibre +pkgver=3.5.27 +pkgrel=0 +pkgdesc="Format for distributing documents and images" +url="http://djvu.sourceforge.net/" +arch="all" +license="GPL-2.0+" +depends="" +depends_dev="" +makedepends="$depends_dev imagemagick libjpeg-turbo-dev tiff-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://downloads.sourceforge.net/djvu/djvulibre-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee djvulibre-3.5.27.tar.gz" diff --git a/user/docbook2x/APKBUILD b/user/docbook2x/APKBUILD new file mode 100644 index 000000000..463e60300 --- /dev/null +++ b/user/docbook2x/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=docbook2x +pkgver=0.8.8 +pkgrel=0 +pkgdesc="Tool to convert DocBook XML to Unix man pages" +url="http://docbook2x.sourceforge.net/" +arch="all" +license="MIT" +depends="docbook-xml docbook-xsl libxml2-utils libxslt perl-xml-sax" +makedepends="$depends_dev" +subpackages="$pkgname-doc" +source="https://downloads.sourceforge.net/docbook2x/docbook2X-$pkgver.tar.gz + autoconf.patch + doc-typo.patch + manpage-comments.patch + refentry-whitespace.patch + sourceforge-url.patch + " +builddir="$srcdir/docbook2X-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --program-transform-name 's/docbook2/docbook2x-/' + make +} + +check() { + cd "$builddir"/test/refentry + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c docbook2X-0.8.8.tar.gz +eec73ea9e5b626dbc7d0107226ea15dd1b84194f83d97bd93b52d61acc6e03e7d683c6b52d3bd191a995db034dd09044005a18b565b9f55fe5ec2824eec0b639 autoconf.patch +a563b46e7eaa8052dc2daea6ad8b0f3b12780ef063fafd37a6345ae663f6229ccb0b52be5e7b1fd6584d31e56de89af391efb856bbabfed164353578b39fb458 doc-typo.patch +f204384bb206324d813b36e4e87e6a96f8b5808bfb3d7396505c84efc6784d4950a87533a3be1c67fce5f7b1d2f76eee8cf57f3ae48e3df43cf0cdc6531fbe14 manpage-comments.patch +10ce7f7da9bb2e05701a38d9e6900e87e62043604736eef5dbb52d8b143c8693463cffacf24453ec3d1e057b0b243d1c53952247f412e6f036c7067ad5840c1f refentry-whitespace.patch +c9dfbc19fc6bd11980c6da264e2683fd3c320f8c5d0d35f6c6d322cf3e7341d2d3fc88498e4a0213d4191f83c238abb0d824630be1360b3ec58e9887e8309aaa sourceforge-url.patch" diff --git a/user/docbook2x/autoconf.patch b/user/docbook2x/autoconf.patch new file mode 100644 index 000000000..f4a471d67 --- /dev/null +++ b/user/docbook2x/autoconf.patch @@ -0,0 +1,30 @@ +The evaluation of datadir results in "${prefix}/share" without +evaluation of the ${prefix} variable with autoconf 2.60. + +Index: docbook2X-0.8.8/configure.ac +=================================================================== +--- docbook2X-0.8.8.orig/configure.ac ++++ docbook2X-0.8.8/configure.ac +@@ -148,7 +148,7 @@ + dnl they will reside and should use these static_* values. + dnl Ensure that all static_* are fully expanded. + +-eval static_datadir="$datadir" ++eval eval static_datadir="$datadir" + + eval static_bindir="$bindir" + old_val="" +--- docbook2X-0.8.8/configure.old 2007-03-03 13:45:28.000000000 +0000 ++++ docbook2X-0.8.8/configure 2019-01-13 19:36:53.820000000 +0000 +@@ -5266,6 +5266,11 @@ + + + eval static_datadir="$datadir" ++old_val="" ++until test "$static_datadir" = "$old_val"; do ++ old_val="$static_datadir" ++ eval static_datadir="$static_datadir" ++done + + eval static_bindir="$bindir" + old_val="" diff --git a/user/docbook2x/doc-typo.patch b/user/docbook2x/doc-typo.patch new file mode 100644 index 000000000..5be21bdf9 --- /dev/null +++ b/user/docbook2x/doc-typo.patch @@ -0,0 +1,24 @@ +Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it> + +--- docbook2x-0.8.8.orig/doc/docbook2man.1 ++++ docbook2x-0.8.8/doc/docbook2man.1 +@@ -187,7 +187,7 @@ parameter instead. + + However, inside a custom stylesheet + (\fInot on the command-line\fR) +-this paramter can be set to the XPath expression ++this parameter can be set to the XPath expression + \*(T<document('')\*(T>, + which will cause the custom translations + directly embedded inside the custom stylesheet to be read. +--- docbook2x-0.8.8.orig/doc/docbook2texi.1 ++++ docbook2x-0.8.8/doc/docbook2texi.1 +@@ -230,7 +230,7 @@ parameter instead. + + However, inside a custom stylesheet + (\fInot on the command-line\fR) +-this paramter can be set to the XPath expression ++this parameter can be set to the XPath expression + \*(T<document('')\*(T>, + which will cause the custom translations + directly embedded inside the custom stylesheet to be read. diff --git a/user/docbook2x/manpage-comments.patch b/user/docbook2x/manpage-comments.patch new file mode 100644 index 000000000..c78a95c91 --- /dev/null +++ b/user/docbook2x/manpage-comments.patch @@ -0,0 +1,81 @@ +# Conventionally, preprocessor declarations should start with +# '\" +# rather than +# .\" +# Current man-db only supports the first (and recommended) syntax. + +diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl +--- trunk~/perl/db2x_manxml.pl 2006-04-22 17:21:32.000000000 +0200 ++++ trunk/perl/db2x_manxml.pl 2007-11-24 01:27:37.000000000 +0100 +@@ -342,6 +342,25 @@ + $self->{line_start} = 1; + } + ++# ++# Print a comment in the output, without causing a break. ++# Params: comment - the comment text. ++# May use any characters; they need not be escaped. ++# ++sub comment_nobreak ++{ ++ my ($self, $comment) = @_; ++ $self->write("\n") unless $self->{line_start}; ++ ++ foreach my $line (split(/\n/, $comment)) { ++ $self->write('\'\" '); ++ $self->write($line); ++ $self->write("\n"); ++ } ++ ++ $self->{line_start} = 1; ++} ++ + + # + # Use a roff "escape" i.e. commands embedded in text starting with \ +@@ -510,16 +529,20 @@ + + $self->{'adjust-stack'} = [ 'b' ]; + +- $self->{rw}->comment($elem->attr('preprocessors')) +- if($elem->attr('preprocessors') ne ''); +- ++ my $preprocessors = $elem->attr('preprocessors'); + # I've dug through the Internet to see if there was any + # standard way to specify encoding with man pages. + # The following seems to be a reasonable proposal: + # <URL:http://mail.nl.linux.org/linux-utf8/2001-04/msg00168.html> + my $encoding = $self->{options}->{'encoding'}; + $encoding =~ s#//TRANSLIT$##i; +- $self->{rw}->comment("-*- coding: $encoding -*-"); ++ $encoding = "-*- coding: $encoding -*-"; ++ if ($preprocessors eq '') { ++ $preprocessors = $encoding; ++ } else { ++ $preprocessors = "$preprocessors $encoding"; ++ } ++ $self->{rw}->comment_nobreak($preprocessors); + + # Define escapes for switching to and from monospace fonts (groff only) + $self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC}); +diff -urNad trunk~/xslt/backend/db2x_manxml.xsl trunk/xslt/backend/db2x_manxml.xsl +--- trunk~/xslt/backend/db2x_manxml.xsl 2006-04-23 16:44:52.000000000 +0200 ++++ trunk/xslt/backend/db2x_manxml.xsl 2007-11-24 01:27:37.000000000 +0100 +@@ -528,7 +528,7 @@ + <exslt:document method="text" + encoding="{$encoding}" + href="{$path}"> +- <xsl:text>.\" -*- coding: </xsl:text> ++ <xsl:text>'\" -*- coding: </xsl:text> + <xsl:value-of select="$encoding" /> + <xsl:text> -*- </xsl:text> + <xsl:copy-of select="$content" /> +@@ -538,7 +538,7 @@ + <saxon:output method="text" + encoding="{$encoding}" + href="{$path}"> +- <xsl:text>.\" -*- coding: </xsl:text> ++ <xsl:text>'\" -*- coding: </xsl:text> + <xsl:value-of select="$encoding" /> + <xsl:text> -*- </xsl:text> + <xsl:copy-of select="$content" /> diff --git a/user/docbook2x/refentry-whitespace.patch b/user/docbook2x/refentry-whitespace.patch new file mode 100644 index 000000000..d80ab18b0 --- /dev/null +++ b/user/docbook2x/refentry-whitespace.patch @@ -0,0 +1,34 @@ +# Peter Eisentraut reported a regression in the whitespace handling of +# refentrytitle content during filename creation: http://bugs.debian.org/420153 +# The problem is docbook2x replaces all spaces with underlines and then tries +# to normalize the result. A linebreak with additional whitespaces results in +# manpage names like 'foo_ ____bar.9'. + +diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl docbook2x-0.8.8/xslt/man/manpage.xsl +--- docbook2x-0.8.8~/xslt/man/manpage.xsl 2006-04-20 15:45:55.000000000 +0200 ++++ docbook2x-0.8.8/xslt/man/manpage.xsl 2007-04-20 16:19:28.000000000 +0200 +@@ -30,7 +30,7 @@ + + <xsl:template name="manpage-filename"> + <xsl:param name="filename" /> +- <xsl:value-of select="normalize-space(translate($filename, " /", "__"))" /> ++ <xsl:value-of select="translate(normalize-space($filename), ' /', '__')" /> + </xsl:template> + + +diff -urNad docbook2x-0.8.8~/xslt/man/refentry.xsl docbook2x-0.8.8/xslt/man/refentry.xsl +--- docbook2x-0.8.8~/xslt/man/refentry.xsl 2006-04-21 04:39:55.000000000 +0200 ++++ docbook2x-0.8.8/xslt/man/refentry.xsl 2007-04-20 16:21:53.000000000 +0200 +@@ -38,7 +38,11 @@ + <xsl:template name="refentry-filename"> + <xsl:param name="title" /> + +- <xsl:variable name="title2" select="translate($title, " /", "__")" /> ++ <xsl:variable name="title2"> ++ <xsl:call-template name="manpage-filename"> ++ <xsl:with-param name="filename" select="$title" /> ++ </xsl:call-template> ++ </xsl:variable> + + <!-- not using gentext here since man page names tend not to have + accented chars / non-Latin chars ... diff --git a/user/docbook2x/sourceforge-url.patch b/user/docbook2x/sourceforge-url.patch new file mode 100644 index 000000000..d6fd4a44a --- /dev/null +++ b/user/docbook2x/sourceforge-url.patch @@ -0,0 +1,19 @@ +## Ondrej Certik reported a resolver issue: http://bugs.debian.org/418703. +## The error seems to be caused by using the abbreviated sf.net URLs. + +diff -urNad docbook2x-0.8.8~/perl/db2x_xsltproc.pl docbook2x-0.8.8/perl/db2x_xsltproc.pl +--- docbook2x-0.8.8~/perl/db2x_xsltproc.pl 2004-08-18 16:21:52.000000000 +0200 ++++ docbook2x-0.8.8/perl/db2x_xsltproc.pl 2007-04-12 16:07:20.000000000 +0200 +@@ -110,10 +110,10 @@ + + if($options->{'stylesheet'} eq 'texi') { + $options->{'stylesheet'} = +- "http://docbook2x.sf.net/latest/xslt/texi/docbook.xsl"; ++ "http://docbook2x.sourceforge.net/latest/xslt/texi/docbook.xsl"; + } elsif($options->{'stylesheet'} eq 'man') { + $options->{'stylesheet'} = +- "http://docbook2x.sf.net/latest/xslt/man/docbook.xsl"; ++ "http://docbook2x.sourceforge.net/latest/xslt/man/docbook.xsl"; + } + + if(scalar(@argv) != 1) { diff --git a/user/dolphin/APKBUILD b/user/dolphin/APKBUILD index d7a8e141f..536099665 100644 --- a/user/dolphin/APKBUILD +++ b/user/dolphin/APKBUILD @@ -1,19 +1,20 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dolphin -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Lightweight desktop file manager" url="https://www.kde.org/applications/system/dolphin/" arch="all" options="!check" # Tests require X11 and D-Bus session bus. license="GPL-2.0-only" -depends="" +depends="ffmpegthumbs kdegraphics-thumbnailers" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdoctools-dev kinit-dev kcmutils-dev knewstuff-dev kcoreaddons-dev ki18n-dev kdbusaddons-dev kbookmarks-dev kconfig-dev kio-dev kparts-dev solid-dev kiconthemes-dev kcompletion-dev ktextwidgets-dev knotifications-dev kcrash-dev - baloo-dev kfilemetadata-dev kdelibs4support-dev kactivities-dev" + baloo-dev kfilemetadata-dev kdelibs4support-dev kactivities-dev + baloo-widgets-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/dolphin-$pkgver.tar.xz" @@ -43,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f3017ecb67009292972876f27ade398699622cd4253e608d78b9c8dd7693bce2a1d742af5f51885b28c1765496b31f83ac25fda40ba330821b460622adc7ad7c dolphin-18.08.3.tar.xz" +sha512sums="2e5fc55a20b5b091c4a8d3e842d05c170feb660fef62bca991543f6580ed858fd3d73fbd7135513603a6736360408ed372374a5c6473ff95c24b5117abd193f5 dolphin-18.12.2.tar.xz" diff --git a/user/dotconf/APKBUILD b/user/dotconf/APKBUILD new file mode 100644 index 000000000..54f08fa92 --- /dev/null +++ b/user/dotconf/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=dotconf +pkgver=1.3 +pkgrel=0 +pkgdesc="Configuration file parsing library" +url=" " +arch="all" +license="LGPL-2.1-only" +depends="" +makedepends="" +subpackages="$pkgname-dev $pkgname-doc" +source="https://distfiles.gentoo.org/distfiles/dotconf-$pkgver.tar.gz" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="ced0e66f70d11a309e77add1bfac1da8e85dcbe193633bd4bd1ae4bfd043b66880406e93ec18327b8c5d3de8d4bfc5278db6e5cb39b030ee1dabfa1ce267a98e dotconf-1.3.tar.gz" diff --git a/user/doxygen/APKBUILD b/user/doxygen/APKBUILD index 382530d4c..b1f5414e2 100644 --- a/user/doxygen/APKBUILD +++ b/user/doxygen/APKBUILD @@ -1,6 +1,8 @@ # Maintainer: pkgname=doxygen -pkgver=1.8.14 +pkgver=1.8.15 +_pkgver=${pkgver%.*.*}_${pkgver#*.} +_pkgver=${_pkgver%.*}_${pkgver#*.*.} pkgrel=0 pkgdesc="A documentation system for C++, C, Java, IDL, and PHP" url="http://www.doxygen.org/" @@ -9,10 +11,10 @@ license="GPL-2.0-only" depends="" makedepends="bison cmake coreutils flex perl python3" checkdepends="libxml2-utils" -subpackages="" -source="http://ftp.stack.nl/pub/users/dimitri/doxygen-$pkgver.src.tar.gz +source="https://github.com/doxygen/doxygen/archive/Release_$_pkgver.tar.gz doxygen-1.8.14-install.patch " +builddir="$srcdir/doxygen-Release_$_pkgver" build() { cd "$builddir" @@ -38,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c doxygen-1.8.14.src.tar.gz +sha512sums="bc3ea295b894a73324bf41408d05332bc480638840b62fac6f12493be15de29eedd4e7f2d7ad61e0db36623887ca364eda5eb5e46d9b91a4241240cb380b07d5 Release_1_8_15.tar.gz 725a29a6f21ffc8ec6ca8ed6d746a69cc78060e97704c7fe909abee603ba0a99f27dc3b80c414afd886d0ee81d9948b13f29c43f7db2e00aae8c0c3a32aa9ec1 doxygen-1.8.14-install.patch" diff --git a/user/dragonplayer/APKBUILD b/user/dragonplayer/APKBUILD index 9f065e310..079cc1fef 100644 --- a/user/dragonplayer/APKBUILD +++ b/user/dragonplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dragonplayer -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Multimedia player with a focus on simplicity" url="https://www.kde.org/applications/multimedia/dragonplayer/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="86706c84c65c2780780d292f2a32b43ff4096d7beb12ba25a72e61ac9f05cc321fea9eef85f0c9c38afd58e68d74d0cbf683443367d499b8e9f678ca310cb3a8 dragon-18.08.3.tar.xz" +sha512sums="507767b9206944c5b12ccdbcefe0c85be260d4bffcf4ad3fc281f822372fb64fbf8ae267ebc821a429be6db054c81fb10016b32b03ead1939daa24fe63e2b537 dragon-18.12.2.tar.xz" diff --git a/user/dtach/APKBUILD b/user/dtach/APKBUILD new file mode 100644 index 000000000..d94502928 --- /dev/null +++ b/user/dtach/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=dtach +pkgver=0.9 +pkgrel=0 +pkgdesc="Detach software from its controlling terminal" +url=" " +arch="all" +options="!check" # No test suite. +license="GPL-2.0+" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="dtach-$pkgver.tar.gz::https://github.com/crigler/dtach/archive/v$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + install -D -m755 "$builddir"/dtach "$pkgdir"/usr/bin/dtach + install -D -m644 "$builddir"/dtach.1 "$pkgdir"/usr/share/man/man1/dtach.1 +} + +sha512sums="9df73f70598ac8267c2845c75074d2e43ecb8987bc1dd95ab41a8ce9847c25654f35d22d88ba141b42e23a59f063f7bc8037257b213ca25161269e149ec4e920 dtach-0.9.tar.gz" diff --git a/user/ebgaramond/APKBUILD b/user/ebgaramond/APKBUILD new file mode 100644 index 000000000..f1f071a67 --- /dev/null +++ b/user/ebgaramond/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ebgaramond +pkgver=0.016 +pkgrel=0 +pkgdesc="Recreation of Claude Garamont's classic typeface" +url="http://www.georgduffner.at/ebgaramond/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-$pkgver.zip" +builddir="$srcdir/EBGaramond-0.016" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ otf/*.otf +} + +sha512sums="f7d67d6fb47ff7aa614b08d97f953cd50122935b40ff191c7b226ad0714b738a5b359b04342ebea10109e7ab8b4260256ce0f8592fd70dc3e7fe29c77188a955 EBGaramond-0.016.zip" diff --git a/user/ebook-tools/APKBUILD b/user/ebook-tools/APKBUILD new file mode 100644 index 000000000..6c33ad3d5 --- /dev/null +++ b/user/ebook-tools/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ebook-tools +pkgver=0.2.2 +pkgrel=0 +pkgdesc="Tools for manipulating various electronic book formats" +url="https://sourceforge.net/projects/ebook-tools/" +arch="all" +license="MIT" +depends="convertlit cmd:which" +makedepends="libxml2-dev libzip-dev" +subpackages="$pkgname-dev" +source="https://downloads.sourceforge.net/ebook-tools/ebook-tools-$pkgver.tar.gz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a ebook-tools-0.2.2.tar.gz" diff --git a/user/editres/APKBUILD b/user/editres/APKBUILD new file mode 100644 index 000000000..f0f7bd1d8 --- /dev/null +++ b/user/editres/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=editres +pkgver=1.0.7 +pkgrel=0 +pkgdesc="Examine Xt widgets and edit X11 resources dynamically" +url="http://www.rahul.net/kenton/editres.html" +arch="all" +license="X11" +depends="" +makedepends="util-macros libx11-dev libxaw-dev libxmu-dev libxt-dev + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/editres-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b9c928b556116bf50cf4b6ea779bdc9fedf29f5db3e6a8cc75c122578c92e1cc530a81b226ec24aad183b8ebc2de570f200314b0d9ce7883b6e3306007365b32 editres-1.0.7.tar.bz2" diff --git a/user/enchant/APKBUILD b/user/enchant/APKBUILD index daa149747..a09bd4291 100644 --- a/user/enchant/APKBUILD +++ b/user/enchant/APKBUILD @@ -1,15 +1,15 @@ # Maintainer: pkgname=enchant pkgver=1.6.1 -pkgrel=1 +pkgrel=2 pkgdesc="A wrapper library for generic spell checking" url="https://abiword.github.io/enchant/" arch="all" -options="!check" # We need to ship dictionaries before testing will work... license="LGPL-2.0+" subpackages="$pkgname-dev $pkgname-doc" depends="" makedepends="aspell-dev bash dbus-glib-dev file glib-dev hunspell-dev" +checkdepends="aspell-dict-en" source="https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz hunspell-build-fix.patch" @@ -24,7 +24,7 @@ build() { } check() { - cd "$builddir" + cd "$builddir"/tests make check } diff --git a/user/encodings/APKBUILD b/user/encodings/APKBUILD index 84c49ddab..d5c5adbea 100644 --- a/user/encodings/APKBUILD +++ b/user/encodings/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=encodings pkgver=1.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Font encoding files for X11" url="https://www.X.Org/" arch="noarch" @@ -21,8 +21,7 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --with-encodingsdir=/usr/share/fonts/encodings + --prefix=/usr make } diff --git a/user/ers-symbols/APKBUILD b/user/ers-symbols/APKBUILD new file mode 100644 index 000000000..652acc95f --- /dev/null +++ b/user/ers-symbols/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ers-symbols +pkgver=2.20 +pkgrel=0 +pkgdesc="Emergency response symbology typefaces, made by US government" +url="https://www.fgdc.gov/HSWG/" +arch="noarch" +options="!check" # No test suite. +license="Public-Domain" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://www.fgdc.gov/HSWG/symbol_downloads/ers_v220.zip" +builddir="$srcdir"/ersSymbolsVersion0202/ersV2sym + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttf +} + +sha512sums="f34b11f13df250d85758c1980f0782033d2ed6874980d51a3b225ca348d0cf8f722e28fab9f9ffc81720ba637928dfa126eb7b1e8227743fb58bb18960407717 ers_v220.zip" diff --git a/user/essays1743/APKBUILD b/user/essays1743/APKBUILD new file mode 100644 index 000000000..930050ba1 --- /dev/null +++ b/user/essays1743/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=essays1743 +pkgver=2.100 +pkgrel=0 +pkgdesc="Typeface based on 1743 English printing of Montaigne's Essays" +url="https://www.thibault.org/fonts/essays/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1 OR LGPL-2.1-only" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://www.thibault.org/fonts/essays/essays1743-$pkgver-1.ttc" +builddir="$srcdir/" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ essays1743-$pkgver-1.ttc +} + +sha512sums="c67639ee5fea4a34e50447cdd3a5e60b23008b4d19b0e98c9b054eae8a4b15147d4ae4d8820205b86f297e26f715b64eb2d299361f85aec54f834fd7b250cd89 essays1743-2.100-1.ttc" diff --git a/user/evince/APKBUILD b/user/evince/APKBUILD new file mode 100644 index 000000000..9f9e7172e --- /dev/null +++ b/user/evince/APKBUILD @@ -0,0 +1,77 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=evince +pkgver=3.31.4 +pkgrel=0 +pkgdesc="GNOME document viewer" +url="https://wiki.gnome.org/Apps/Evince" +arch="all" +license="GPL-2.0+ AND MIT AND BSD-3-Clause AND LGPL-2.0+ AND X11 AND LGPL-3.0-only AND Public-Domain AND LGPL-2.1+" +depends="gst-plugins-base gst-plugins-good" +makedepends="djvulibre-dev glib-dev gobject-introspection-dev + gsettings-desktop-schemas-dev gstreamer-dev gst-plugins-base-dev + gtk+3.0-dev itstool libarchive-dev libexecinfo-dev libgxps-dev + libsecret-dev libspectre-dev libxml2-dev libxml2-utils poppler-dev + tiff-dev zlib-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://ftp.gnome.org/pub/gnome/sources/evince/3.31/evince-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --without-gspell \ + --disable-nautilus \ + --enable-introspection \ + --enable-ps + + # our msgfmt(1) can't do --desktop + cp data/org.gnome.Evince.desktop.in data/org.gnome.Evince.desktop + cp data/org.gnome.Evince-previewer.desktop.in \ + data/org.gnome.Evince-previewer.desktop + cp backend/pdf/evince-pdfdocument.metainfo.xml.in \ + backend/pdf/evince-pdfdocument.metainfo.xml + cp backend/pdf/pdfdocument.evince-backend.desktop.in \ + backend/pdf/pdfdocument.evince-backend + cp backend/djvu/evince-djvudocument.metainfo.xml.in \ + backend/djvu/evince-djvudocument.metainfo.xml + cp backend/djvu/djvudocument.evince-backend.desktop.in \ + backend/djvu/djvudocument.evince-backend + cp backend/tiff/evince-tiffdocument.metainfo.xml.in \ + backend/tiff/evince-tiffdocument.metainfo.xml + cp backend/tiff/tiffdocument.evince-backend.desktop.in \ + backend/tiff/tiffdocument.evince-backend + cp backend/comics/evince-comicsdocument.metainfo.xml.in \ + backend/comics/evince-comicsdocument.metainfo.xml + cp backend/comics/comicsdocument.evince-backend.desktop.in \ + backend/comics/comicsdocument.evince-backend + cp backend/xps/evince-xpsdocument.metainfo.xml.in \ + backend/xps/evince-xpsdocument.metainfo.xml + cp backend/xps/xpsdocument.evince-backend.desktop.in \ + backend/xps/xpsdocument.evince-backend + cp backend/ps/evince-psdocument.metainfo.xml.in \ + backend/ps/evince-psdocument.metainfo.xml + cp backend/ps/psdocument.evince-backend.desktop.in \ + backend/ps/psdocument.evince-backend + cp org.gnome.Evince.appdata.xml.in org.gnome.Evince.appdata.xml + + # we now return you to your regularly scheduled build + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="bed3950fb5ec58855a915c9e06b158924fd07b41c022e281cbada30174d8918c69a29f3408d27db2f1df70e2ba6bc2c35a6f0d5075627397682b9602a6f94a0f evince-3.31.4.tar.xz" diff --git a/user/exfat-utils/APKBUILD b/user/exfat-utils/APKBUILD new file mode 100644 index 000000000..552d1bfe6 --- /dev/null +++ b/user/exfat-utils/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=exfat-utils +pkgver=1.3.0 +pkgrel=0 +pkgdesc="Utilities for manipulating exFAT file systems" +url="https://github.com/relan/exfat" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="https://github.com/relan/exfat/releases/download/v$pkgver/exfat-utils-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e1c5b708f22e878d7521e3299866bba127145757e3620696ff11b18c8c7d4830522974e8ee4771234b70aa9718295d3433779cf34ca990e28ccc06cbf9325f7e exfat-utils-1.3.0.tar.gz" diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD index 0137b543d..1752b8bbf 100644 --- a/user/exo/APKBUILD +++ b/user/exo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=exo -pkgver=0.12.3 +pkgver=0.12.4 pkgrel=0 pkgdesc="Support library for the XFCE desktop environment" url="https://xfce.org" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1a727050b822aa4bdfbce22c1668372b10ddfd9c3988f6949ee32a5c5213d90e20ebafc923193c70dea373d217994fb42101fe2aad7bf55c8e81f983c5a2106f exo-0.12.3.tar.bz2" +sha512sums="8f84258aeb5c1fcfe91e775af1e5fed02f36b3d18aa72d497cd05294d54f050d679628cdb4339219c67b203a8cc663704a240fc18e6a918cef363cf4d9b94783 exo-0.12.4.tar.bz2" diff --git a/user/extra-cmake-modules/APKBUILD b/user/extra-cmake-modules/APKBUILD index 0102024e4..40bff86ff 100644 --- a/user/extra-cmake-modules/APKBUILD +++ b/user/extra-cmake-modules/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=extra-cmake-modules -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="CMake modules needed for KDE development" url="https://www.kde.org/" @@ -32,7 +32,7 @@ build() { check() { cd "$builddir" CTEST_OUTPUT_ON_FAILURE=TRUE \ - ctest -E '(relative_or_absolute_|KDEFetchTranslations|ECMToolchainAndroidTest)' + ctest -E '(relative_or_absolute_|KDEFetchTranslations|ECMToolchainAndroidTest|ECMPoQmToolsTest)' } package() { @@ -40,5 +40,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f3147f493c24bea3c53a6537ba78ac81e0b8d31162c5d6e12305d318e5f13cdda70ea79d7e9db2a1d834609c7e1a0134e76bcae9f6c9109beaee2c051afbe269 extra-cmake-modules-5.52.0.tar.xz +sha512sums="2c592ab659dc2c1167111d394b976f7d008b9c3e8e18aea06001f4852f93d6a0e61c2ea5f6add2680e11f76da9f5f8c437afd350c5d3224cf1e9adba2dd765e1 extra-cmake-modules-5.54.0.tar.xz 0af703a9d4696080bc52032d1d341e86fd142bef91f3c1afa9cf180e1cf2ff3bba2ea47fd36b8f52135f056a202c58a08e7c7525f671d6993839865ce6aef0f6 posix.patch" diff --git a/user/faad2/APKBUILD b/user/faad2/APKBUILD index 061255a83..c76894b27 100644 --- a/user/faad2/APKBUILD +++ b/user/faad2/APKBUILD @@ -3,7 +3,7 @@ pkgname=faad2 pkgver=2.8.8 pkgrel=0 pkgdesc="ISO AAC audio decoder" -url="http://www.audiocoding.com/" +url="https://www.audiocoding.com/" arch="all" options="!check" # No test suite. license="GPL-2.0+" diff --git a/user/fantasque-sans-mono/APKBUILD b/user/fantasque-sans-mono/APKBUILD new file mode 100644 index 000000000..5fc591222 --- /dev/null +++ b/user/fantasque-sans-mono/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fantasque-sans-mono +pkgver=1.7.2 +pkgrel=0 +pkgdesc="Monospace typeface with unique accents, designed for programming" +url="https://fontlibrary.org/en/font/fantasque-sans-mono" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="$pkgname-$pkgver.tar.gz::https://github.com/belluzj/fantasque-sans/releases/download/v$pkgver/FantasqueSansMono-Normal.tar.gz" +builddir="$srcdir"/OTF + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf +} + +sha512sums="f854de5a5e0464d7f69b484c4ae0f59cfdcaa65d357b9935eda1df8cb90781f78c6b6ab0a96ac5099a6464a52de14cf26630d3db5dad8228e86e44033b32c228 fantasque-sans-mono-1.7.2.tar.gz" diff --git a/user/farstream/APKBUILD b/user/farstream/APKBUILD new file mode 100644 index 000000000..f0d45c176 --- /dev/null +++ b/user/farstream/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=farstream +pkgver=0.2.8 +pkgrel=0 +pkgdesc="Audio/Video communications framework" +url="https://www.freedesktop.org/wiki/Software/Farstream/" +arch="all" +options="!check" # Tests are really really brittle and depend on networking. +license="LGPL-2.1+" +depends="gst-plugins-base gst-plugins-good" +depends_dev="glib-dev" +makedepends="$depends_dev gobject-introspection-dev gstreamer-dev + gst-plugins-base-dev libnice-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://freedesktop.org/software/farstream/releases/farstream/farstream-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-package-origin="${DISTRO_NAME-:Adélie Linux} (${DISTRO_URL-:https://www.adelielinux.org/})" + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7ec5c57f8778f4107cb628dbf411e38b726152cf78920127dff4423239ff7e4980b6b4f938abba2aa21ab984b1e3053e7e648611322a0ce94df0af576df99a7e farstream-0.2.8.tar.gz" diff --git a/user/fdupes/APKBUILD b/user/fdupes/APKBUILD new file mode 100644 index 000000000..1cd4e02b3 --- /dev/null +++ b/user/fdupes/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fdupes +pkgver=1.6.1 +pkgrel=0 +pkgdesc="Identify or delete duplicate files in a directory tree" +url=" " +arch="all" +options="!check" # No test suite. +license="MIT" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="fdupes-$pkgver.tar.gz::https://github.com/adrianlopezroche/fdupes/archive/v$pkgver.tar.gz" + +build() { + cd "$builddir" + make PREFIX=/usr +} + +package() { + cd "$builddir" + make PREFIX=/usr DESTDIR="$pkgdir" install +} + +sha512sums="6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db fdupes-1.6.1.tar.gz" diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD index 82071dcc3..85110b2c9 100644 --- a/user/featherpad/APKBUILD +++ b/user/featherpad/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=featherpad -pkgver=0.9.1 +pkgver=0.9.3 pkgrel=0 pkgdesc="Featureful Qt-based text editor" url="https://github.com/tsujan/FeatherPad" @@ -31,4 +31,4 @@ package() { make INSTALL_ROOT="$pkgdir" PREFIX=/usr install } -sha512sums="5a301757ed320f3eff157821b0844b86c74322887462c60e1feb79790898ce5b1ba2e80cb5e1440d5cfa350f6dbb390d10e27aa05f953e49bfd6720c89c610ea FeatherPad-0.9.1.tar.gz" +sha512sums="f06749b0ab57e6869bb6568367a7ef777a0f91c6a9229fe7892e720f48020ceac36d6948159b0516f4d1c920bff4ceb23f6b29a492d58908305856d2f03c2d36 FeatherPad-0.9.3.tar.gz" diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD index 8d576a7ed..6d6c0627b 100644 --- a/user/ffmpeg/APKBUILD +++ b/user/ffmpeg/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ffmpeg pkgver=4.1 -pkgrel=0 +pkgrel=1 pkgdesc="Record, convert, and stream audio and video" url="https://ffmpeg.org/" arch="all" @@ -12,11 +12,12 @@ license="GPL-2.0-only" options="!check textrels" # Test suite requires proper licensing headers on all files, # which upstream does not provide. subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" -makedepends="gnutls-dev lame-dev libvorbis-dev xvidcore-dev zlib-dev libvdpau-dev - imlib2-dev libtheora-dev coreutils bzip2-dev perl-dev x264-dev - pulseaudio-dev sdl2-dev libxfixes-dev libva-dev alsa-lib-dev rtmpdump-dev - v4l-utils-dev yasm opus-dev x265-dev xz-dev freetype-dev speex-dev - ladspa-dev libcdio-dev libcdio-paranoia-dev wavpack-dev libwebp-dev" +makedepends="alsa-lib-dev bzip2-dev freetype-dev gnutls-dev imlib2-dev + ladspa-dev lame-dev libcdio-dev libcdio-paranoia-dev libmodplug-dev + libtheora-dev libva-dev libvdpau-dev libvorbis-dev libwebp-dev + libxfixes-dev opus-dev perl-dev pulseaudio-dev rtmpdump-dev sdl2-dev + speex-dev v4l-utils-dev wavpack-dev x264-dev x265-dev xvidcore-dev + xz-dev yasm zlib-dev" source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch " @@ -54,6 +55,7 @@ build() { --enable-gnutls \ --enable-gpl \ --enable-libmp3lame \ + --enable-libmodplug \ --enable-librtmp \ --enable-libvorbis \ --disable-libvpx \ diff --git a/user/ffmpegthumbs/APKBUILD b/user/ffmpegthumbs/APKBUILD new file mode 100644 index 000000000..81197186d --- /dev/null +++ b/user/ffmpegthumbs/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ffmpegthumbs +pkgver=18.12.1 +pkgrel=0 +pkgdesc="KDE video thumbnail system using FFmpeg" +url="https://www.KDE.org/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev ffmpeg-dev kconfig-dev + ki18n-dev kio-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/applications/$pkgver/src/ffmpegthumbs-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="710c9f7a1b17d299268ed11fb99637d617a3d47deb51ba0bdda210023af859a434fd5ae15455bf3c8dc953888c2af5d697ae90f574ef679307b9f756f110507c ffmpegthumbs-18.12.1.tar.xz" diff --git a/user/fifth-leg/APKBUILD b/user/fifth-leg/APKBUILD new file mode 100644 index 000000000..c80ecb5a6 --- /dev/null +++ b/user/fifth-leg/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fifth-leg +pkgver=0.6 +pkgrel=0 +pkgdesc="Humanist headline typeface" +url=" " +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://api.opensuse.org/public/source/openSUSE:Factory/fifth-leg-font/opensuse-font-fifth-leg-$pkgver.tar.bz2" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF *.otf +} + +sha512sums="7c2ee6aab8d5bc54d3a0d3a7d02ff5514cdc9e6672fcd28e827197061e5aa3f023b1d6cbe7077458f8cb3046a22e4aac085d4a56398d59845d004edde67622f9 opensuse-font-fifth-leg-0.6.tar.bz2" diff --git a/user/fira-code/APKBUILD b/user/fira-code/APKBUILD new file mode 100644 index 000000000..51be841bd --- /dev/null +++ b/user/fira-code/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fira-code +pkgver=1.206 +pkgrel=0 +pkgdesc="Monospace typeface with ligatures for programming" +url="https://patreon.com/tonsky" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://github.com/tonsky/FiraCode/releases/download/$pkgver/FiraCode_$pkgver.zip" +builddir="$srcdir"/otf + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf +} + +sha512sums="56451c338a76fabb15527c1ac247f61f3e8a3ef98d8428bf7a5bfcf506a12ce1cbf6075a1435cbf936800b38ebe5554f4c8becc62f596c23097fdbaaa30f606b FiraCode_1.206.zip" diff --git a/user/fira/APKBUILD b/user/fira/APKBUILD new file mode 100644 index 000000000..6719c19b2 --- /dev/null +++ b/user/fira/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fira +pkgver=4.202 +pkgrel=0 +pkgdesc="Typefaces from Mozilla" +url="https://mozilla.github.io/Fira/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="Fira-$pkgver.tar.gz::https://github.com/mozilla/Fira/archive/$pkgver.tar.gz" +builddir="$srcdir/Fira-$pkgver" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ otf/*.otf +} + +sha512sums="fec770fa038f2aa0654f9382f95aa1266a2655970f4c7755b237af9d1c09f47ce719f8daf3afc39812fc69448b9481ee0e2a1414f1d007ad70b4254c92950ebb Fira-4.202.tar.gz" diff --git a/user/flite/APKBUILD b/user/flite/APKBUILD new file mode 100644 index 000000000..5ae3ea67a --- /dev/null +++ b/user/flite/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=flite +pkgver=2.1 +pkgrel=0 +pkgdesc="Small, fast text-to-speech synthesizer based on Festival" +url="http://www.festvox.org/flite/" +arch="all" +options="!check" # testsuite refuses to cooperate +license="MIT AND Apache-2.0 AND BSD-3-Clause AND Public-Domain AND BSD-2-Clause" +depends="" +makedepends="alsa-lib-dev" +subpackages="$pkgname-dev" +source="http://www.festvox.org/flite/packed/flite-$pkgver/flite-$pkgver-release.tar.bz2" +builddir="$srcdir/flite-$pkgver-release" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make test +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e9ef9ca4b6920178634d94bbe6e21a8b0ec471b010b07e6cc961ed2d120acb944c8e1d268fe26188f7dfe43fb7bd4bdff7fa53b2d2f12029d37e08d0316620d2 flite-2.1-release.tar.bz2" diff --git a/user/fltk/APKBUILD b/user/fltk/APKBUILD index fa5f5702c..fe5c3d55f 100644 --- a/user/fltk/APKBUILD +++ b/user/fltk/APKBUILD @@ -5,7 +5,7 @@ pkgver=1.3.4.2 _realver=1.3.4-2 pkgrel=0 pkgdesc="Cross-platform C++ GUI toolkit" -url="http://www.fltk.org/" +url="https://www.fltk.org/" arch="all" options="!check" # No test suite. license="LGPL-2.0-only WITH FLTK-exception" @@ -13,7 +13,7 @@ depends="" depends_dev="libx11-dev libxext-dev libxft-dev mesa-dev" makedepends="$depends_dev libjpeg-turbo-dev libpng-dev libxinerama-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-fluid" -source="http://fltk.org/pub/fltk/1.3.4/$pkgname-$_realver-source.tar.gz" +source="https://fltk.org/pub/fltk/1.3.4/$pkgname-$_realver-source.tar.gz" builddir="$srcdir"/$pkgname-$_realver build() { diff --git a/user/fluxbox/APKBUILD b/user/fluxbox/APKBUILD index ca5245921..73c076d15 100644 --- a/user/fluxbox/APKBUILD +++ b/user/fluxbox/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=fluxbox pkgver=1.3.7 -pkgrel=0 +pkgrel=1 pkgdesc="A lightweight and highly-configurable window manager" url="http://www.fluxbox.org" arch="all" license="MIT" options="!check" # This package has a broken testsuite -depends="" +depends="gxmessage" makedepends="libxinerama-dev libxpm-dev libxrandr imlib2-dev libxrender-dev libxrandr-dev libxinerama-dev freetype-dev libxft-dev xorgproto" subpackages="$pkgname-doc" diff --git a/user/font-adobe-100dpi/APKBUILD b/user/font-adobe-100dpi/APKBUILD new file mode 100644 index 000000000..4547cee87 --- /dev/null +++ b/user/font-adobe-100dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-adobe-100dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="100dpi X11 fonts from Adobe" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="27ed98dcdbb9c174c7090cdd8fe230f7471d10b5dfc63e092640b5d0fc6ab351bc8ffa9a92bec1755f2780b3d9c1de3ad298c64b70a68b5e6879a8592ef32987 font-adobe-100dpi-1.0.3.tar.bz2" diff --git a/user/font-adobe-75dpi/APKBUILD b/user/font-adobe-75dpi/APKBUILD new file mode 100644 index 000000000..8f3f7ac0c --- /dev/null +++ b/user/font-adobe-75dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-adobe-75dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="75dpi X11 fonts from Adobe" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="c0d851df5732e81027e265370751a606c6e4f5eea546d802608988dde02de35fa28238f709f48567191090bf18814f671b1a7f9f0b528d54949b0aa9403f266d font-adobe-75dpi-1.0.3.tar.bz2" diff --git a/user/font-adobe-utopia-100dpi/APKBUILD b/user/font-adobe-utopia-100dpi/APKBUILD new file mode 100644 index 000000000..ffd9eb443 --- /dev/null +++ b/user/font-adobe-utopia-100dpi/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-adobe-utopia-100dpi +pkgver=1.0.4 +pkgrel=0 +pkgdesc="100dpi Utopia X11 font from Adobe" +url="https://www.X.Org/" +arch="noarch" +# Okay. +# This is really hairy, but Fedora Legal says the TUG license can apply to the +# X11 distribution[1][2]; it's almost MIT style, but you have to rename the +# font if you modify it in any way. +# [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" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="fecb9a9bde99a82787d12779ea579c8696dcce168acd74b478a879ae24d421d5978d5f69da651e8ff3b25dca355960aaa19f69f2bf61e540464887e546a7b94b font-adobe-utopia-100dpi-1.0.4.tar.bz2" diff --git a/user/font-adobe-utopia-75dpi/APKBUILD b/user/font-adobe-utopia-75dpi/APKBUILD new file mode 100644 index 000000000..da04ba89e --- /dev/null +++ b/user/font-adobe-utopia-75dpi/APKBUILD @@ -0,0 +1,50 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-adobe-utopia-75dpi +pkgver=1.0.4 +pkgrel=0 +pkgdesc="75dpi Utopia X11 font from Adobe" +url="https://www.X.Org/" +arch="noarch" +# Okay. +# This is really hairy, but Fedora Legal says the TUG license can apply to the +# X11 distribution[1][2]; it's almost MIT style, but you have to rename the +# font if you modify it in any way. +# [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" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="c569af760a62b00738be65546364587638e8c46e4a0765013747e9595d51bc0633908c72359e42e7ebf6240fdc6294b51512c0a096a5fe64b2bd300ccbff7b92 font-adobe-utopia-75dpi-1.0.4.tar.bz2" diff --git a/user/font-adobe-utopia-type1/APKBUILD b/user/font-adobe-utopia-type1/APKBUILD new file mode 100644 index 000000000..12443931b --- /dev/null +++ b/user/font-adobe-utopia-type1/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-adobe-utopia-type1 +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Type 1 Utopia X11 font from Adobe" +url="https://www.X.Org/" +arch="noarch" +# Okay. +# This is really hairy, but Fedora Legal says the TUG license can apply to the +# X11 distribution[1][2]; it's almost MIT style, but you have to rename the +# font if you modify it in any way. +# [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" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +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 {} + +} + +sha512sums="53ff2ce7b17824a0eed1be6c3e3386e51983389f5623e732ac898c4e08769c8720f6d6b7c75b6455e050ec5dc390376747ca4cdb9f831a218f9dd5ee5edcd0d6 font-adobe-utopia-type1-1.0.4.tar.bz2" diff --git a/user/font-alias/APKBUILD b/user/font-alias/APKBUILD index 91fc0705b..dee7f9487 100644 --- a/user/font-alias/APKBUILD +++ b/user/font-alias/APKBUILD @@ -1,18 +1,19 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-alias pkgver=1.0.3 -pkgrel=2 +pkgrel=3 pkgdesc="Font alias definitions from X.Org" url="https://www.X.Org/" arch="noarch" -license="unknown:BSD-Style" +license="MIT" depends="" makedepends="util-macros" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { - update_config_sub + cd "$builddir" default_prepare + update_config_sub } build() { @@ -20,8 +21,7 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --with-fontrootdir=/usr/share/fonts + --prefix=/usr make } diff --git a/user/font-arabic-misc/APKBUILD b/user/font-arabic-misc/APKBUILD new file mode 100644 index 000000000..e36be36a0 --- /dev/null +++ b/user/font-arabic-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-arabic-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Arabic X11 fonts" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="46a416bf888afdb54f5dda6c9a7207dc069d14089ba14b262c60cb9ad427784c46e2a61b32a79f1d745e73ea657bbc36b48aa5d4bbd79f73a2d997b027ddfbc0 font-arabic-misc-1.0.3.tar.bz2" diff --git a/user/font-bh-100dpi/APKBUILD b/user/font-bh-100dpi/APKBUILD new file mode 100644 index 000000000..507bd19cc --- /dev/null +++ b/user/font-bh-100dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bh-100dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="100dpi X11 fonts from Bigelow & Holmes" +url="https://www.X.Org/" +arch="noarch" +license="Lucida" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="60532fb3bd25bad08b1db65f96fdd1cdb2ae5fd580729d7851f5b619f1ed6bdef4fec30111ec408cec9ae5e94f92ad9cf214214c01ac684f3a4bd8d43bafd8a2 font-bh-100dpi-1.0.3.tar.bz2" diff --git a/user/font-bh-75dpi/APKBUILD b/user/font-bh-75dpi/APKBUILD new file mode 100644 index 000000000..6a1287b10 --- /dev/null +++ b/user/font-bh-75dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bh-75dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="75dpi X11 fonts from Bigelow & Holmes" +url="https://www.X.Org/" +arch="noarch" +license="Lucida" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="fb19c7fe91b6cc0670b01d5b8165075866ad08796293650d6037d79211ca668decdcc1b3684774907c06073145919655690d78ccdcf2511db38b5879328a9f50 font-bh-75dpi-1.0.3.tar.bz2" diff --git a/user/font-bh-lucidatypewriter-100dpi/APKBUILD b/user/font-bh-lucidatypewriter-100dpi/APKBUILD new file mode 100644 index 000000000..afa5b8a83 --- /dev/null +++ b/user/font-bh-lucidatypewriter-100dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bh-lucidatypewriter-100dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="100dpi Lucida Typewriter X11 font from Bigelow & Holmes" +url="https://www.X.Org/" +arch="noarch" +license="Lucida" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="1862003c20aa7709ea07487a4326c619e2beb33b7069d644f438d64182b41a06039c69e2867921b4d12939612a4b8e1e1727fd15851aeab9a0361060183e3b0f font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2" diff --git a/user/font-bh-lucidatypewriter-75dpi/APKBUILD b/user/font-bh-lucidatypewriter-75dpi/APKBUILD new file mode 100644 index 000000000..e1e9508dc --- /dev/null +++ b/user/font-bh-lucidatypewriter-75dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bh-lucidatypewriter-75dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="75dpi Lucida Typewriter X11 font from Bigelow & Holmes" +url="https://www.X.Org/" +arch="noarch" +license="Lucida" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="2bba19c10df8e95f95d59d5fc7c15380c91a5140b0fa490497dbdf78a5574adae06a5566941c8c61e4a9850712fc9ca16974173aeee771f41976f472f0a2de13 font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2" diff --git a/user/font-bitstream-100dpi/APKBUILD b/user/font-bitstream-100dpi/APKBUILD new file mode 100644 index 000000000..27c9f4848 --- /dev/null +++ b/user/font-bitstream-100dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bitstream-100dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="100dpi X11 fonts from Bitstream" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="10fd920d46d2cb1b314e8c2f05c202e9ffa74a4e5315f34790eba8bd8fcda865a6932eb712a7538624e69367647bcd6891e7015099e65463aeef772d0ba58bfd font-bitstream-100dpi-1.0.3.tar.bz2" diff --git a/user/font-bitstream-75dpi/APKBUILD b/user/font-bitstream-75dpi/APKBUILD new file mode 100644 index 000000000..a456b9bd6 --- /dev/null +++ b/user/font-bitstream-75dpi/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bitstream-75dpi +pkgver=1.0.3 +pkgrel=0 +pkgdesc="75dpi X11 fonts from Bitstream" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="9311a5b0cbe1613aca87fdf7fd9ab263eb1129e3c3eacbce54547f2185e151fb1237128b1b6d39f716f28694a486909564ecc9a0aef061438622d11b5661d650 font-bitstream-75dpi-1.0.3.tar.bz2" diff --git a/user/font-bitstream-speedo/APKBUILD b/user/font-bitstream-speedo/APKBUILD new file mode 100644 index 000000000..dcee83640 --- /dev/null +++ b/user/font-bitstream-speedo/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bitstream-speedo +pkgver=1.0.2 +pkgrel=0 +pkgdesc="Speedo X11 fonts from Bitstream" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir 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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +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 {} + +} + +sha512sums="78816cc0dd0c9ba3f1de6ba39754bdf19253fea3583ef1bf459ead4b74f2587bc38bbc0bfdc5066a8055c1c45091e44987f6d15e98b6cf4ee18f60c2431349fb font-bitstream-speedo-1.0.2.tar.bz2" diff --git a/user/font-bitstream-type1/APKBUILD b/user/font-bitstream-type1/APKBUILD new file mode 100644 index 000000000..328b0f874 --- /dev/null +++ b/user/font-bitstream-type1/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-bitstream-type1 +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Type 1 X11 fonts from Bitstream" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="fontconfig mkfontdir 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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +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 {} + +} + +sha512sums="71883f7fc0a68b4fb8ef30b8b8bdfd73ae1194b6d6495abde6c819eef7a91d6365ef1b4cae026d6c3fa7fddecc643b46b7ba1232cec404fcada49a92aaf1af61 font-bitstream-type1-1.0.3.tar.bz2" diff --git a/user/font-cronyx-cyrillic/APKBUILD b/user/font-cronyx-cyrillic/APKBUILD new file mode 100644 index 000000000..ee537b55b --- /dev/null +++ b/user/font-cronyx-cyrillic/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-cronyx-cyrillic +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Cyrillic X11 fonts from Cronyx" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="b926c425644f94548ad831c38573009ae97d207a05c9d8a917018c2518911960280eb3861ae11d99bc8d001fb0dca1967712fb70ba4f413bc9d6ac8ef904b456 font-cronyx-cyrillic-1.0.3.tar.bz2" diff --git a/user/font-cursor-misc/APKBUILD b/user/font-cursor-misc/APKBUILD index 8056a774b..fe6d4610b 100644 --- a/user/font-cursor-misc/APKBUILD +++ b/user/font-cursor-misc/APKBUILD @@ -1,20 +1,20 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-cursor-misc pkgver=1.0.3 -pkgrel=2 -pkgdesc="Cursor fonts from X.Org" +pkgrel=3 +pkgdesc="X11 cursor fonts" url="https://www.X.Org/" arch="noarch" -options="!check" # Can't test fonts. license="Public-Domain" -depends="encodings font-alias fontconfig mkfontdir mkfontscale util-macros" -makedepends="bdftopcf font-util-dev" +depends="encodings font-alias fontconfig mkfontdir" +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() { @@ -22,18 +22,19 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --with-fontdir=/usr/share/fonts/misc + --prefix=/usr make } +check() { + cd "$builddir" + make check +} + package() { cd "$builddir" - make -j1 DESTDIR="$pkgdir" \ - MKFONTDIR=: \ - MKFONTSCALE=: \ - FCCACHE=: \ - install + make -j1 DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + } sha512sums="7ecb7f1c3c11da8b81fc0ff121fa6c1026b11f6c7878ffd0e4959df036511bc579d6b0552422ce13e26a8d188e3406631d2de55cab6b29bc7fce0416a8cffc83 font-cursor-misc-1.0.3.tar.bz2" diff --git a/user/font-daewoo-misc/APKBUILD b/user/font-daewoo-misc/APKBUILD new file mode 100644 index 000000000..a71dba0aa --- /dev/null +++ b/user/font-daewoo-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-daewoo-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 fonts from Daewoo" +url="https://www.X.Org/" +arch="noarch" +license="X11" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="7e97bc580f66a1316e366617d34e1dbefd576b47b9373ef34833aaaf2fdefc50befc2add5f038915db0b45fbdd56b77304a8a980bb72726479d429085c406f06 font-daewoo-misc-1.0.3.tar.bz2" diff --git a/user/font-dec-misc/APKBUILD b/user/font-dec-misc/APKBUILD new file mode 100644 index 000000000..36045bbca --- /dev/null +++ b/user/font-dec-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-dec-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 fonts from Digital" +url="https://www.X.Org/" +arch="noarch" +license="X11" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="af755d51c4c59cdbe5d3dccf37990bc787373958feb984bb037c8d8aba8a0eb410965a3600886b5123d89e85e1ea0498b84dfa384fccbbcbcaf3549b83c839c6 font-dec-misc-1.0.3.tar.bz2" diff --git a/user/font-isas-misc/APKBUILD b/user/font-isas-misc/APKBUILD new file mode 100644 index 000000000..6dd2a8b08 --- /dev/null +++ b/user/font-isas-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-isas-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Chinese X11 fonts from Academia Sinica" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="be6fb1d2c53550a462d1ab010fa7ac913990e83a22d4580c93b8f1f087aa6caa0e46bc87debca2b13b10e5611bd2fe7f6b4240367fb24f59b37f68ffb0e2586b font-isas-misc-1.0.3.tar.bz2" diff --git a/user/font-jis-misc/APKBUILD b/user/font-jis-misc/APKBUILD new file mode 100644 index 000000000..67cad5057 --- /dev/null +++ b/user/font-jis-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-jis-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Japanese Industrial Standard X11 fonts" +url="https://www.X.Org/" +arch="noarch" +license="Public-Domain" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="3ce4c96d54440045e84f54f7d790e350c05b0c56a72491941f2cd9ed7e2d1735ff4b41667501cf08d5d81ee19c9de6d43f88a8b59a3c5c55de9fb1696cae208c font-jis-misc-1.0.3.tar.bz2" diff --git a/user/font-micro-misc/APKBUILD b/user/font-micro-misc/APKBUILD new file mode 100644 index 000000000..7c72642fe --- /dev/null +++ b/user/font-micro-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-micro-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Smol X11 font" +url="https://www.X.Org/" +arch="noarch" +license="Public-Domain" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="7a546432225c22ae0aacf9ce88b617a7d1d6678ee1f5eb4b3a93e33764fb752f27bca3feda1312182517bbf7babd5f3700bb9b8de0ef6c35b1ae6e2ce7ab0b69 font-micro-misc-1.0.3.tar.bz2" diff --git a/user/font-misc-cyrillic/APKBUILD b/user/font-misc-cyrillic/APKBUILD new file mode 100644 index 000000000..e66c9ccd8 --- /dev/null +++ b/user/font-misc-cyrillic/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-misc-cyrillic +pkgver=1.0.3 +pkgrel=0 +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" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="75e49cdb633f7ce5b9612d5adb0a85471c8fde5d55e8ccd9302f79f01e99e78b02449642c2cf785289f58d833bfa62042fce4253093fb17c87471559d1f9bdbf font-misc-cyrillic-1.0.3.tar.bz2" diff --git a/user/font-misc-ethiopic/APKBUILD b/user/font-misc-ethiopic/APKBUILD new file mode 100644 index 000000000..e04621e66 --- /dev/null +++ b/user/font-misc-ethiopic/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-misc-ethiopic +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Ethiopic X11 fonts" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir 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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +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 {} + +} + +sha512sums="b3e3f7462f37216796730a894761c7d60d5ede0f51351997e6c3c92e3136c788a2710690f482d05ed1396a4b6be452e1f871febc7e5b7a1a67e43bcc1ec7c77d font-misc-ethiopic-1.0.3.tar.bz2" diff --git a/user/font-misc-misc/APKBUILD b/user/font-misc-misc/APKBUILD index 6a8278eac..1a7cf7b53 100644 --- a/user/font-misc-misc/APKBUILD +++ b/user/font-misc-misc/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-misc-misc pkgver=1.1.2 -pkgrel=2 -pkgdesc="Miscellaneous fonts included with X.Org" +pkgrel=3 +pkgdesc="Miscellaneous X11 fonts included with X.Org" url="https://www.X.Org/" arch="noarch" -options="!check" # Can't test fonts. license="Public-Domain" -depends="encodings font-alias fontconfig mkfontdir mkfontscale util-macros" -makedepends="bdftopcf font-util-dev" +depends="encodings font-alias fontconfig mkfontdir mkfontscale" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { @@ -22,19 +22,19 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --with-fontdir=/usr/share/fonts/misc + --prefix=/usr make } +check() { + cd "$builddir" + make check +} + package() { cd "$builddir" - make -j1 \ - DESTDIR="$pkgdir" \ - MKFONTDIR=: \ - MKFONTSCALE=: \ - FCCACHE=: \ - install + make -j1 DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + } sha512sums="d0bf74142f9621746846ea7a6fe9ae298a303a09c65e05c7decb4f37b2f513a88d727bf3dc5a3566c30de83b83493f164be0118b41d704464f75700b55018c74 font-misc-misc-1.1.2.tar.bz2" diff --git a/user/font-mutt-misc/APKBUILD b/user/font-mutt-misc/APKBUILD new file mode 100644 index 000000000..62a4437ff --- /dev/null +++ b/user/font-mutt-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-mutt-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="MUTT X11 font family" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="7b152f6c1464d806b1f76664d9b619858c3cb3ea63027b6be1f69897e939e3a0b5312ddf230e0a42a8f3e3701e50f41917cac6ce566c05bc74dfa49bdf2ed4db font-mutt-misc-1.0.3.tar.bz2" diff --git a/user/font-schumacher-misc/APKBUILD b/user/font-schumacher-misc/APKBUILD new file mode 100644 index 000000000..4b3008fe5 --- /dev/null +++ b/user/font-schumacher-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-schumacher-misc +pkgver=1.1.2 +pkgrel=0 +pkgdesc="X11 fonts from Dale Schumacher" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="f37a2bfce95458b11376c89767b5adaea03dcecd7ed5b99a19a3d263f48e70b15bf679826a794c55da26b5f1635ea5fa5772ffe44c9f77a1daab0744ed92300a font-schumacher-misc-1.1.2.tar.bz2" diff --git a/user/font-screen-cyrillic/APKBUILD b/user/font-screen-cyrillic/APKBUILD new file mode 100644 index 000000000..8dc59ebe6 --- /dev/null +++ b/user/font-screen-cyrillic/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-screen-cyrillic +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Cyrillic X11 fonts" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="58f12a4cbd18e323daad75b32a01ab3980dca0046f8dd94ff4452606ab9316b8a208dda3bc8e9346c02993bd2b8bb2b3dfe3413ccf9fc6a907fc1ea5d236fa51 font-screen-cyrillic-1.0.4.tar.bz2" diff --git a/user/font-sony-misc/APKBUILD b/user/font-sony-misc/APKBUILD index cb7690e89..7ce54a805 100644 --- a/user/font-sony-misc/APKBUILD +++ b/user/font-sony-misc/APKBUILD @@ -1,14 +1,14 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=font-sony-misc pkgver=1.0.3 -pkgrel=2 -pkgdesc="Sony fonts" +pkgrel=3 +pkgdesc="X11 fonts from Sony" url="https://www.X.Org/" arch="noarch" -options="!check" # Cannot test a font. license="MIT" depends="encodings font-alias fontconfig mkfontdir mkfontscale" -makedepends="bdftopcf font-util-dev" +makedepends="bdftopcf font-util-dev util-macros" +subpackages="" source="https://www.X.Org/releases/individual/font/$pkgname-$pkgver.tar.bz2" prepare() { @@ -22,18 +22,19 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - --with-fontdir=/usr/share/fonts/misc + --prefix=/usr make } +check() { + cd "$builddir" + make check +} + package() { cd "$builddir" - make -j1 DESTDIR="$pkgdir" \ - MKFONTDIR=: \ - MKFONTSCALE=: \ - FCCACHE=: \ - install + make -j1 DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + } sha512sums="c397b4e5081b2946799d701b8c48fca9fd2d55b8fa1dd96d2b29c5cd9996bb7356ae12671bf3bd964e6313bdc154020ed6377534e59ce53067e955e4b37aee1d font-sony-misc-1.0.3.tar.bz2" diff --git a/user/font-sun-misc/APKBUILD b/user/font-sun-misc/APKBUILD new file mode 100644 index 000000000..e004d9738 --- /dev/null +++ b/user/font-sun-misc/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-sun-misc +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 fonts from Sun Microsystems" +url="https://www.X.Org/" +arch="noarch" +license="X11" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="52c4a38e49a94831999652d9830da841949c319083ea40492e83690e1e5c2d31ea1979046a420af0e51bc105b8697bb06b4a438485e82b130d7469ad4519e275 font-sun-misc-1.0.3.tar.bz2" diff --git a/user/font-winitzki-cyrillic/APKBUILD b/user/font-winitzki-cyrillic/APKBUILD new file mode 100644 index 000000000..03e93b01f --- /dev/null +++ b/user/font-winitzki-cyrillic/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-winitzki-cyrillic +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Cyrillic X11 fonts from Serge Winitzki" +url="https://www.X.Org/" +arch="noarch" +license="Public-Domain" +depends="encodings font-alias fontconfig mkfontdir" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + find "$pkgdir" -name fonts.dir -exec rm {} + +} + +sha512sums="f98fa99c1b0e60160b362310a7fe5fd5798aaa686751a6784a697c546ed754e885537eeed39a1f973dbceabc962cb65b39af1d336649381a49feb6df9f23e2b7 font-winitzki-cyrillic-1.0.3.tar.bz2" diff --git a/user/font-xfree86-type1/APKBUILD b/user/font-xfree86-type1/APKBUILD new file mode 100644 index 000000000..f82b76bcf --- /dev/null +++ b/user/font-xfree86-type1/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=font-xfree86-type1 +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Type 1 X11 fonts from the XFree86 project" +url="https://www.X.Org/" +arch="noarch" +license="X11" +depends="fontconfig mkfontdir mkfontscale" +makedepends="util-macros" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +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 {} + +} + +sha512sums="2b4afc6cbb7953f8ba4aab7862d16b7b988ea6a4df6de8d41c8340d35a1cd53d6fcc26479ff88189d1de9f42804e4f56d70e9dbd7e75820eab4ac6ae3a96840c font-xfree86-type1-1.0.4.tar.bz2" diff --git a/user/fontawesome/APKBUILD b/user/fontawesome/APKBUILD new file mode 100644 index 000000000..89d614288 --- /dev/null +++ b/user/fontawesome/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fontawesome +pkgver=5.7.0 +pkgrel=0 +pkgdesc="Typeface for iconography" +url="https://fontawesome.com" +arch="noarch" +options="!check" # No test suite. +license="CC-BY-3.0 AND OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://use.fontawesome.com/releases/v$pkgver/fontawesome-free-$pkgver-desktop.zip" +builddir="$srcdir/fontawesome-free-5.7.0-desktop/otfs" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf +} + +sha512sums="34f9e3c4bbf03f1d3cd247717a6c2ea19b83321a0c4db6587cba2276ccf7d59e982dd2696d58da8d212c4f30ab87b58601edc1b98bd33339f1fd45eef1e18a0d fontawesome-free-5.7.0-desktop.zip" diff --git a/user/fontforge/APKBUILD b/user/fontforge/APKBUILD new file mode 100644 index 000000000..949fb702c --- /dev/null +++ b/user/fontforge/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fontforge +pkgver=2.0.20170731 +pkgrel=1 +pkgdesc="Open source font editor" +url="https://fontforge.github.io/en-US/" +arch="all" +license="GPL-3.0+ AND BSD-3-Clause" +depends="desktop-file-utils shared-mime-info" +makedepends="freetype-dev giflib-dev glib-dev libjpeg-turbo-dev + libuninameslist-dev libpng-dev libx11-dev libxml2-dev pango-dev + python3-dev tiff-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://github.com/fontforge/fontforge/releases/download/${pkgver/2.0./}/fontforge-dist-${pkgver/2.0./}.tar.xz + python3.patch + " + +build() { + cd "$builddir" + PYTHON=python3 ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + # skip test 53; it doesn't work. + make check TESTSUITEFLAGS="1-52 54" +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 fontforge-dist-20170731.tar.xz +0ca2f3d10a54e4ccb0737ba8e4e768a75e536f70f8892bfe8c23daa5d542d58a1dd4991a982748dcb2c24ed5ae4cb336278a1c01eb434a0463b8b36133b0bb33 python3.patch" diff --git a/user/fontforge/python3.patch b/user/fontforge/python3.patch new file mode 100644 index 000000000..25bae415e --- /dev/null +++ b/user/fontforge/python3.patch @@ -0,0 +1,197 @@ +From b6089f11bd7534c9aa38b875ef1e830fc3b898b4 Mon Sep 17 00:00:00 2001 +From: Jeremy Tan <jtanx@outlook.com> +Date: Wed, 13 Sep 2017 17:22:18 +0800 +Subject: [PATCH] python: Use PyMem_Free wherever PyArg_ParseTuple+es is used + +https://docs.python.org/2.0/ext/parseTuple.html +--- + fontforge/python.c | 62 +++++++++++++++++++++++++++------------------- + 1 file changed, 38 insertions(+), 27 deletions(-) + +diff --git a/fontforge/python.c b/fontforge/python.c +index 5d6820c40..c6d7aca2b 100644 +--- a/fontforge/python.c ++++ b/fontforge/python.c +@@ -607,7 +607,13 @@ return( NULL ); + } + } + +- if ( !SetPrefs((char *) prefname,&val,NULL)) { ++ bool succeeded = SetPrefs((char *) prefname,&val,NULL); ++ if (val.type == v_str && val.u.sval) { ++ PyMem_Free(val.u.sval); ++ val.u.sval = NULL; ++ } ++ ++ if (!succeeded) { + PyErr_Format(PyExc_NameError, "Unknown preference item in SetPrefs: %s", prefname ); + return( NULL ); + } +@@ -728,7 +734,7 @@ static PyObject *PyFF_UnicodeFromName(PyObject *UNUSED(self), PyObject *args) { + return( NULL ); + + ret = Py_BuildValue("i", UniFromName((char *) name, ui_none,&custom)); +- free(name); ++ PyMem_Free(name); + return( ret ); + } + +@@ -1361,12 +1367,14 @@ Py_RETURN_NONE; /* Well, that was pointless */ + if ( import==Py_None ) + import=NULL; + else if ( !PyCallable_Check(import) ) { ++ PyMem_Free(name); + PyErr_Format(PyExc_TypeError, "First argument is not callable" ); + return( NULL ); + } + if ( export==Py_None ) + export=NULL; + else if ( !PyCallable_Check(export) ) { ++ PyMem_Free(name); + PyErr_Format(PyExc_TypeError, "Second argument is not callable" ); + return( NULL ); + } +@@ -1472,7 +1480,7 @@ static PyObject *PyFF_logError(PyObject *UNUSED(self), PyObject *args) { + if ( !PyArg_ParseTuple(args,"es","UTF-8", &msg) ) + return( NULL ); + LogError(msg); +- free(msg); ++ PyMem_Free(msg); + Py_RETURN_NONE; + } + +@@ -1486,6 +1494,8 @@ static PyObject *PyFF_postError(PyObject *UNUSED(self), PyObject *args) { + return( NULL ); + if( showPythonErrors ) + ff_post_error(title,msg); /* Prints to stderr if no ui */ ++ PyMem_Free(title); ++ PyMem_Free(msg); + Py_RETURN_NONE; + } + +@@ -1494,6 +1504,8 @@ static PyObject *PyFF_postNotice(PyObject *UNUSED(self), PyObject *args) { + if ( !PyArg_ParseTuple(args,"eses","UTF-8", &title, "UTF-8", &msg) ) + return( NULL ); + ff_post_notice(title,msg); /* Prints to stderr if no ui */ ++ PyMem_Free(title); ++ PyMem_Free(msg); + Py_RETURN_NONE; + } + +@@ -1511,8 +1523,8 @@ return( NULL ); + return( NULL ); + + ret = ff_open_filename(title,def,filter); +- free(title); +- free(def); ++ PyMem_Free(title); ++ PyMem_Free(def); + if ( ret==NULL ) + Py_RETURN_NONE; + reto = DECODE_UTF8(ret,strlen(ret),NULL); +@@ -1534,8 +1546,8 @@ return( NULL ); + return( NULL ); + + ret = ff_save_filename(title,def,filter); +- free(title); +- free(def); ++ PyMem_Free(title); ++ PyMem_Free(def); + if ( ret==NULL ) + Py_RETURN_NONE; + reto = DECODE_UTF8(ret,strlen(ret),NULL); +@@ -1558,8 +1570,8 @@ return( NULL ); + return( NULL ); + if ( !PySequence_Check(answero) || STRING_CHECK(answero)) { + PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + return( NULL ); + } + cnt = PySequence_Size(answero); +@@ -1568,16 +1580,16 @@ return( NULL ); + cancel = cnt-1; + if ( cancel<0 || cancel>=cnt || def<0 || def>=cnt ) { + PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th or 5th argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + free(answers); + return( NULL ); + } + for ( i=0; i<cnt; ++i ) { + PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i)); + if ( utf8_name==NULL ) { +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + FreeStringArray( i, answers ); + return( NULL ); + } +@@ -1587,8 +1599,8 @@ return( NULL ); + answers[cnt] = NULL; + + ret = ff_ask(title,(const char **) answers,def,cancel,quest); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + FreeStringArray( cnt, answers ); + return( Py_BuildValue("i",ret)); + } +@@ -1608,23 +1620,23 @@ return( NULL ); + return( NULL ); + if ( !PySequence_Check(answero) || STRING_CHECK(answero)) { + PyErr_Format(PyExc_TypeError, "Expected a tuple of strings for the third argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + return( NULL ); + } + cnt = PySequence_Size(answero); + answers = calloc(cnt+1, sizeof(char *)); + if ( def<0 || def>=cnt ) { + PyErr_Format(PyExc_ValueError, "Value out of bounds for 4th argument"); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + return( NULL ); + } + for ( i=0; i<cnt; ++i ) { + PyObject *utf8_name = PYBYTES_UTF8(PySequence_GetItem(answero,i)); + if ( utf8_name==NULL ) { +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + FreeStringArray( i, answers ); + return( NULL ); + } +@@ -1634,8 +1646,8 @@ return( NULL ); + answers[cnt] = NULL; + + ret = ff_choose(title,(const char **) answers,cnt,def,quest); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + FreeStringArray( cnt, answers ); + return( Py_BuildValue("i",ret)); + } +@@ -1654,8 +1666,8 @@ return( NULL ); + return( NULL ); + + ret = ff_ask_string(title,def,quest); +- free(title); +- free(quest); ++ PyMem_Free(title); ++ PyMem_Free(quest); + free(def); + if ( ret==NULL ) + Py_RETURN_NONE; diff --git a/user/fonttosfnt/APKBUILD b/user/fonttosfnt/APKBUILD new file mode 100644 index 000000000..62d1ddcae --- /dev/null +++ b/user/fonttosfnt/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fonttosfnt +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Wrap X11 bitmap fonts in TrueType containers" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="freetype-dev libfontenc-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/fonttosfnt-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="dba990098c95b07bc7240699a5c9ea11f056fbfddd70f669ae283548cbf20d756b28d817a99548c23ba81de9792877296ab6f35ee3c630e5c3cd8f14650ce297 fonttosfnt-1.0.5.tar.bz2" diff --git a/user/fortune-mod/APKBUILD b/user/fortune-mod/APKBUILD new file mode 100644 index 000000000..2a4e1c873 --- /dev/null +++ b/user/fortune-mod/APKBUILD @@ -0,0 +1,54 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fortune-mod +pkgver=2.6.2 +pkgrel=0 +pkgdesc="Display random messages or quotations" +url="https://www.shlomifish.org/humour/fortunes/" +arch="all" +options="!check" # Fails due to spaces in CMake files... +license="BSD-4-Clause" +depends="" +checkdepends="perl-file-find-object perl-io-all perl-test-differences + perl-test-runvalgrind valgrind" +makedepends="cmake recode-dev" +subpackages="$pkgname-doc" +source="https://github.com/shlomif/fortune-mod/archive/$pkgname-$pkgver.tar.gz" +builddir="$srcdir/fortune-mod-fortune-mod-$pkgver/$pkgname" + +prepare() { + cd "$builddir" + default_prepare + mkdir build +} + +build() { + cd "$builddir"/build + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + 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" \ + -DNO_OFFENSIVE=True \ + -DLOCALDIR=/usr/share/games/fortunes \ + ${CMAKE_CROSSOPTS} \ + .. + make +} + +check() { + cd "$builddir"/build + make check +} + +package() { + cd "$builddir"/build + make DESTDIR="$pkgdir" install +} + +sha512sums="e3a9cd949bc38ab3044d2b32e0a6d946d4e8e2824218927c5350c212053ba47372b9f65251cf7a9ffa263c7990aeff6929bc4273b6d57ff1c9e1ff0d6dd80aa8 fortune-mod-2.6.2.tar.gz" diff --git a/user/frameworkintegration/APKBUILD b/user/frameworkintegration/APKBUILD index 2f0932c1c..abaeb67b4 100644 --- a/user/frameworkintegration/APKBUILD +++ b/user/frameworkintegration/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=frameworkintegration -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cc367f33c56d9fab467d3d5ba8119bb9ce36fdaa3133d4c3ef731dd1b9457497b459d48210cc78ee185e01097c7147829b9c3629c6d611dcc4b419f58e5f6194 frameworkintegration-5.52.0.tar.xz" +sha512sums="9bb0c8a10b342976c21f8840e04f4b9ac60931c804fc0debbddf24b710e97804a2b8d357019840534c4fb4b4b816565a49682b0b09b4fb4d82d7d3467af1bb1f frameworkintegration-5.54.0.tar.xz" diff --git a/user/free42/APKBUILD b/user/free42/APKBUILD new file mode 100644 index 000000000..ba8814388 --- /dev/null +++ b/user/free42/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=free42 +pkgver=2.0.22 +pkgrel=1 +pkgdesc="Scientific programmable calculator" +url="http://thomasokken.com/free42/" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only AND Public-Domain" +depends="" +makedepends="alsa-lib-dev gtk+2.0-dev libx11-dev libxmu-dev" +subpackages="" +source="https://distfiles.adelielinux.org/source/free42-nologo-$pkgver.tgz + free42.desktop + libx11.patch + patch.patch + " +builddir="$srcdir/free42-nologo-$pkgver/gtk" + +build() { + cd "$builddir" + local SAVE_CFLAGS + SAVE_CFLAGS=$CFLAGS + unset CFLAGS + CC="gcc -D_WCHAR_T" ./build-intel-lib.sh + CFLAGS=$SAVE_CFLAGS + make BCD_MATH=1 AUDIO_ALSA=1 +} + +package() { + cd "$builddir" + install -D -m755 free42dec "$pkgdir"/usr/bin/free42dec + install -D -m644 "$srcdir"/free42.desktop \ + "$pkgdir"/usr/share/applications/free42.desktop +} + +sha512sums="865e8cce86a882aba10e7e756308e195a6675f0b6db4b881e7b7df67de95f5169ca801005e25dd0e61a70a5a0cd6a374b0cf58003251cdc9dc526a2506e18e1d free42-nologo-2.0.22.tgz +f52700d234719f4ee7cdd369fc5f28ade190ff77ed1a824cd2cdaeef62419700de3d85a28fd6ae378f904e018813dc4145ca4cc9f2669fdf50f3e13baa7ec634 free42.desktop +f8434fd1c20f0dd40de5773615eaf798329870231f7ce66785a1bc8e208fa0a64919f48ac3eea5ab9ceb818570ae93f61b0e81baec4261bbdfbf04237108ab6a libx11.patch +7b48609bff5466d81f42ed65405cd09e98fa675c087837b22caebab2b97420a34d1156399c3b18608bcae42896c12aa63a6f87515f5677587dfff6ed135dc760 patch.patch" diff --git a/user/free42/free42.desktop b/user/free42/free42.desktop new file mode 100644 index 000000000..568afc69b --- /dev/null +++ b/user/free42/free42.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Version=1.1 +Name=Free42 +GenericName=Scientific Calculator +Comment=HP-42S Calculator Simulator +Icon=accessories-calculator +Exec=/usr/bin/free42dec +Categories=Utility;Calculator;Science;Math; diff --git a/user/free42/libx11.patch b/user/free42/libx11.patch new file mode 100644 index 000000000..54c4c6cc0 --- /dev/null +++ b/user/free42/libx11.patch @@ -0,0 +1,11 @@ +--- gtk/Makefile.old 2019-01-13 14:52:39.000000000 +0000 ++++ gtk/Makefile 2019-01-17 01:38:40.500000000 +0000 +@@ -35,7 +35,7 @@ + -D_WCHAR_T_DEFINED + + LDFLAGS = -L/usr/X11R6/lib +-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) ++LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0) -lX11 + + ifeq "$(shell uname -s)" "Linux" + LDFLAGS += -Wl,--hash-style=both diff --git a/user/free42/patch.patch b/user/free42/patch.patch new file mode 100644 index 000000000..e84b3f7b8 --- /dev/null +++ b/user/free42/patch.patch @@ -0,0 +1,82 @@ +--- gtk/intel-lib-linux.patch.old 2019-01-13 14:52:39.000000000 +0000 ++++ gtk/intel-lib-linux.patch 2019-01-17 01:27:01.470000000 +0000 +@@ -1668,3 +1668,62 @@ + }
+
+ + #endif /* FREE42_FPTEST */
++--- LIBRARY/makefile.iml_head.old 2011-07-12 15:26:21.000000000 +0000 +++++ LIBRARY/makefile.iml_head 2019-01-17 01:25:09.210000000 +0000 ++@@ -177,7 +177,7 @@ ++ # returned ++ # ============================================================================== ++ ++-__INDICES__ = 1 2 3 4 5 6 7 8 9 10 11 +++__INDICES__ = 1 2 3 4 5 6 7 8 9 10 11 12 13 ++ ++ GetIndex = $(strip $(word 1,$(if $(word $(words $(__INDICES__)),$2), \ ++ $(error "List too large. Adjust __INDICES__"), \ ++@@ -344,9 +344,9 @@ ++ endif ++ endif ++ ++-ARCH_ALIAS := x86 ia64 EM64T x86_64 i686 amd64 Intel64 sun4u ++-ARCH_LIST := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 ++-ARCH_TYPE := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 +++ARCH_ALIAS := x86 ia64 EM64T x86_64 i686 amd64 Intel64 sun4u ppc64 ppc armel aarch64 +++ARCH_LIST := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 +++ARCH_TYPE := IA32 IA64 EFI2 EFI2 IA32 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 EFI2 ++ ARCH_TYPES := IA32 IA64 EFI2 ++ ++ UARCH_LIST := SSE GSSE LRB LRB2 ++@@ -363,6 +363,16 @@ ++ $(error Invalid host architecture $(IML_HOST_ARCH)) ++ endif ++ +++ifeq ($(_HOST_ARCH),ppc) +++ BID_BIG_ENDIAN ?= true +++ BID_BIG_ENDIAN := $(BID_BIG_ENDIAN) +++endif +++ +++ifeq ($(_HOST_ARCH),ppc64) +++ BID_BIG_ENDIAN ?= true +++ BID_BIG_ENDIAN := $(BID_BIG_ENDIAN) +++endif +++ ++ IML_HOST_ARCH_TYPE ?= $(word $(HOST_ARCH_LIST_INDEX),$(ARCH_TYPE)) ++ IML_HOST_ARCH_TYPE := $(IML_HOST_ARCH_TYPE) ++ HOST_ARCH_TYPE_INDEX := $(call GetIndex,$(IML_HOST_ARCH_TYPE),$(ARCH_TYPES)) ++@@ -492,7 +502,7 @@ ++ RM := $(call CselOs, RM, $(_OS_CHOICE), rm -f, del ) ++ AR_CMD := $(call CselOsName,AR_CMD,$(_OS_CHOICE), ar rv, ar rv, libtool, lib -nologo) ++ AR_OUT := $(call CselOsName,AR_OUT,$(_OS_CHOICE), , , -o, /out:)$($(IML_TARGET_OS)__space) ++-LD_CMD := $(call CselOsName,LD_CMD,$(_OS_CHOICE),icc,icc,libtool,link /nologo) +++LD_CMD := $(call CselOsName,LD_CMD,$(_OS_CHOICE),gcc,icc,libtool,link /nologo) ++ LD_OUT := $(call CselOs, LD_OUT, $(_OS_CHOICE), -o, /out:)$($(IML_TARGET_OS)__space) ++ LD_FLAGS := $(call CselOs, LD_FLAGS, $(_OS_CHOICE), -shared -nostdlib,) ++ RC := $(call CselOs, RC, $(_OS_CHOICE), RC_not_to_be_used_with_linux,rc) ++@@ -515,7 +525,7 @@ ++ ++ ifeq ($(origin CC_NAME),undefined) ++ ifeq ($(origin CC),default) ++- CC_NAME := $(call $(_OS_CHOICE)OsTypeSelect, icc, icl) +++ CC_NAME := $(call $(_OS_CHOICE)OsTypeSelect, gcc, icl) ++ else ++ __TMP := $(strip $(subst /, ,$(firstword $(CC)))) ++ CC_NAME := $(word $(words $(__TMP)), $(__TMP)) +--- gtk/intel-lib-linux.patch.old 2019-01-23 03:43:48.830000000 +0000 ++++ gtk/intel-lib-linux.patch 2019-01-23 03:46:18.170000000 +0000 +@@ -1727,3 +1727,14 @@ + else + __TMP := $(strip $(subst /, ,$(firstword $(CC)))) + CC_NAME := $(word $(words $(__TMP)), $(__TMP)) ++--- LIBRARY/src/bid_functions.h.old 2011-07-12 05:30:53.000000000 +0000 +++++ LIBRARY/src/bid_functions.h 2019-01-23 03:45:35.660000000 +0000 ++@@ -42,7 +42,7 @@ ++ #include <ctype.h>
++
++ // Fix system header issue on Sun solaris and define required type by ourselves
++-#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__)
+++#if !defined(_WCHAR_T) && !defined(_WCHAR_T_DEFINED) && !defined(__QNX__) && !defined(WCHAR_MAX)
++ typedef int wchar_t;
++ #endif
++
diff --git a/user/freecell-solver/APKBUILD b/user/freecell-solver/APKBUILD index abf6ae301..78c1eadb5 100644 --- a/user/freecell-solver/APKBUILD +++ b/user/freecell-solver/APKBUILD @@ -4,7 +4,7 @@ pkgname=freecell-solver pkgver=4.20.0 pkgrel=0 pkgdesc="Library for solving card games" -url="http://fc-solve.shlomifish.org/" +url="https://fc-solve.shlomifish.org/" arch="all" license="MIT" depends="python3" @@ -13,7 +13,7 @@ makedepends="gperf perl perl-task-freecellsolver-testing python3 py3-random2 checkdepends="gmp-dev libtap-dev perl-dev py3-cffi py3-pycotap the_silver_searcher valgrind" subpackages="$pkgname-dev $pkgname-doc" -source="http://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-$pkgver.tar.xz" +source="https://fc-solve.shlomifish.org/downloads/fc-solve/freecell-solver-$pkgver.tar.xz" build() { cd "$builddir" diff --git a/user/fslsfonts/APKBUILD b/user/fslsfonts/APKBUILD new file mode 100644 index 000000000..5734d3301 --- /dev/null +++ b/user/fslsfonts/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fslsfonts +pkgver=1.0.5 +pkgrel=0 +pkgdesc="List fonts offered by an X font server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libfs-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/fslsfonts-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2 fslsfonts-1.0.5.tar.bz2" diff --git a/user/fstobdf/APKBUILD b/user/fstobdf/APKBUILD new file mode 100644 index 000000000..0c39dcfba --- /dev/null +++ b/user/fstobdf/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fstobdf +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Create X11 bitmap font from font server font" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libfs-dev util-macros libx11-dev xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/fstobdf-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f fstobdf-1.0.6.tar.bz2" diff --git a/user/fuse-exfat/APKBUILD b/user/fuse-exfat/APKBUILD new file mode 100644 index 000000000..21848f057 --- /dev/null +++ b/user/fuse-exfat/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=fuse-exfat +pkgver=1.3.0 +pkgrel=0 +pkgdesc="Free exFAT file system implementation" +url="https://github.com/relan/exfat" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="fuse-dev" +subpackages="$pkgname-doc" +source="https://github.com/relan/exfat/releases/download/v$pkgver/fuse-exfat-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="90d2b89322590199012b035b88ae01559f1824172793d9e7845603940e2807e788c687e4958f1ef76678bd214bb03671b91fd2537901b6d6acf2e8c525a3f1f3 fuse-exfat-1.3.0.tar.gz" diff --git a/user/gidole/APKBUILD b/user/gidole/APKBUILD new file mode 100644 index 000000000..f20bf594f --- /dev/null +++ b/user/gidole/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=gidole +pkgver=2.0.2 +pkgrel=0 +pkgdesc="Modern DIN 1451 style typeface" +url="https://gidole.github.io/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://dev.gentoo.org/~jstein/dist/gidole-$pkgver.zip" +builddir="$srcdir/GidoleFont" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttf +} + +sha512sums="adc58657a4ea0331cda6261de293ab997c8d862fd23824f92860710e4a017267835d5c1fbfc6accace20ce172d5586d5f9568de08adf0266a07a191d9499e727 gidole-2.0.2.zip" diff --git a/user/glass-tty-vt220/APKBUILD b/user/glass-tty-vt220/APKBUILD new file mode 100644 index 000000000..54b89f38c --- /dev/null +++ b/user/glass-tty-vt220/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=glass-tty-vt220 +pkgver=001.3 +pkgrel=0 +pkgdesc="Typeface that mimics DEC VT220 glyphs" +url="http://sensi.org/~svo/glasstty/" +arch="noarch" +options="!check" # No test suite. +license="Public-Domain" +depends="fontconfig" +makedepends="" +subpackages="" +source="http://sensi.org/~svo/glasstty/Glass_TTY_VT220.ttf" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF Glass_TTY_VT220.ttf +} + +sha512sums="0b3b598bbdcc8f1177b48a7cedd2ad035a8a95d17d162d868e7c988a9d918f2756a8fe674bef3f30357225a87ea4e3adde01889502540d6920210161edc37023 Glass_TTY_VT220.ttf" diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD new file mode 100644 index 000000000..e5dfbfd14 --- /dev/null +++ b/user/glibmm/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=glibmm +pkgver=2.58.0 +pkgrel=0 +pkgdesc="C++ interfaces for glib" +url="https://gnome.org" +arch="all" +license="GPL-2.0+ AND LGPL-2.1+" +depends="glib-networking" +makedepends="glib-dev libsigc++-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://download.gnome.org/sources/glibmm/${pkgver%.*}/glibmm-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e376462cdf1a60ed7d7750115200162016f57797674bbf7291c11b8754a6e4394eb1e2948ce4e37247438120dba4e18f5cf9c543963c1e97d8561d174d5ae7df glibmm-2.58.0.tar.xz" diff --git a/user/gnu-ghostscript/APKBUILD b/user/gnu-ghostscript/APKBUILD new file mode 100644 index 000000000..14ce2c5f6 --- /dev/null +++ b/user/gnu-ghostscript/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=gnu-ghostscript +pkgver=9.14.1 +pkgrel=2 +pkgdesc="PostScript utilities" +url="https://www.gnu.org/software/ghostscript/" +arch="all" +license="AGPL-3.0+ WITH PDF-exception" +depends="" +makedepends="cups-dev dbus-dev fontconfig-dev freetype-dev lcms2-dev libice-dev + libjpeg-turbo-dev libpaper-dev libpng-dev libx11-dev libxext-dev + libxt-dev tiff-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" +source="ftp://ftp.gnu.org/gnu/ghostscript/gnu-ghostscript-$pkgver.tar.xz + do-not-use-sprintf.patch + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-dynamic \ + --with-system-libtiff + make + make so +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" soinstall + install -D -m644 base/*.h "$pkgdir"/usr/include/ghostscript +} + +sha512sums="658f6ae14b29965c7959b9bd1463760d7fb03b35251446fc37101dbe7ee2866c74a0803e22b2f4488be3221d026578be1d6be7b562ff240036134fbf83edabf9 gnu-ghostscript-9.14.1.tar.xz +1c4d79633ecece9f4de7a672f2888939be7d1e0ba24f3a66500fdfbb37e081e0f323a5efa0d1547fed51206e5a95d3b0659c0ea845d0bc333f281dfb88fcc040 do-not-use-sprintf.patch" diff --git a/user/gnu-ghostscript/do-not-use-sprintf.patch b/user/gnu-ghostscript/do-not-use-sprintf.patch new file mode 100644 index 000000000..e0e84b4fe --- /dev/null +++ b/user/gnu-ghostscript/do-not-use-sprintf.patch @@ -0,0 +1,85 @@ +--- gnu-ghostscript-9.14.1/base/mkromfs.c.old 2014-07-02 14:46:25.000000000 +0000 ++++ gnu-ghostscript-9.14.1/base/mkromfs.c 2019-01-14 19:08:34.441981516 +0000 +@@ -1937,7 +1937,7 @@ + for (i = 0; i < len; ++i) { + int c = str[i]; + +- sprintf(linebuf, ++ snprintf(linebuf, sizeof(linebuf), + (c < 32 || c >= 127 ? "%d," : + c == '\'' || c == '\\' ? "'\\%c'," : "'%c',"), + c); +@@ -2228,7 +2228,7 @@ + char line[LINE_SIZE + 1]; + + while ((rl(in, line, LINE_SIZE), line[0])) { +- sprintf(linebuf, "%s", line ); ++ snprintf(linebuf, sizeof(linebuf), "%s", line ); + wl(linebuf); + } + mergefile(os_prefix, inname, in, config, false); +--- gnu-ghostscript-9.14.1/cups/gdevcups.c.old 2014-07-02 15:13:25.000000000 +0000 ++++ gnu-ghostscript-9.14.1/cups/gdevcups.c 2019-01-23 20:56:04.082290416 +0000 +@@ -1039,7 +1039,7 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsInteger%d", i); ++ snprintf(name, sizeof(name), "cupsInteger%d", i); + if ((code = param_write_int(plist, strdup(name), + (int *)(cups->header.cupsInteger + i))) < 0) + return (code); +@@ -1047,7 +1047,7 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsReal%d", i); ++ snprintf(name, sizeof(name), "cupsReal%d", i); + if ((code = param_write_float(plist, strdup(name), + cups->header.cupsReal + i)) < 0) + return (code); +@@ -1055,7 +1055,7 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsString%d", i); ++ snprintf(name, sizeof(name), "cupsString%d", i); + param_string_from_string(s, cups->header.cupsString[i]); + if ((code = param_write_string(plist, strdup(name), &s)) < 0) + return (code); +@@ -3166,19 +3166,19 @@ + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsInteger%d", i); ++ snprintf(name, sizeof(name), "cupsInteger%d", i); + intoption(cupsInteger[i],strdup(name), unsigned) + } + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsReal%d", i); ++ snprintf(name, sizeof(name), "cupsReal%d", i); + floatoption(cupsReal[i], strdup(name)) + } + + for (i = 0; i < 16; i ++) + { +- sprintf(name, "cupsString%d", i); ++ snprintf(name, sizeof(name), "cupsString%d", i); + stringoption(cupsString[i], strdup(name)) + } + +@@ -4247,10 +4247,10 @@ + */ + + if (pdev->HWResolution[0] != pdev->HWResolution[1]) +- sprintf(resolution, "%.0fx%.0fdpi", pdev->HWResolution[0], ++ snprintf(resolution, sizeof(resolution), "%.0fx%.0fdpi", pdev->HWResolution[0], + pdev->HWResolution[1]); + else +- sprintf(resolution, "%.0fdpi", pdev->HWResolution[0]); ++ snprintf(resolution, sizeof(resolution), "%.0fdpi", pdev->HWResolution[0]); + + for (i = 0, profile = cups->PPD->profiles; + i < cups->PPD->num_profiles; diff --git a/user/gnumeric/APKBUILD b/user/gnumeric/APKBUILD new file mode 100644 index 000000000..07c02e4ef --- /dev/null +++ b/user/gnumeric/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=gnumeric +pkgver=1.12.44 +pkgrel=1 +pkgdesc="GNOME spreadsheet software" +url="http://www.gnumeric.org/" +arch="all" +options="!check" # Fails with: +# CRITICAL **: 20:41:56.049: go_conf_add_monitor: assertion 'node || key' failed +# no clue. +license="GPL-2.0-only OR GPL-3.0-only" +depends="" +makedepends="byacc gobject-introspection-dev goffice-dev gtk+3.0-dev intltool + itstool libgda-dev libxml2-utils perl-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +langdir="/usr/lib/locale" +source="https://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.12/gnumeric-$pkgver.tar.xz + cs.patch + " + +build() { + cd "$builddir" + YACC=yacc ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-introspection + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="ea21dcdf5fdf4e02bb9d83671675f2409f12ee928611604d7589e0047ce5d75bf6ac51e6a5322c4af520428acdccf4c2b3b8e3fc6530030e162268aea94a503f gnumeric-1.12.44.tar.xz +24d74cec5a19f3f79a049b02b43369324fbb1432be4945988034a38d813cceeab54da67d3d9eb2eff49d248e449212d0877b20b593a8c1f70cecbdbd635cb517 cs.patch" diff --git a/user/gnumeric/cs.patch b/user/gnumeric/cs.patch new file mode 100644 index 000000000..b61f242c2 --- /dev/null +++ b/user/gnumeric/cs.patch @@ -0,0 +1,11 @@ +--- gnumeric-1.12.44/doc/cs/cs.po.old 2018-11-03 17:22:50.000000000 +0000 ++++ gnumeric-1.12.44/doc/cs/cs.po 2019-01-10 01:35:07.770000000 +0000 +@@ -24824,7 +24824,7 @@ + msgstr "" + "Můžete nastavit i několik doplňujících voleb. Jestli chcete omezit počet " + "iterací optimalizačního algoritmu, tak to můžete udělat v poli " +-"<guilabel>Max. iterací<guilabel> na kartě <guilabel>Volby</guilabel>. " ++"<guilabel>Max. iterací</guilabel> na kartě <guilabel>Volby</guilabel>. " + "Obdobně můžete omezit maximální dobu běhu optimalizace v poli <guilabel>Max. " + "čas (sekundy)</guilabel>. Pokud je některé z těchto nastavení při " + "optimalizaci překročeno, optimalizace se přeruší a zobrazí se chybové " diff --git a/user/gnutls/APKBUILD b/user/gnutls/APKBUILD index 233bbcb52..338fedaa8 100644 --- a/user/gnutls/APKBUILD +++ b/user/gnutls/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Michael Mason <ms13sp@gmail.com> # Maintainer: pkgname=gnutls -pkgver=3.6.4 +pkgver=3.6.6 pkgrel=0 pkgdesc="A TLS protocol implementation" url="http://www.gnutls.org/" @@ -72,5 +72,5 @@ xx() { mv "$pkgdir"/usr/lib/lib*xx.so.* "$subpkgdir"/usr/lib/ } -sha512sums="f39ac09b48ebf230653cbf82b29ded39a1403313067135495b23f428b35783f9ef073993157d1f284678abedd19e2cf1fd01af843001b88320ca17b346b219ab gnutls-3.6.4.tar.xz +sha512sums="4ff34f38d7dc543bc5750d8fdfe9be84af60c66e8d41da45f6cffc11d6c6c726784fd2d471b3416604ca1f3f9efb22ff7a290d5c92c96deda38df6ae3e794cc1 gnutls-3.6.6.tar.xz abc24ee59cc67805fe953535b0bae33080fc8b0bf788304377f6d10ec8c162c4cf203a69c98a4ba3483b4c60ed7a204433cc7db9b8190eddb0d68f6fb6dad52d gnulib-tests-dont-require-gpg-passphrase.patch" diff --git a/user/gobject-introspection/APKBUILD b/user/gobject-introspection/APKBUILD index 85345d331..c8f5fc03a 100644 --- a/user/gobject-introspection/APKBUILD +++ b/user/gobject-introspection/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=gobject-introspection -pkgver=1.58.2 -pkgrel=1 +pkgver=1.58.3 +pkgrel=0 pkgdesc="Introspection system for GObject-based libraries" url="https://wiki.gnome.org/action/show/Projects/GObjectIntrospection" arch="all" @@ -48,5 +48,5 @@ dev() { replaces="gobject-introspection" } -sha512sums="b516527a910702b26f8034ded463bdd28bb9db782ac77947ac2178ae3a41bd9e0390fff6155aca6e9ec92c6cf051314134322efae6937bd9cbcb4033df65c677 gobject-introspection-1.58.2.tar.xz +sha512sums="0811cd08e224975b3aa55ae89d648fc65f3105cae8a077a5671593d84743b1db28e9fbffe53fc86a2b3e82ea98c35f3daae033d3df07c7020cc3bf8b5d94f796 gobject-introspection-1.58.3.tar.xz 106e36c04ab9035b92d7f34251c3af2c37fbbc538d2b96027735565df74314eb90a93288f1bc62c08742ff6ba525d72ea03306e3b32f48724a09548788466d3d we-are-in-a-pickle.patch" diff --git a/user/goffice/APKBUILD b/user/goffice/APKBUILD new file mode 100644 index 000000000..0b5fc833b --- /dev/null +++ b/user/goffice/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: multiplexd <multi@in-addr.xyz> +pkgname=goffice +pkgver=0.10.44 +pkgrel=0 +pkgdesc="Library of document-centric objects and utilities built on top of GLib and Gtk+" +url="https://www.gnome.org" +arch="all" +license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+ AND MIT" +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" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --enable-introspection + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="9e86440afaee4d6eadd31c328a13dc54fb4056dfc70ef0196d83bada5f05eb4fc12daf35fc4e79ea6ebfe8a97dc6ed74b50e514f9d27f08bff776ab898f1c71d goffice-0.10.44.tar.xz" diff --git a/user/gptfdisk/APKBUILD b/user/gptfdisk/APKBUILD new file mode 100644 index 000000000..265d5f8c3 --- /dev/null +++ b/user/gptfdisk/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=gptfdisk +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Utility for manipulating GUID Partition Tables (GPT)" +url="https://www.rodsbooks.com/gdisk/index.html" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="" +makedepends="icu-dev ncurses-dev popt-dev util-linux-dev" +subpackages="$pkgname-doc" +source="https://www.rodsbooks.com/gdisk/gptfdisk-$pkgver.tar.gz" + +build() { + cd "$builddir" + make LDFLAGS="$LDFLAGS -ltinfo" +} + +package() { + cd "$builddir" + local _app + for _app in cgdisk fixparts gdisk sgdisk; do + install -D -m755 $_app "$pkgdir"/usr/sbin/$_app + install -D -m644 $_app.8 "$pkgdir"/usr/share/man/man8/$_app.8 + done +} + +sha512sums="2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf gptfdisk-1.0.4.tar.gz" diff --git a/user/granatier/APKBUILD b/user/granatier/APKBUILD index 8e5652c93..24ba002c9 100644 --- a/user/granatier/APKBUILD +++ b/user/granatier/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=granatier -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Clone of the classic Bomberman game" url="https://www.kde.org/applications/games/granatier/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9f4a49af1ccf004bae32910d53a4a83731b6942c4dec107ee5a80aa950501b12d98ed2b0f2a3a3ca37ca5f6608501a04ab2153304adbc91951aaa83503421250 granatier-18.08.3.tar.xz" +sha512sums="881ff419cb896dcb901c10cc3b17213f5b2b966d4b118b87de88b64ed2095ecc3a0e5b1ae3ab091c37fc9f60bc9cb0c64b72554eb1600176048f9eed94c5f437 granatier-18.12.2.tar.xz" diff --git a/user/graphite2/APKBUILD b/user/graphite2/APKBUILD index 403b60522..33ff919e7 100644 --- a/user/graphite2/APKBUILD +++ b/user/graphite2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=graphite2 _realname=${pkgname/2/} -pkgver=1.3.12 +pkgver=1.3.13 pkgrel=0 pkgdesc="Text processing engine for complex languages" url="http://graphite.sil.org/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir/" install } -sha512sums="d0aed05b54445a9664435d5aef9d78fc07a89be23d18b7b1339d37412b09faca6da3dc1e72524e4b114724b76aa6f36934e8ab1a01bd0752e353efa075c9e643 graphite2-1.3.12.tar.gz +sha512sums="8e2c6047a66b4d8873842de6b9b1909d326512b47a04f483b3a6113b97fd0d47e0da7cf9ecf96e060ca06e5288b49f1300e2fd7165d2d82d6a8eb8cb7d53d33f graphite2-1.3.13.tar.gz 4ef5414e6d554bb8d6ead435e38d061a073f350c313b7141158bb68332f5f57ca5250385875a387b828bb657964588e974143b96b5e11c2cd314871e7baddb88 graphite2-1.2.0-cmakepath.patch" diff --git a/user/grfcodec/APKBUILD b/user/grfcodec/APKBUILD new file mode 100644 index 000000000..7ca60e872 --- /dev/null +++ b/user/grfcodec/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=grfcodec +pkgver=6.0.6 +pkgrel=0 +pkgdesc="Tool for manipulating OpenTTD GRF files" +url="https://dev.openttdcoop.org/projects/grfcodec" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="" +makedepends="boost-dev" +subpackages="$pkgname-doc" +source="https://binaries.openttd.org/extra/grfcodec/$pkgver/grfcodec-$pkgver-source.tar.xz + va_copy.patch + " + +build() { + cd "$builddir" + make +} + +package() { + cd "$builddir" + make prefix=/usr DESTDIR="$pkgdir" install +} + +sha512sums="543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480 grfcodec-6.0.6-source.tar.xz +4e7034132f889ac62b82d08dae8c928c8a7efd5a0c3dc0d3f35d6c394fb78082a37a22678c5a428489bd26608d868054131a14fb10201d5ce478d46eb9c96890 va_copy.patch" diff --git a/user/grfcodec/va_copy.patch b/user/grfcodec/va_copy.patch new file mode 100644 index 000000000..04a549d60 --- /dev/null +++ b/user/grfcodec/va_copy.patch @@ -0,0 +1,16 @@ +--- grfcodec-6.0.6/src/sanity_defines.h.old 2015-05-09 10:59:46.000000000 +0000 ++++ grfcodec-6.0.6/src/sanity_defines.h 2019-01-14 19:17:36.690000000 +0000 +@@ -77,10 +77,10 @@ + ~apWrapper(){va_end(_ap);} + operator va_list&(){return _ap;} + operator const va_list&()const{return _ap;} +-#ifdef __va_copy ++#ifdef va_copy + va_list&operator=(va_list&ap){ +- __va_copy(_ap,ap); +- return _ap; ++ va_copy(_ap,ap); ++ return _ap; + } + #else + va_list const&operator=(va_list const&ap){ diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index dd1215897..555fec878 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-base pkgver=1.14.4 -pkgrel=0 +pkgrel=1 pkgdesc="GStreamer multimedia framework - Base plugins" url="https://gstreamer.freedesktop.org/" arch="all" @@ -9,26 +9,10 @@ license="GPL LGPL" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" depends="" replaces="gst-plugins-base1" -makedepends=" - alsa-lib-dev - cdparanoia-dev - expat-dev - glib-dev - gobject-introspection-dev - gstreamer-dev - libice-dev - libogg-dev - libsm-dev - libtheora-dev - libvorbis-dev - libx11-dev - libxt-dev - libxv-dev - opus-dev - orc-dev - pango-dev - perl - " +makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev + gobject-introspection-dev gstreamer-dev libice-dev libogg-dev libsm-dev + libtheora-dev libvorbis-dev libx11-dev libxt-dev libxv-dev mesa-dev + opus-dev orc-dev pango-dev perl" checkdepends="orc-compiler" source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz" ldpath="/usr/lib/gstreamer-1.0" diff --git a/user/gst-plugins-good/APKBUILD b/user/gst-plugins-good/APKBUILD new file mode 100644 index 000000000..fb4d05277 --- /dev/null +++ b/user/gst-plugins-good/APKBUILD @@ -0,0 +1,59 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=gst-plugins-good +pkgver=1.14.4 +pkgrel=0 +pkgdesc="GStreamer multimedia framework - Free, well-written plugins" +url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" +arch="all" +license="LGPL-2.1+" +depends="" +checkdepends="orc-compiler cmd:which" +makedepends="gst-plugins-base-dev gstreamer-dev gobject-introspection-dev + orc-dev libgudev-dev v4l-utils-dev libx11-dev cairo-dev flac-dev + gdk-pixbuf-dev gtk+3.0-dev libjpeg-turbo-dev lame-dev libdv-dev + libpng-dev mpg123-dev pulseaudio-dev libraw1394-dev libiec61883-dev + libavc1394-dev libsoup-dev speex-dev taglib-dev wavpack-dev zlib-dev + bzip2-dev" +subpackages="$pkgname-doc $pkgname-gtk $pkgname-lang" +ldpath="/usr/lib/gstreamer-1.0" +source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz + endian-test.patch + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-introspection \ + --with-package-origin="${DISTRO_NAME:-Adélie Linux} (${DISTRO_URL:-https://www.adelielinux.org/})" + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +gtk() { + pkgdesc="$pkgdesc (Gtk+ 3 integration)" + install_if="$pkgname=$pkgver-r$pkgrel gtk+3.0" + mkdir -p "$subpkgdir"/usr/lib/gstreamer-1.0 + mv "$pkgdir"/usr/lib/gstreamer-1.0/libgstgdkpixbuf.so \ + "$subpkgdir"/usr/lib/gstreamer-1.0/ + mv "$pkgdir"/usr/lib/gstreamer-1.0/libgstgtk.so \ + "$subpkgdir"/usr/lib/gstreamer-1.0/ +} + +sha512sums="30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504 gst-plugins-good-1.14.4.tar.xz +1cecf260cfeb19675a819f9858426aaed3b9627ed90b8facb6cb12dfc0b265232639b1888d7cc03edb87025e3eddab6e3606f16b5f7ca261a6b1c39b0dbdc6f7 endian-test.patch" diff --git a/user/gst-plugins-good/endian-test.patch b/user/gst-plugins-good/endian-test.patch new file mode 100644 index 000000000..52065bf34 --- /dev/null +++ b/user/gst-plugins-good/endian-test.patch @@ -0,0 +1,20 @@ +--- gst-plugins-good-1.14.4/tests/check/elements/alpha.c.old 2018-03-23 20:44:48.000000000 +0000 ++++ gst-plugins-good-1.14.4/tests/check/elements/alpha.c 2019-01-10 15:47:17.410000000 +0000 +@@ -99,9 +99,17 @@ + int i; + + if (color == FILL_GREEN) ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++ rgba_col = 0x00ff00ff; ++#else + rgba_col = 0xff00ff00; /* GREEN */ ++#endif + else ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ ++ rgba_col = 0x0000ffff; ++#else + rgba_col = 0xffff0000; /* BLUE */ ++#endif + + for (i = 0; i < HEIGHT * WIDTH; i++) + rgba32[i] = rgba_col; diff --git a/user/gtk+3.0/APKBUILD b/user/gtk+3.0/APKBUILD index 877f9bed9..ea1c05d69 100644 --- a/user/gtk+3.0/APKBUILD +++ b/user/gtk+3.0/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=gtk+3.0 -pkgver=3.24.1 +pkgver=3.24.5 pkgrel=0 pkgdesc="The GTK+ Toolkit (v3)" url="https://www.gtk.org/" @@ -9,7 +9,7 @@ arch="all" options="!check" # Test suite is known to fail upstream license="LGPL-2.1+" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -depends="shared-mime-info gtk-update-icon-cache" +depends="adwaita-icon-theme shared-mime-info gtk-update-icon-cache" makedepends="at-spi2-atk-dev atk-dev cairo-dev cups-dev expat-dev fontconfig-dev gdk-pixbuf-dev glib-dev gnutls-dev gobject-introspection-dev libepoxy-dev libice-dev libx11-dev @@ -53,4 +53,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1 } -sha512sums="13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d gtk+-3.24.1.tar.xz" +sha512sums="344988c9e2a2d7fd2fd1e367a113be7c4a32c28c9cf395aeab923e25256b99856091d1583d3f8557aac6919a930a4d0af69b966486caab559c7d9d22585cc1a1 gtk+-3.24.5.tar.xz" diff --git a/user/gtk+3.0/releng-what-releng.patch b/user/gtk+3.0/releng-what-releng.patch new file mode 100644 index 000000000..5a1091de3 --- /dev/null +++ b/user/gtk+3.0/releng-what-releng.patch @@ -0,0 +1,12 @@ +diff -Nurd gtk+-3.24.2/docs/tools/shooter.c gtk+-3.24.2.new/docs/tools/shooter.c +--- gtk+-3.24.2/docs/tools/shooter.c 2018-12-12 11:46:09.000000000 -0600 ++++ gtk+-3.24.2.new/docs/tools/shooter.c 2019-01-10 20:55:41.402365069 -0600 +@@ -170,7 +170,7 @@ + y_orig = 0; + } + +- if (x_orig + width > gdk_screen_get_width (gdk_screen_get_dfeault ())) ++ if (x_orig + width > gdk_screen_get_width (gdk_screen_get_default ())) + width = gdk_screen_width () - x_orig; + + if (y_orig + height > gdk_screen_get_height (gdk_screen_get_default ())) diff --git a/user/gtkmm+3.0/APKBUILD b/user/gtkmm+3.0/APKBUILD new file mode 100644 index 000000000..f8a441882 --- /dev/null +++ b/user/gtkmm+3.0/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=gtkmm+3.0 +pkgver=3.24.0 +pkgrel=0 +pkgdesc="C++ interfaces for GTK+ 3" +url="https://gnome.org" +arch="all" +options="!check" # Tests require X +license="GPL-2.0+ AND LGPL-2.1+" +depends="" +makedepends="glibmm-dev pangomm-dev atkmm-dev gtk+3.0-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://download.gnome.org/sources/gtkmm/${pkgver%.*}/gtkmm-$pkgver.tar.xz" +builddir="$srcdir/gtkmm-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="94658fbf7eebbac2a864d6c7d3cd0e6ffd4ac213fd1d9986d721d4906c7a43a45d8757df475879ee37ef54ec5e3fac7d9a8e4a194b97b2be72a10743bf2e13ac gtkmm-3.24.0.tar.xz" diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD index 1b05bffec..0d0b4af59 100644 --- a/user/gvim/APKBUILD +++ b/user/gvim/APKBUILD @@ -5,7 +5,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=gvim _pkgreal=vim -pkgver=8.1.0606 +pkgver=8.1.0952 pkgrel=0 pkgdesc="advanced text editor" url="http://www.vim.org" @@ -74,4 +74,4 @@ package() { ln -s gvim rgvim } -sha512sums="df02717611d7b2f54f3b60ff9f73259a6ff3228b841d7d2d429fa0eedd98ce0a140a6a3839b50bd67ce5724d86f816042d6cbb0930fd040d30216f98f2d7e6ec vim-8.1.0606.tar.gz" +sha512sums="485d839901b3d1fc8efcc035991d5f34849f6d05d9c556dcf5b2918cd01e7f7b490cd0a7eb976c7577adb41962dceea4552474103f0b3c7807311d07f8158bd1 vim-8.1.0952.tar.gz" diff --git a/user/gwenview/APKBUILD b/user/gwenview/APKBUILD index e63c3a02d..0b9671823 100644 --- a/user/gwenview/APKBUILD +++ b/user/gwenview/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gwenview -pkgver=18.08.3 +pkgver=18.12.1 pkgrel=0 pkgdesc="Fast and easy image viewer by KDE" url="https://www.kde.org/applications/graphics/gwenview/" @@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev phonon-dev kio-dev kactivities-dev kitemmodels-dev ki18n-dev kdoctools-dev kparts-dev kwindowsystem-dev kiconthemes-dev knotifications-dev libkipi-dev libjpeg-turbo-dev libpng-dev lcms2-dev zlib-dev exiv2-dev - baloo-dev" + baloo-dev libkdcraw-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/gwenview-$pkgver.tar.xz" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0889b3388311b8c2b5a2ff98eea55dbae69ec6a27b5f27defc884077d937006d184c08a9daf31df0d9fb096b1a53fc70e844d46c4e3577d21e8f6ab83cca06ce gwenview-18.08.3.tar.xz" +sha512sums="609c670bc7ff8007fbc96d1fb4de9a0686e8e8c1171c396ae00b1c96fb531855a3881c57bcdf578e1c6c29670fda58ef6eaab407d60ad7f7f419e7c92d5a4d8d gwenview-18.12.1.tar.xz" diff --git a/user/gxmessage/APKBUILD b/user/gxmessage/APKBUILD new file mode 100644 index 000000000..70d3a9573 --- /dev/null +++ b/user/gxmessage/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=gxmessage +pkgver=3.4.3 +pkgrel=0 +pkgdesc="Display simple messages using GTK+" +url=" " +arch="all" +license="GPL-3.0+" +depends="" +makedepends="gtk+3.0-dev intltool" +subpackages="$pkgname-doc $pkgname-lang" +langdir="/usr/lib/locale" +source="https://downloads.sourceforge.net/gxmessage/gxmessage-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4e3c455595db723e2d78060c4913f1a87b8f0c5cb6017427d48cd02652655592bf8aa1001adfbfecd5598cc0c613c78a74d71a59a7f1f0787acc29774328e93a gxmessage-3.4.3.tar.gz" diff --git a/user/haveged/APKBUILD b/user/haveged/APKBUILD new file mode 100644 index 000000000..83dc7d866 --- /dev/null +++ b/user/haveged/APKBUILD @@ -0,0 +1,51 @@ +# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Danilo Godec <danilo.godec@agenda.si> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Maintainer: multiplexd <multi@in-addr.xyz> +pkgname=haveged +pkgver=1.9.4 +pkgrel=1 +pkgdesc="Entropy harvesting daemon using CPU timings" +url="http://www.issihosts.com/haveged/" +arch="all" +license="GPL-3.0+" +subpackages="$pkgname-doc $pkgname-openrc" +makedepends="linux-headers" +source="$pkgname-$pkgver.tar.gz::https://github.com/jirka-h/haveged/archive/$pkgver.tar.gz + fix-cpu-cache-size-detection.patch + haveged.initd + haveged.confd" + +build() { + cd "$builddir" + + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + + make DESTDIR="$pkgdir" install + + rm "$pkgdir"/usr/lib/libhavege.la + + install -Dm755 "$srcdir"/haveged.initd \ + "$pkgdir"/etc/init.d/haveged + install -Dm644 "$srcdir"/haveged.confd \ + "$pkgdir"/etc/conf.d/haveged +} + +sha512sums="20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d haveged-1.9.4.tar.gz +6279296b057f19daf25020ac14997268230af4b11510d6e5c4a86989c119d6b081d2501069af198772302d5cce1464514c749033a4928fb95671268825a84ba8 fix-cpu-cache-size-detection.patch +5d1e4186580951d4e6e01193e9c8827ceddaf3c2e28a981fc9176cb446bed32b059304796a77d9db6fb761a21f8fd27dd3d31e06a0fb7a5985b4ea94978fcd64 haveged.initd +58fa2c513e26291047b60ea6d6355ad837c1cb07750a2dfb2a5ebf90cc504a4b6ebf3573869410a06cac85d9b634b3df988e8b033921394da8a5abeee574c822 haveged.confd" diff --git a/user/haveged/fix-cpu-cache-size-detection.patch b/user/haveged/fix-cpu-cache-size-detection.patch new file mode 100644 index 000000000..07da2b46d --- /dev/null +++ b/user/haveged/fix-cpu-cache-size-detection.patch @@ -0,0 +1,15 @@ +Some ARM cpus does not report the cache size or say it is -1 + +diff --git a/src/havegetune.c b/src/havegetune.c +index f1a99f2..de39c53 100644 +--- a/src/havegetune.c ++++ b/src/havegetune.c +@@ -795,6 +795,8 @@ static int vfs_configInfoCache( + ctype = vfs_configFile(pAnchor, path, vfs_configType); + strcpy(path+plen, "size"); + size = vfs_configFile(pAnchor, path, vfs_configInt); ++ if (size == -1) ++ size = ctype == 'I' ? GENERIC_ICACHE : GENERIC_DCACHE; + cfg_cacheAdd(pAnchor, SRC_VFS_INDEX, pArgs[1], level, ctype, size); + } + } diff --git a/user/haveged/haveged.confd b/user/haveged/haveged.confd new file mode 100644 index 000000000..c4c1e0a3b --- /dev/null +++ b/user/haveged/haveged.confd @@ -0,0 +1,5 @@ +# Config file for /etc/init.d/haveged + +# Any extra options you want to pass to haveged +# on start-up should be put here. +HAVEGED_OPTS="-w 1024" diff --git a/user/haveged/haveged.initd b/user/haveged/haveged.initd new file mode 100644 index 000000000..86660e9c3 --- /dev/null +++ b/user/haveged/haveged.initd @@ -0,0 +1,11 @@ +#!/sbin/openrc-run + +command="/usr/sbin/haveged" +command_args="$HAVEGED_OPTS" +command_background="yes" + +pidfile="/run/$RC_SVCNAME.pid" + +depend() { + need net +} diff --git a/user/hermit/APKBUILD b/user/hermit/APKBUILD new file mode 100644 index 000000000..e2b1002d4 --- /dev/null +++ b/user/hermit/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +pkgname=hermit +pkgver=2.0 +pkgrel=0 +pkgdesc="A monospace font designed to be clear, pragmatic and very readable" +url="https://pcaro.es/p/hermit/" +arch="noarch" +options="!check" # No testing fonts +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://pcaro.es/d/otf-$pkgname-$pkgver.tar.gz" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf +} + +sha512sums="ee41f8cbcdedfff568cd47ab7730c462ddd67d6170c05d35eaf64a7f954a4bb72d6ac99a383749f7032d9cf7b407b7a5ef3270b4209692c1572beb9744a21d42 otf-hermit-2.0.tar.gz" diff --git a/user/heuristica-otf/APKBUILD b/user/heuristica-otf/APKBUILD new file mode 100644 index 000000000..728909071 --- /dev/null +++ b/user/heuristica-otf/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=heuristica-otf +pkgver=1.0.2 +pkgrel=0 +pkgdesc="Serif typeface" +url="https://sourceforge.net/projects/heuristica/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://downloads.sourceforge.net/heuristica/heuristica-otf-$pkgver.tar.xz" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf +} + +sha512sums="d3336c6fcfd5ab5bfb041230659c41ecbaa9e2d2f92d5c1c8c0dc8dff89a777ac87d8713467c94b065febde30c131cd05376573308f69d698d63e18eee433783 heuristica-otf-1.0.2.tar.xz" diff --git a/user/highlight/APKBUILD b/user/highlight/APKBUILD index 4e1f96eb5..715affc24 100644 --- a/user/highlight/APKBUILD +++ b/user/highlight/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=highlight -pkgver=3.48 +pkgver=3.49 pkgrel=0 pkgdesc="Fast and flexible source code highlighter" url="http://www.andre-simon.de/doku/highlight/highlight.html" @@ -22,4 +22,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b6508c3f0ed108126d07690b3ea878ac68814ae15ae3986096b2325f90d997bf467f2b3eeaa89da4feb2b8b39393a44e2ee0b89dc4584a7a7d4ca57475397451 highlight-3.48.tar.bz2" +sha512sums="81223c11b7b518b5b289622afadb0f2660898f74342b96f3e03f8bd3ac88d2f9b816efe0dffcc58323417d8a47b112053c16bd5f83475e6908ab228ee3cf81b0 highlight-3.49.tar.bz2" diff --git a/user/http-parser/APKBUILD b/user/http-parser/APKBUILD new file mode 100644 index 000000000..de3af464c --- /dev/null +++ b/user/http-parser/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=http-parser +pkgver=2.9.0 +pkgrel=0 +pkgdesc="Library for parsing HTTP messages in C" +url=" " +arch="all" +license="MIT" +depends="" +depends_dev="" +makedepends="$depends_dev" +subpackages="$pkgname-dev" +source="http-parser-$pkgver.tar.gz::https://github.com/nodejs/http-parser/archive/v$pkgver.tar.gz" + +build() { + cd "$builddir" + make +} + +check() { + cd "$builddir" + true # tested as part of build. +} + +package() { + cd "$builddir" + make PREFIX=/usr DESTDIR="$pkgdir" install +} + +sha512sums="40acecbf71b9f0b4ae857c74c3ec0784d7f341a0cb83cf82b308387d0c5b56d38b282241aaf8ca93816970f2a9e67989f3d9d456459f3986c29fe51ab520155e http-parser-2.9.0.tar.gz" diff --git a/user/humor-sans/APKBUILD b/user/humor-sans/APKBUILD new file mode 100644 index 000000000..af9ba8484 --- /dev/null +++ b/user/humor-sans/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=humor-sans +pkgver=1.0 +pkgrel=0 +pkgdesc="Sans-serif typeface influenced by Web comics" +url="http://antiyawn.com/uploads/humorsans.html" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="http://antiyawn.com/uploads/Humor-Sans-$pkgver.ttf" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ Humor-Sans-$pkgver.ttf +} + +sha512sums="f0ed2f61f5cedb93ff955d9d5562fd110db750b6d4d91a74346ff94c16c87cac294c061e6ded97ffea372970912f51ee0792a611a6224cd3a38585812971b3dd Humor-Sans-1.0.ttf" diff --git a/user/hunkyfonts/APKBUILD b/user/hunkyfonts/APKBUILD new file mode 100644 index 000000000..c8c2411a5 --- /dev/null +++ b/user/hunkyfonts/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=hunkyfonts +pkgver=0.3.1 +pkgrel=0 +pkgdesc="Typefaces based on Vera with support for more scripts" +url="https://sourceforge.net/projects/hunkyfonts/" +arch="noarch" +options="!check" # No test suite. +license="Bitstream AND Public-Domain" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://downloads.sourceforge.net/hunkyfonts/hunkyfonts-$pkgver.tar.bz2" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ TTF/*.ttf +} + +sha512sums="0e9a5cff20c467ae441c442f269d3b8a9ea5d2534cbabcf08f65a594121840727003bdb038981e983430602306147e5dca146503b310a742d3c6e44d36ae7375 hunkyfonts-0.3.1.tar.bz2" diff --git a/user/hyphen/APKBUILD b/user/hyphen/APKBUILD index eb37c9a1b..a4d891e72 100644 --- a/user/hyphen/APKBUILD +++ b/user/hyphen/APKBUILD @@ -4,7 +4,7 @@ pkgname=hyphen pkgver=2.8.8 pkgrel=1 pkgdesc="Library for high quality word hyphenation and justification" -url="https://hunspell.sourceforge.net/" +url="https://hunspell.github.io/" arch="all" license="LGPL-2.1+ OR LGPL-2.0+ OR MPL-1.0 or GPL-2.0+" subpackages="$pkgname-dev" diff --git a/user/i3status/APKBUILD b/user/i3status/APKBUILD new file mode 100644 index 000000000..554916af7 --- /dev/null +++ b/user/i3status/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +pkgname=i3status +pkgver=2.12 +pkgrel=0 +pkgdesc="Status bar generator for dzen2, xmobar or similar" +url="https://i3wm.org/i3status/" +arch="all" +options="!check" # No test suite +license="MIT" +depends="" +makedepends="alsa-lib-dev confuse-dev libnl3-dev pkgconf pulseaudio-dev yajl-dev" +subpackages="$pkgname-doc" +source="$url/$pkgname-$pkgver.tar.bz2 + glob_tilde.patch" + +prepare() { + cd "$builddir" + default_prepare + # TODO: The setcap part can be dropped after the 2.13 release + sed -i -e '/^CFLAGS+=-g$/d' -e '/setcap/d' Makefile +} + +build() { + cd "$builddir" + make i3status +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="687a880a65cb8df46f5e9d2256b59724ba3424c502e9a0fb3ca71b070875df5f4008ee501c554bc716f2d728a5cf813a36d22d7377d42c3c46b14381d385bab3 i3status-2.12.tar.bz2 +2a0a85dba02b9e9962f13d4bc151fd1672f215292800d9eeff5a10bd363b74f422d3b320851f31b73062ceeded974f5b105aec914c84f78ba418312bed189aa4 glob_tilde.patch" diff --git a/user/i3status/glob_tilde.patch b/user/i3status/glob_tilde.patch new file mode 100644 index 000000000..b1f2ba667 --- /dev/null +++ b/user/i3status/glob_tilde.patch @@ -0,0 +1,59 @@ +diff --git i/i3status.c w/i3status.c +index 5088c96..3c18214 100644 +--- i/i3status.c ++++ w/i3status.c +@@ -210,29 +210,19 @@ static int valid_color(const char *value) { + * + */ + static char *resolve_tilde(const char *path) { +- static glob_t globbuf; +- char *head, *tail, *result = NULL; +- +- tail = strchr(path, '/'); +- head = strndup(path, tail ? (size_t)(tail - path) : strlen(path)); +- +- int res = glob(head, GLOB_TILDE, NULL, &globbuf); +- free(head); +- /* no match, or many wildcard matches are bad */ +- if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1) +- result = sstrdup(path); +- else if (res != 0) { +- die("glob() failed"); +- } else { +- head = globbuf.gl_pathv[0]; +- result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1); +- strncpy(result, head, strlen(head)); +- if (tail) +- strncat(result, tail, strlen(tail)); ++ char *home, *result = NULL; ++ ++ if (strncmp(path, "~/", 2) == 0) { ++ home = getenv("HOME"); ++ if (home != NULL) { ++ result = scalloc(strlen(home) + strlen(path)); ++ strcpy(result, home); ++ strcat(result, path+1); ++ return result; ++ } + } +- globfree(&globbuf); + +- return result; ++ return sstrdup(path); + } + + static char *get_config_path(void) { +diff --git i/include/i3status.h w/include/i3status.h +index 9ac471d..27ecae4 100644 +--- i/include/i3status.h ++++ w/include/i3status.h +@@ -236,4 +236,9 @@ extern cfg_t *cfg, *cfg_general, *cfg_section; + extern void **cur_instance; + + extern pthread_t main_thread; ++ ++#ifndef GLOB_TILDE ++#define GLOB_TILDE 0 ++#endif ++ + #endif diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD index 197cbd45f..59c94e802 100644 --- a/user/i3wm/APKBUILD +++ b/user/i3wm/APKBUILD @@ -5,7 +5,7 @@ pkgname=i3wm pkgver=4.15 pkgrel=0 pkgdesc="Improved dynamic tiling window manager" -url="http://i3wm.org" +url="https://i3wm.org" arch="all" license="BSD-3-Clause" options="!check" # The test suite requires X @@ -15,7 +15,7 @@ makedepends="bison flex libxcb-dev xcb-util-cursor-dev xcb-util-keysyms-dev checkdepends="perl-x11-xcb perl-anyevent perl-json-xs perl-ipc-run perl-inline-c perl-dev libxcb-dev xcb-util-dev xorg-server-xephyr" subpackages="$pkgname-doc" -source="http://i3wm.org/downloads/i3-$pkgver.tar.bz2 +source="https://i3wm.org/downloads/i3-$pkgver.tar.bz2 i3wm-musl-glob-tilde.patch i3wm-test-fix-off_t.patch i3wm-test-disable-branch-check.patch" diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD index 7f3d91d5d..c74eaf649 100644 --- a/user/icewm/APKBUILD +++ b/user/icewm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=icewm -pkgver=1.4.2 +pkgver=1.5.2 pkgrel=0 pkgdesc="A window manager designed for speed, usability, and consistency" url="https://github.com/bbidulock/icewm" @@ -10,14 +10,11 @@ options="!check" # no tests license="LGPL-2.0-only AND MirOS" depends="" makedepends="libxft-dev libxinerama-dev libxpm-dev libjpeg-turbo-dev - libxrandr-dev glib-dev fribidi-dev gdk-pixbuf-dev $depends_dev" + libxrandr-dev glib-dev fribidi-dev gdk-pixbuf-dev librsvg-dev + alsa-lib-dev libsndfile-dev libao-dev asciidoctor $depends_dev" install="" subpackages="$pkgname-doc $pkgname-lang" -source="https://github.com/bbidulock/icewm/releases/download/$pkgver/icewm-$pkgver.tar.bz2 - guard-string-funcs.patch - portable-ylocale.patch - fix-globit.patch - " +source="https://github.com/ice-wm/icewm/releases/download/$pkgver/icewm-$pkgver.tar.xz" prepare() { default_prepare @@ -47,7 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0d227d75d2e3e6e5314eb0990375b85a34496e61e8b504ee023decb52b0c3a20bfd65c0d491b738d3742ddf3f21acfabfc8e4d43df51d137f568580b6c5ed0cd icewm-1.4.2.tar.bz2 -07bbaff552d26828089d6c0aaa4a70d321c2e1b21a70545232c31b464281a857c267ba93b23d8267c4cc7e599067be6508554d2b9aea3aa2b18372c9bb7b4dfe guard-string-funcs.patch -d7389a2ee6627612280991765c9c4a3c3d8305624b28bef0aa9b7d8316fc4708bd8e32dc5777fb3abed61cec8546e905257fe1cdb6ad7e3da2c169e747199173 portable-ylocale.patch -1cadda6a5ac03ebe7671e173af4bff43be9ba4680d015edf4222fd739b6d11c1d6b1ca058f6cf5c350d5bf7d587298a23e178b660d121c517e8bc551f3fec5aa fix-globit.patch" +sha512sums="f2a542d162e984dcc6f7b8e3fc2dbd7df46510f961431b4c3b6651351f7b236ef4724a07ce01dfa163b08c9a130e7ee3ed62e1c5b1f364340998d31290323614 icewm-1.5.2.tar.xz" diff --git a/user/icewm/fix-globit.patch b/user/icewm/fix-globit.patch deleted file mode 100644 index be04bd219..000000000 --- a/user/icewm/fix-globit.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3817103bae789b2bff7cf8c1bbe2255b60878ab3 Mon Sep 17 00:00:00 2001 -From: Bert Gijsbers <gijsbers@science.uva.nl> -Date: Sun, 3 Jun 2018 09:34:12 +0200 -Subject: [PATCH] portability - ---- - src/globit.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/globit.c b/src/globit.c -index 9bc8dc76..726c8bd8 100644 ---- a/src/globit.c -+++ b/src/globit.c -@@ -143,7 +143,9 @@ globit_best(const char *pattern_, char **result) - } else if (*pattern == '~') { - /* yes, tilde */ - is_absolute = 2; -+#ifdef GLOB_TILDE - glob_flags |= GLOB_TILDE; -+#endif - /* any slash in the pattern? */ - while (*cp && *cp != '/') - ++cp; diff --git a/user/icewm/guard-string-funcs.patch b/user/icewm/guard-string-funcs.patch deleted file mode 100644 index dfb412b9c..000000000 --- a/user/icewm/guard-string-funcs.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 57b8f15fbd67709055c245222b0c20cd27d3c3a1 Mon Sep 17 00:00:00 2001 -From: Bert Gijsbers <gijsbers@science.uva.nl> -Date: Mon, 31 Jul 2017 21:30:20 +0200 -Subject: [PATCH] Changes for ALTLinux which has its own prototypes for - strlcpy/strlcat. Also cleanup obsolete AC_FUNC_*s and sort -u the - CHECK_FUNCs. Add two AC_RUN_IFELSE to detect correct operations of - strlcpy/strcat. Define HAVE_STRLCPY / HAVE_STRLCAT if they do. Don't include - our own strlcpy/strlcat if these are defined. - ---- - configure.ac | 49 ++++++++++++++++++++++++++++++++++++++++--------- - src/CMakeLists.txt | 19 +++++++------------ - src/base.h | 5 +++++ - src/misc.cc | 4 ++++ - 4 files changed, 56 insertions(+), 21 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fe9176ea..e00cb147 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -110,21 +110,52 @@ AC_CHECK_SIZEOF(long, 4) - AC_TYPE_SIGNAL - - # Checks for library functions. --AC_FUNC_STRFTIME --AC_FUNC_VPRINTF --AC_FUNC_ERROR_AT_LINE - if test x$cross_compling != xyes ; then :; AC_FUNC_FORK fi --AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK - if test x$cross_compling != xyes ; then :; AC_FUNC_MALLOC fi --AC_FUNC_MMAP - if test x$cross_compling != xyes ; then :; AC_FUNC_REALLOC fi --AC_FUNC_STRNLEN --AC_CHECK_FUNCS([dup2 getcwd gethostbyname gethostname gettimeofday mblen memchr memmove memset mkdir nl_langinfo putenv select setlocale socket strcasecmp strchr strcspn strdup strerror strncasecmp strrchr strspn strstr strtol sysinfo uname abort wordexp]) --AC_CHECK_FUNCS([gettimeofday putenv select socket strtol strtoul basename]) --AC_CHECK_FUNCS([sysctlbyname asprintf]) -+AC_CHECK_FUNCS([abort basename dup2]) -+AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday]) -+AC_CHECK_FUNCS([mblen memchr memmove memset mkdir nl_langinfo]) -+AC_CHECK_FUNCS([select setlocale socket]) -+AC_CHECK_FUNCS([strcasecmp strchr strcspn strdup strerror]) -+AC_CHECK_FUNCS([strncasecmp strrchr strspn strstr strtol strtoul]) -+AC_CHECK_FUNCS([sysctlbyname sysinfo uname wordexp]) - AC_CHECK_FUNC([getloadavg],[AC_DEFINE([HAVE_GETLOADAVG2], 1, [getloadavg() is available])]) - AC_FUNC_SELECT_ARGTYPES - -+AC_MSG_CHECKING([for strlcpy]) -+AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ -+ char a[2]; -+ if (strlcpy(a, "yes", 2) != 3) -+ return 1;]])], -+ [ -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE_UNQUOTED([HAVE_STRLCPY], 1, -+ [Define to 1 if you have the strlcpy function.]) -+ ], -+ [ -+ AC_MSG_RESULT([no]) -+ AC_DEFINE_UNQUOTED([HAVE_STRLCPY], 0, -+ [Define to 1 if you have the strlcpy function.]) -+ ]) -+ -+AC_MSG_CHECKING([for strlcat]) -+AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ -+ char a[4] = "no"; -+ if (strlcat(a, "yes", 4) != 5) -+ return 1;]])], -+ [ -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE_UNQUOTED([HAVE_STRLCAT], 1, -+ [Define to 1 if you have the strlcat function.]) -+ ], -+ [ -+ AC_MSG_RESULT([no]) -+ AC_DEFINE_UNQUOTED([HAVE_STRLCAT], 0, -+ [Define to 1 if you have the strlcat function.]) -+ ]) -+ -+ - PKG_CHECK_MODULES([CORE],[fontconfig xext x11]) - AC_SUBST([CORE_CFLAGS]) - AC_SUBST([CORE_LIBS]) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index da476a0b..6f694c18 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -59,10 +59,12 @@ endif() - # for x in `cat funclist` ; do grep $x src/* lib/* && echo $x >> exlist ; done - # perl -e 'print "CHECK_FUNCTION_EXISTS($_ HAVE_".uc($_).")\n" for @ARGV' `cat exlist` - # perl -e 'print "#cmakedefine HAVE_".uc($_)."\n" for @ARGV' `cat exlist` -+CHECK_FUNCTION_EXISTS(abort HAVE_ABORT) -+CHECK_FUNCTION_EXISTS(basename HAVE_BASENAME) - CHECK_FUNCTION_EXISTS(dup2 HAVE_DUP2) --CHECK_FUNCTION_EXISTS(getcwd HAVE_GETCWD) - CHECK_FUNCTION_EXISTS(gethostbyname HAVE_GETHOSTBYNAME) - CHECK_FUNCTION_EXISTS(gethostname HAVE_GETHOSTNAME) -+CHECK_FUNCTION_EXISTS(getloadavg HAVE_GETLOADAVG) - CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) - CHECK_FUNCTION_EXISTS(mblen HAVE_MBLEN) - CHECK_FUNCTION_EXISTS(memchr HAVE_MEMCHR) -@@ -70,7 +72,6 @@ CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) - CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET) - CHECK_FUNCTION_EXISTS(mkdir HAVE_MKDIR) - CHECK_FUNCTION_EXISTS(nl_langinfo HAVE_NL_LANGINFO) --CHECK_FUNCTION_EXISTS(putenv HAVE_PUTENV) - CHECK_FUNCTION_EXISTS(select HAVE_SELECT) - CHECK_FUNCTION_EXISTS(setlocale HAVE_SETLOCALE) - CHECK_FUNCTION_EXISTS(socket HAVE_SOCKET) -@@ -79,23 +80,17 @@ CHECK_FUNCTION_EXISTS(strchr HAVE_STRCHR) - CHECK_FUNCTION_EXISTS(strcspn HAVE_STRCSPN) - CHECK_FUNCTION_EXISTS(strdup HAVE_STRDUP) - CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR) -+CHECK_FUNCTION_EXISTS(strlcpy HAVE_STRLCPY) -+CHECK_FUNCTION_EXISTS(strlcat HAVE_STRLCAT) - CHECK_FUNCTION_EXISTS(strncasecmp HAVE_STRNCASECMP) - CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR) - CHECK_FUNCTION_EXISTS(strspn HAVE_STRSPN) - CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR) - CHECK_FUNCTION_EXISTS(strtol HAVE_STRTOL) -+CHECK_FUNCTION_EXISTS(strtoul HAVE_STRTOL) -+CHECK_FUNCTION_EXISTS(sysctlbyname HAVE_SYSCTLBYNAME) - CHECK_FUNCTION_EXISTS(sysinfo HAVE_SYSINFO) - CHECK_FUNCTION_EXISTS(uname HAVE_UNAME) --CHECK_FUNCTION_EXISTS(abort HAVE_ABORT) --CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) --CHECK_FUNCTION_EXISTS(putenv HAVE_PUTENV) --CHECK_FUNCTION_EXISTS(select HAVE_SELECT) --CHECK_FUNCTION_EXISTS(socket HAVE_SOCKET) --CHECK_FUNCTION_EXISTS(strtol HAVE_STRTOL) --CHECK_FUNCTION_EXISTS(basename HAVE_BASENAME) --CHECK_FUNCTION_EXISTS(sysctlbyname HAVE_SYSCTLBYNAME) --CHECK_FUNCTION_EXISTS(getloadavg HAVE_GETLOADAVG) --CHECK_FUNCTION_EXISTS(asprintf HAVE_ASPRINTF) - CHECK_FUNCTION_EXISTS(wordexp HAVE_WORDEXP) - - CHECK_LIBRARY_EXISTS (X11 XInternAtoms "" HAVE_XINTERNATOMS) -diff --git a/src/base.h b/src/base.h -index 0df34ccb..2083ca6f 100644 ---- a/src/base.h -+++ b/src/base.h -@@ -49,9 +49,14 @@ inline T abs(T v) { - /*** String Functions *********************************************************/ - - /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ -+#ifndef HAVE_STRLCPY - size_t strlcpy(char *dest, const char *from, size_t dest_size); -+#endif -+ - /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ -+#ifndef HAVE_STRLCAT - size_t strlcat(char *dest, const char *from, size_t dest_size); -+#endif - - char *newstr(char const *str); - char *newstr(char const *str, int len); -diff --git a/src/misc.cc b/src/misc.cc -index b0ac1c95..97638495 100644 ---- a/src/misc.cc -+++ b/src/misc.cc -@@ -448,6 +448,7 @@ void operator delete[](void *p) { - #endif - - /* Prefer this as a safer alternative over strcpy. Return strlen(from). */ -+#ifndef HAVE_STRLCPY - size_t strlcpy(char *dest, const char *from, size_t dest_size) - { - const char *in = from; -@@ -461,8 +462,10 @@ size_t strlcpy(char *dest, const char *from, size_t dest_size) - while (*in) ++in; - return in - from; - } -+#endif - - /* Prefer this over strcat. Return strlen(dest) + strlen(from). */ -+#ifndef HAVE_STRLCAT - size_t strlcat(char *dest, const char *from, size_t dest_size) - { - char *to = dest; -@@ -470,6 +473,7 @@ size_t strlcat(char *dest, const char *from, size_t dest_size) - while (to < stop && *to) ++to; - return to - dest + strlcpy(to, from, dest_size - (to - dest)); - } -+#endif - - char *newstr(char const *str) { - return (str != NULL ? newstr(str, strlen(str)) : NULL); --- -2.15.0 - diff --git a/user/icewm/portable-ylocale.patch b/user/icewm/portable-ylocale.patch deleted file mode 100644 index b9a2b243c..000000000 --- a/user/icewm/portable-ylocale.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nurd icewm-1.4.2/src/ylocale.cc icewm-1.4.2.new/src/ylocale.cc ---- icewm-1.4.2/src/ylocale.cc 2017-07-30 03:53:35.524267864 -0500 -+++ icewm-1.4.2.new/src/ylocale.cc 2018-06-27 08:29:55.967038048 -0500 -@@ -56,7 +56,11 @@ - #ifdef CONFIG_NL_CODESETS - CONFIG_NL_CODESETS - #else -- CODESET, _NL_CTYPE_CODESET_NAME, 0 -+ CODESET, -+#ifdef _NL_CTYPE_CODESET_NAME -+ _NL_CTYPE_CODESET_NAME, -+#endif -+ 0 - #endif - }; - diff --git a/user/ico/APKBUILD b/user/ico/APKBUILD new file mode 100644 index 000000000..8f6c2d7dd --- /dev/null +++ b/user/ico/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ico +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Example animation for testing X.Org" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/ico-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="93a94a66d4a41b39d4b3657050e58f8269d352dae5d5916c9ecdda1cb14f23b9d159d67c50fdfa654b4b1c2ad11434bed140ace70703c82b05d3fe8686aab8f6 ico-1.0.5.tar.bz2" diff --git a/user/icon-naming-utils/APKBUILD b/user/icon-naming-utils/APKBUILD new file mode 100644 index 000000000..e878b858c --- /dev/null +++ b/user/icon-naming-utils/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=icon-naming-utils +pkgver=0.8.90 +pkgrel=0 +pkgdesc="Script for migrating to the Icon Naming Specification" +url="http://tango.freedesktop.org/Tango_Icon_Library" +arch="noarch" +license="GPL-2.0-only" +depends="perl perl-xml-simple" +makedepends="" +subpackages="$pkgname-dev" +source="http://tango.freedesktop.org/releases/icon-naming-utils-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make pkgconfigdir="/usr/lib/pkgconfig" DESTDIR="$pkgdir" install +} + +sha512sums="6c23f6138e053f9fc6de9d56f94b80849f29f9fde46cdf54b705720cb48b0c660f315484fb36fb9936d4ceade7768aad2d17280545a4b392aa56185c9452999d icon-naming-utils-0.8.90.tar.gz" diff --git a/user/ido/APKBUILD b/user/ido/APKBUILD index a2714b183..9f858605e 100644 --- a/user/ido/APKBUILD +++ b/user/ido/APKBUILD @@ -4,7 +4,7 @@ pkgname=ido pkgver=12.10.2 pkgrel=0 pkgdesc="Library for indicator display objects" -url="https://launchpad.net/libido" +url="https://launchpad.net/ido" arch="all" options="!check" # broken testsuite license="(LGPL-2.1-only OR LGPL-3.0-only) AND GPL-3.0-only AND LGPL-2.0+" diff --git a/user/imagemagick/APKBUILD b/user/imagemagick/APKBUILD index 9f8cdbae9..0c6d244e6 100644 --- a/user/imagemagick/APKBUILD +++ b/user/imagemagick/APKBUILD @@ -2,18 +2,18 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: pkgname=imagemagick -pkgver=7.0.8.17 +pkgver=7.0.8.28 _abiver=7 _pkgver=${pkgver%.*}-${pkgver##*.} pkgrel=0 pkgdesc="A collection of tools and libraries for many image formats" url="http://www.imagemagick.org/" arch="all" -license="Apache-2.0" options="libtool !check" # needs actual helvetica font +license="Apache-2.0" makedepends="zlib-dev libpng-dev libjpeg-turbo-dev freetype-dev fontconfig-dev perl-dev libwebp-dev libtool tiff-dev lcms2-dev fftw-dev libwebp-dev - libxml2-dev librsvg-dev" + libxml2-dev librsvg-dev libraw-dev" checkdepends="freetype fontconfig lcms2 graphviz" subpackages="$pkgname-doc $pkgname-dev $pkgname-c++:_cxx $pkgname-libs" source="http://www.imagemagick.org/download/releases/ImageMagick-$_pkgver.tar.xz" @@ -81,4 +81,4 @@ _cxx() { mv "$pkgdir"/usr/lib/libMagick++*.so.* "$subpkgdir"/usr/lib/ } -sha512sums="b55408059f85b6fcecae40ccb0a924d73936f6877454cd5ed03e9e0b338ddc9954e0b4c089a2c7545d444deaba24fe90c69a3bb218a6d6165ebe782f6e9413e1 ImageMagick-7.0.8-17.tar.xz" +sha512sums="4014beb2f743e46d725b3f22985f87f42adffbe23152fb19bc0d55647260e4a15f560c2ba68c7db5ce9c931665220ba5ccd01abce8d38a5d57724f35de8904cd ImageMagick-7.0.8-28.tar.xz" diff --git a/user/imake/APKBUILD b/user/imake/APKBUILD index ba5585c32..b2eb2284b 100644 --- a/user/imake/APKBUILD +++ b/user/imake/APKBUILD @@ -4,7 +4,7 @@ pkgname=imake pkgver=1.0.7 pkgrel=0 pkgdesc="X Windows make utility" -url="http://www.x.org" +url="https://www.x.org" arch="all" license="X11" options="!check" # No testsuite diff --git a/user/inconsolata-lgc/APKBUILD b/user/inconsolata-lgc/APKBUILD new file mode 100644 index 000000000..f8d3de1a6 --- /dev/null +++ b/user/inconsolata-lgc/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=inconsolata-lgc +pkgver=1.3.0 +pkgrel=0 +pkgdesc="Monospace typeface designed for programming" +url=" " +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://github.com/MihailJP/Inconsolata-LGC/releases/download/LGC-$pkgver/InconsolataLGC-OT-$pkgver.tar.xz" +builddir="$srcdir/InconsolataLGC-OT" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF *.otf +} + +sha512sums="3e985618b0c067d981620a461655d176a41bbef3d225d7d609b8dc9d5c04361b1df322eefab58f9620cfdff323e2bd7127c7e4f5f21f291b173a769cefa93ece InconsolataLGC-OT-1.3.0.tar.xz" diff --git a/user/intlfonts/APKBUILD b/user/intlfonts/APKBUILD new file mode 100644 index 000000000..8459dd241 --- /dev/null +++ b/user/intlfonts/APKBUILD @@ -0,0 +1,61 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=intlfonts +pkgver=1.2.1 +pkgrel=0 +pkgdesc="GNU typefaces for a wide variety of scripts" +url="https://directory.fsf.org/wiki/Intlfonts" +arch="noarch" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="fontconfig mkfontdir mkfontscale" +makedepends="bdftopcf" +subpackages="" +source="https://ftp.gnu.org/gnu/intlfonts/intlfonts-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-compress \ + --with-bdf=no \ + --with-fontdir="$pkgdir"/usr/share/fonts/X11/misc \ + --with-truetype=yes + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + mv "$pkgdir"/usr/share/fonts/X11/misc/TrueType \ + "$pkgdir"/usr/share/fonts/X11/TTF + rm "$pkgdir"/usr/share/fonts/X11/misc/fonts.{alias,dir} + + # font-daewoo-misc + rm "$pkgdir"/usr/share/fonts/X11/misc/hanglg16.pcf.gz + rm "$pkgdir"/usr/share/fonts/X11/misc/hanglm16.pcf.gz + rm "$pkgdir"/usr/share/fonts/X11/misc/hanglm24.pcf.gz + + # font-isas-misc + rm "$pkgdir"/usr/share/fonts/X11/misc/gb16fs.pcf.gz + rm "$pkgdir"/usr/share/fonts/X11/misc/gb16st.pcf.gz + rm "$pkgdir"/usr/share/fonts/X11/misc/gb24st.pcf.gz + + # font-jis-misc + rm "$pkgdir"/usr/share/fonts/X11/misc/jiskan16.pcf.gz + rm "$pkgdir"/usr/share/fonts/X11/misc/jiskan24.pcf.gz + + # font-misc-misc + rm "$pkgdir"/usr/share/fonts/X11/misc/k14.pcf.gz + + # font-sony-misc + rm "$pkgdir"/usr/share/fonts/X11/misc/8x16rk.pcf.gz + rm "$pkgdir"/usr/share/fonts/X11/misc/12x24rk.pcf.gz +} + +sha512sums="c11508335cf0f819e7907a6b16c305fbfbf1182dbdea939773482bda3c0f27d70ba427ca3d22c62f4190c24f35bb2bcde4e4fa185aff7f4964293263f7b4304e intlfonts-1.2.1.tar.gz" diff --git a/user/ipaexfont/APKBUILD b/user/ipaexfont/APKBUILD new file mode 100644 index 000000000..3a73df06f --- /dev/null +++ b/user/ipaexfont/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ipaexfont +pkgver=003.01 +pkgrel=0 +pkgdesc="Standard Japanese typefaces" +url="https://ipafont.ipa.go.jp/" +arch="noarch" +options="!check" # No test suite. +license="IPA" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://oscdl.ipa.go.jp/IPAexfont/IPAexfont${pkgver/./}.zip" +builddir="$srcdir/IPAexfont${pkgver/./}" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="92df9f6a1002ea68cfd88f2b1fe4a5a5d6dfdb0ac4be7f4c0815200ce1962d3db7330ec17e7380efe4ba0735a55e0f5160b0cd6c1553a79fc8a860c434958388 IPAexfont00301.zip" diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD index 87f8ac126..92effce1b 100644 --- a/user/irssi/APKBUILD +++ b/user/irssi/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=irssi -pkgver=1.1.1 -pkgrel=1 +pkgver=1.2.0 +pkgrel=0 pkgdesc="Text-based IRC client" url="https://irssi.org" arch="all" license="GPL-2.0+ AND ISC" makedepends="ncurses-dev glib-dev openssl-dev perl-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-perl" -source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz" -sha512sums="b2fc0805d6213c31bc34c48237baf2e33ac509c0fa09c483fd39f1473e32eee227ff4532efc60fb495c2ec263c05290578bca7ad6d39149e0594f864da5986c0 irssi-1.1.1.tar.xz" +source="https://github.com/irssi/irssi/releases/download/$pkgver/irssi-$pkgver.tar.xz + fix-ridiculous-egregious-conformance-error.patch + " build() { cd "$builddir" @@ -45,3 +46,5 @@ perl() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr mv "$pkgdir"/usr/share/irssi/scripts "$subpkgdir"/usr/share/irssi } +sha512sums="343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40 irssi-1.2.0.tar.xz +88c9fe5593a81b92943d1ca419b39d074f9c52378350007c0896aa95ef056e098201b338d31da31b5ec1492e1577d2862b989e00427dc89edde0bcef46cd8e2a fix-ridiculous-egregious-conformance-error.patch" diff --git a/user/irssi/fix-ridiculous-egregious-conformance-error.patch b/user/irssi/fix-ridiculous-egregious-conformance-error.patch new file mode 100644 index 000000000..ceb707c9b --- /dev/null +++ b/user/irssi/fix-ridiculous-egregious-conformance-error.patch @@ -0,0 +1,19 @@ +--- irssi-1.2.0/tests/fe-text/test-paste-join-multiline.c.old 2019-02-11 17:27:58.000000000 +0000 ++++ irssi-1.2.0/tests/fe-text/test-paste-join-multiline.c 2019-02-19 21:28:03.250000000 +0000 +@@ -48,13 +48,15 @@ + static void test_paste_join_multiline(const paste_join_multiline_test_case *test) + { + char *resultstr, *t1; ++ glong length; + GArray *buffer = g_array_new(FALSE, FALSE, sizeof(unichar)); + + g_test_message("Testing: %s", test->description); + g_test_message("INPUT: \"%s\"", (t1 = g_strescape(test->input, NULL))); + g_free(t1); + +- buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, (glong *) &buffer->len); ++ buffer->data = (char *) g_utf8_to_ucs4_fast(test->input, -1, &length); ++ buffer->len = length; + paste_buffer_join_lines(buffer); + resultstr = g_ucs4_to_utf8((unichar *) buffer->data, buffer->len, NULL, NULL, NULL); + diff --git a/user/jomolhari/APKBUILD b/user/jomolhari/APKBUILD new file mode 100644 index 000000000..566e5db55 --- /dev/null +++ b/user/jomolhari/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=jomolhari +pkgver=0.003 +pkgrel=0 +pkgdesc="Open Tibetan/Bhutanese typeface" +url="https://collab.its.virginia.edu/wiki/tibetan-script/Jomolhari.html" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://collab.its.virginia.edu/access/content/group/26a34146-33a6-48ce-001e-f16ce7908a6a/Tibetan%20fonts/Tibetan%20Unicode%20Fonts/Jomolhari-alpha003.zip" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="d3dd179c84c5cfb5cdc4a82ea1356b594973ef056cbc8fa4e23e37f21573b138eded19ef7370803dbe796e80a0d2c72a0866eb9f36e4b511627c770a00e08270 Jomolhari-alpha003.zip" diff --git a/user/jpegoptim/APKBUILD b/user/jpegoptim/APKBUILD new file mode 100644 index 000000000..d86c9c7f8 --- /dev/null +++ b/user/jpegoptim/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=jpegoptim +pkgver=1.4.6 +pkgrel=0 +pkgdesc="Utility to optimise JPEG files" +url="https://www.kokkonen.net/tjko/projects.html" +arch="all" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="" +makedepends="libjpeg-turbo-dev" +subpackages="$pkgname-doc" +source="https://www.kokkonen.net/tjko/src/jpegoptim-$pkgver.tar.gz" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="1ebd4986cbfeae19c1e01521862c15de25e078ccb6483c29f0d89b9c8e308c93d8dca7a200a57dd5da793e481ca5dc9c4f0d84b252f5b9408b4e719c35d7e90f jpegoptim-1.4.6.tar.gz" diff --git a/user/juk/APKBUILD b/user/juk/APKBUILD index 39070f39e..308c15db3 100644 --- a/user/juk/APKBUILD +++ b/user/juk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=juk -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="KDE Jukebox" url="https://juk.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f0a13f24cdbf075ded5b92848b7239cb5fc53d5d51efc6fc0f2ad9ffc92b0517bb44ee16b5cdb356e92ac8ac8834da8f05ec126244c19681b6d9b4427fecda66 juk-18.08.3.tar.xz" +sha512sums="11f2d21e2b7353c43e5219038f5278ebd09017e890e1cb1593eca961ee28157e72ed5ac50db552910ee2c426094d0700f844a894e0e5f0dd4e4bbb8835fbc124 juk-18.12.2.tar.xz" diff --git a/user/kacst_fonts/APKBUILD b/user/kacst_fonts/APKBUILD new file mode 100644 index 000000000..c933369c9 --- /dev/null +++ b/user/kacst_fonts/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kacst_fonts +pkgver=2.0 +pkgrel=0 +pkgdesc="Arabic typefaces" +url="https://www.arabeyes.org/Khotot" +arch="noarch" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://downloads.sourceforge.net/arabeyes/${pkgname}_$pkgver.tar.bz2" +builddir="$srcdir"/KacstArabicFonts-$pkgver + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="9db8181a4b9db18f648628c10c4c1228aa38186f7ea414887e66fa430ce441b0d0130dd81955ae664558edd46653a290e053b8b126ce4ff7b6e9e1a7169ba4a8 kacst_fonts_2.0.tar.bz2" diff --git a/user/kactivities-stats/APKBUILD b/user/kactivities-stats/APKBUILD index 81c63cafa..1a286e967 100644 --- a/user/kactivities-stats/APKBUILD +++ b/user/kactivities-stats/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities-stats -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Gather statistics about KDE activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2f63dda4d80edf39643b8406fbbd76e220fe1db6a6acc061d43dfb19d1886b0dfd962d685daa331794f42b3b8d7ae4fcaf6e463e39f58258ef20aae8c41d3bb2 kactivities-stats-5.52.0.tar.xz" +sha512sums="142a8e92bef7069eae70187e1c04a29f65ab4bc12b7e146d21e8da3c4818941af59844e702e9682d8bcd64d6e76b30f012db2cdd1476962b59e0b27c1114c311 kactivities-stats-5.54.0.tar.xz" diff --git a/user/kactivities/APKBUILD b/user/kactivities/APKBUILD index 4b4817470..6a35fd7e4 100644 --- a/user/kactivities/APKBUILD +++ b/user/kactivities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kactivities -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Runtime and library to organize work into separate activities" url="https://api.kde.org/frameworks/kactivities/html/index.html" @@ -48,4 +48,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="73629cb3504d4c75b66dbe2345f5ef1b436a7f8bd1962eb87ef7c1c4838cf1d6fa7bc52d00b381823a5581c9d6072535aa7deb8f710f52fc322e55b2d7f366f0 kactivities-5.52.0.tar.xz" +sha512sums="d397c087f740e044a14f02bca47da2c267b4c9d9ab8231e240addf41eec6d716fc6d2a85bc3760636a69be55a058ba8d380c4555aa16ba43fff7fd2dfcb20a64 kactivities-5.54.0.tar.xz" diff --git a/user/kalgebra/APKBUILD b/user/kalgebra/APKBUILD index 722bcc626..9fb3dfb5f 100644 --- a/user/kalgebra/APKBUILD +++ b/user/kalgebra/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalgebra -pkgver=18.08.3 -pkgrel=1 +pkgver=18.12.2 +pkgrel=0 pkgdesc="Graph calculator and plotter" url="https://www.kde.org/applications/education/kalgebra/" arch="all" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="529fedf7e3146ee9d62ae1f3e2f0d58a95bc2c0f0280311535f03f45a2fb9ea1244a5475085904c7f96dca9bb8562faee8d792ea0e4ea6a956f17238823c0a42 kalgebra-18.08.3.tar.xz" +sha512sums="cad70dfdd53ecaa7c4a6ed3cb28625b0b4a2dbd93b7bb2d974ee7e15bfc7998469d2a8a37b4b0f96cf0dbb4b731bf4a80c1adae3641f36b70597910dfe417c8d kalgebra-18.12.2.tar.xz" diff --git a/user/kalzium/APKBUILD b/user/kalzium/APKBUILD index 5ec74f1f7..506b439cf 100644 --- a/user/kalzium/APKBUILD +++ b/user/kalzium/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kalzium -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Periodic table of elements (PSE) with calculators" url="https://www.kde.org/applications/education/kalzium/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="844fccca678b7909675cee73a76dc0b38e901b3dbae42884fe803f773bdf678b2aa9957caebb9aac50ddc58e177169e284de9303ad40886f16f5c51c72347d32 kalzium-18.08.3.tar.xz" +sha512sums="45cc989705b17fae66acb133db40a58797d30f89736d474160e899146edb8b6c802a4aae08d5f84a2e758dbb32f12c5833441baf0e73a09091066cde3d7cb2e1 kalzium-18.12.2.tar.xz" diff --git a/user/kanagram/APKBUILD b/user/kanagram/APKBUILD index 485d6c2e9..dcb4b9db8 100644 --- a/user/kanagram/APKBUILD +++ b/user/kanagram/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kanagram -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Letter order (anagram) game" url="https://www.kde.org/applications/education/kanagram/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="96aa8de77729eb1aea1a76de8cc737dff4bf17ad47cd48ae89e63bed3408c357f886c01a1780ee336b9c4dfe1862e5a7c05dc82cbe3a01fa97cb179e34ba4300 kanagram-18.08.3.tar.xz" +sha512sums="7e8f64b4ae9b77346f94fef8b8c00b2d6dade8e7bdf582e9b4fdb6881daf4eef45c4644a29e4406b6c3cf4395be88a6c234688583dd8b37c3f1c11c29860e8b8 kanagram-18.12.2.tar.xz" diff --git a/user/kanjistrokeorders/APKBUILD b/user/kanjistrokeorders/APKBUILD new file mode 100644 index 000000000..f73660b2c --- /dev/null +++ b/user/kanjistrokeorders/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kanjistrokeorders +pkgver=4.002 +pkgrel=0 +pkgdesc="Typeface that has stroke order for Kanji" +url="https://sites.google.com/site/nihilistorguk/" +arch="noarch" +options="!check" # No test suite. +license="BSD-3-Clause" +depends="fontconfig" +makedepends="" +subpackages="" +source="KanjiStrokeOrders_v$pkgver.ttf::https://sites.google.com/site/nihilistorguk/KanjiStrokeOrders_v${pkgver}.ttf?attredirects=0" +builddir="$srcdir/" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="7382be90761ec63f01fb715154955a76fb78acf1a50a6c3abc3b5b753ebb8bb01d1884e154dce6b15284ac2d7600d1276b098705ee925ee86c42d4194c688721 KanjiStrokeOrders_v4.002.ttf" diff --git a/user/kapman/APKBUILD b/user/kapman/APKBUILD index 1e66bad63..ce992c846 100644 --- a/user/kapman/APKBUILD +++ b/user/kapman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kapman -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Pac-Man clone" url="https://www.kde.org/applications/games/kapman/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9b9bbb86d926f7138f8f8cf4610064a92e044980eabb837aa4a39a1aa82807067f0bc64f977cc3abb2a1d120b500926f11ff993f93a072113006010df6834f70 kapman-18.08.3.tar.xz" +sha512sums="bfeb50b20d538d1bf67b56ead46c37570e084a9c461d8e48e7f9be5320ca6ed9e501c3e806fc415e8f5afae409bc273aca4c6c730176bd1ee2dc71815f5c6bd6 kapman-18.12.2.tar.xz" diff --git a/user/karchive/APKBUILD b/user/karchive/APKBUILD index 940c72791..872442029 100644 --- a/user/karchive/APKBUILD +++ b/user/karchive/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=karchive -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for manipulating archive files" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="bc546352b52c23221bad2f18479ad4bd29dd593043a5664046953b222b3e81bbe8f32b386c385a7b2054b8c0abe9e1135142e26b02fea1f997c61f555b5e19a3 karchive-5.52.0.tar.xz" +sha512sums="89172761f5d54967ed72ccf73c3bfff79600f803a31bdb4e1684516e506f57f3b28778b598cfbd6b594b4cbe3af92984c7150ea6837d9a612bcd28db4dbc8657 karchive-5.54.0.tar.xz" diff --git a/user/kate/APKBUILD b/user/kate/APKBUILD index 6d62eddbd..f65e138a7 100644 --- a/user/kate/APKBUILD +++ b/user/kate/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kate -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Advanced text editor with autocomplete, syntax highlighting, and more" url="https://kate-editor.org/" @@ -92,4 +92,4 @@ kwrite_lang() { done } -sha512sums="08eee6b06d0fc0272b8ed73b6100e9afce07596ddab09337309f31709db4dac022e36591228eb1c06e65c064f7ea8bc18bf77fca30962fd277560b35081402a3 kate-18.08.3.tar.xz" +sha512sums="5207d575f6577ce0ca381d0051d63d85c6db2bb89f53d263a30429c066f453a11a14be68e2db1553474145386a5f3f73f2e9f3f1a68cbb76d93fa340d979c873 kate-18.12.2.tar.xz" diff --git a/user/katomic/APKBUILD b/user/katomic/APKBUILD index 388b45390..683b63126 100644 --- a/user/katomic/APKBUILD +++ b/user/katomic/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=katomic -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Fun, educational game involving molecular geometry" url="https://games.kde.org/game.php?game=katomic" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f77a46a52a8039d5b67465033e38ac11713390ac7fc21bbc15981dded19ec4355e4585904ca7e0d830a52831b9e3a8ef5bc3ca0c4a270393207f50c7f4a64eb7 katomic-18.08.3.tar.xz" +sha512sums="c1139e45c2df71a92529ee422edb909d02433d45bf815b5897591e25f4544f13e1b1d9b537a452173a022712ee15e9b293fac604f3447950d659a0cac21e3eb1 katomic-18.12.2.tar.xz" diff --git a/user/kauth/APKBUILD b/user/kauth/APKBUILD index b6420e89c..543f87712 100644 --- a/user/kauth/APKBUILD +++ b/user/kauth/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kauth -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for allowing software to gain temporary privileges" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="62b9da8e867f4256b9210ef210cc5d7230064c8c7096f0765061f2e3010cce64abd6d7324daf5a48e952b8bfe38fb5efecd7448e0ec16968dbf27c913dcc8b14 kauth-5.52.0.tar.xz" +sha512sums="f75c6f019d708409817a5b64d88033326a7d627cdee00e61280043d5cd8f65731f08d48405f50c7240f18670b25abfeea4b2af5966ebb2ee7e0f56669b5551c2 kauth-5.54.0.tar.xz" diff --git a/user/kblackbox/APKBUILD b/user/kblackbox/APKBUILD index 8aea2bfac..975b90ab2 100644 --- a/user/kblackbox/APKBUILD +++ b/user/kblackbox/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblackbox -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Hide-and-seek logic game" url="https://www.kde.org/applications/games/kblackbox/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="45b70cfce300b5d9d649ed41862d53bf67ab8ad8744f6381794dd28e34711c878d48b8816f4d31b74757a1ac175ecaeffc0a0ace708131fcf4d2e50ccbbb281f kblackbox-18.08.3.tar.xz" +sha512sums="f2f0f5572bf5bb669ec381d515eeac89c23e510b0b7527e5a4ca307ed9506df4d153e62e3ae9df818bc6de5a3836adfacd00da75d5a38d5da23bf97e410c686e kblackbox-18.12.2.tar.xz" diff --git a/user/kblocks/APKBUILD b/user/kblocks/APKBUILD index 15e28741a..161cbbf36 100644 --- a/user/kblocks/APKBUILD +++ b/user/kblocks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kblocks -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Falling blocks game" url="https://www.kde.org/applications/games/kblocks/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2e664661f387ebc55ad9621e9ce7836079c2fb330cce82986ce1dd69b115bf99e31faa4e55e497748f9ac750801e98bf73e46e1556c87a1c5e72268837435cb0 kblocks-18.08.3.tar.xz" +sha512sums="0643f52cc8f0a7a0be55292dc4008389f9944fbaf503c10f47762798e1924eb528409960997729700ec338a48c12c4148c4cee3ae34a6d2b6b71e80ec575b0c1 kblocks-18.12.2.tar.xz" diff --git a/user/kbookmarks/APKBUILD b/user/kbookmarks/APKBUILD index 37cef0906..267954234 100644 --- a/user/kbookmarks/APKBUILD +++ b/user/kbookmarks/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbookmarks -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for managing XBEL-format bookmarks" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="210b36b33f1fdaa61e66f58ff1b45b03216f6b62317c63e5b7ed990d9ec484adf068519de83ca28f162e188d10b7c818791dc8a7c6b692a5a780170aefecc282 kbookmarks-5.52.0.tar.xz" +sha512sums="f7c18ee6a0135ac93bbd4034b2c11b6142404a9b5c5872374ee2dc2d5f0cf70288793df4da4be980c0e1bf757ccbfc6ca8a83c490691e80308ec7133eb49c3ba kbookmarks-5.54.0.tar.xz" diff --git a/user/kbounce/APKBUILD b/user/kbounce/APKBUILD index 2fe640ffd..451238ed3 100644 --- a/user/kbounce/APKBUILD +++ b/user/kbounce/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbounce -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Puzzle/arcade game to build walls" url="https://games.kde.org/game.php?game=kbounce" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2d98f5b5badeeec04bffcb116930973f0c4313a6dc294e96728ee420156b6875faf996050c47a6feaaa0691c95965391a5367db06898cd70fa8e327f6591e06f kbounce-18.08.3.tar.xz" +sha512sums="b098a61b30db77c12937e0ee199ced4cc0f8d05b6913c391018c29977ef9dfee2f1d4aa87d44817fe92afd712093c30c5506e0d0f850cad3b57b289f8fdc694c kbounce-18.12.2.tar.xz" diff --git a/user/kbreakout/APKBUILD b/user/kbreakout/APKBUILD index 94b3e8c1b..26a1c24c9 100644 --- a/user/kbreakout/APKBUILD +++ b/user/kbreakout/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbreakout -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Break-Out like game with a ball and paddle" url="https://games.kde.org/game.php?game=kbreakout" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c195fd04a7f2f98af435f052ebdb8026e696ff709bacd54fbf15c928b5baecc649535e2949022cbbaa134f7130d69e792b2a6894d97bc69e5fc2bd4ec0a788fc kbreakout-18.08.3.tar.xz" +sha512sums="858b5fef671b4b0ec1339fa74bd90f62a94358f51e4a1c84427665b0c3b417d0ebaec7297517470e52e792711bd65c5e91f230b9ce250c943142d84ef11c5973 kbreakout-18.12.2.tar.xz" diff --git a/user/kbruch/APKBUILD b/user/kbruch/APKBUILD index 26584dd87..906ec5bc5 100644 --- a/user/kbruch/APKBUILD +++ b/user/kbruch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbruch -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Practice calculating percentages and fractions" url="https://www.kde.org/applications/education/kbruch/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c8ad6634fdd05b4537fe3b2aa50afced142d7892f07513840f698243acc3137762fa906f125a1dfd8baf7da1002adf4609da5e2132129ec19a309d150480cd69 kbruch-18.08.3.tar.xz" +sha512sums="b2a9e7359824c796c5c23b7759c2ad36ebcdfa67a331be0a6350869a111170140f5a9795c36eaac65eccc78d906c8cbd4ffd6732d1739e82ff980b1a09749934 kbruch-18.12.2.tar.xz" diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD index 68dc6519c..045619240 100644 --- a/user/kcachegrind/APKBUILD +++ b/user/kcachegrind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcachegrind -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Profile data visualisation tool and call graph viewer" url="https://kcachegrind.github.io/html/Home.html" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="abbbf7ba539da1fa71d31e4603d1b8a76178a48bf503c735ebce9bbc9887e9ec64b2338ce77de2f38114faa27dee51e19af61cf4d3e9fbbe942a417edf2558c1 kcachegrind-18.08.3.tar.xz" +sha512sums="09ff7e2395af914e30e9b8af24059e781c7c42574d605561721ad1598b35395a36ea0c0c15a24bd2fa68e23956a33c8096e8c76c7c1b9282657cf7722760a1bd kcachegrind-18.12.2.tar.xz" diff --git a/user/kcalc/APKBUILD b/user/kcalc/APKBUILD index cba2db126..4fd563377 100644 --- a/user/kcalc/APKBUILD +++ b/user/kcalc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalc -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Calculator with many mathematical, scientific, and logic functions" url="https://utils.kde.org/projects/kcalc/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="55c58bebd13f73e9b9a4f6ffb06c43700493f268eef9ad7357ef7a7e6857ffa134fe396ef3ab1fa3bd4544f01ac35bbb1d2b729acf93c271f9dbfc694b18b144 kcalc-18.08.3.tar.xz" +sha512sums="260c96087a3093e49e69e6f72e93917a25d357ea1f54a5c64a3e6d775d7e0fe7391108e9ced7e70f984be7a5e932f2c45f8fc94079305f98ab3b2b080a0a4292 kcalc-18.12.2.tar.xz" diff --git a/user/kcalcore/APKBUILD b/user/kcalcore/APKBUILD index bf043db31..525e9b218 100644 --- a/user/kcalcore/APKBUILD +++ b/user/kcalcore/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcalcore -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Library for managing a calendar of events" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a20145604fd809cc04078e689efda7634b1c4bf3c4593a8e7bd662e66193ecd79ca1a5c9eeab9efdb71f94fa1c8868f0f2bdf28806fb585ad6dac2f35294e520 kcalcore-18.08.3.tar.xz" +sha512sums="98dcc1563b70b22318f59b109600e92e76f3a81ff7d46b970815568068539956ba57b12701443a70bd1e101c677e66c3d55d2935dff5a51b5ddd90efb8c6a212 kcalcore-18.12.2.tar.xz" diff --git a/user/kcharselect/APKBUILD b/user/kcharselect/APKBUILD index 2084d3da8..141cf5578 100644 --- a/user/kcharselect/APKBUILD +++ b/user/kcharselect/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcharselect -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Tool to select special characters from all installed fonts" url="https://utils.kde.org/projects/kcharselect/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2152b3d6e2e0ebae15e9d2f5fe2d042d0f43df3b48f6e1f4115ab62c8d493c8e0896d42824b11021543a6e38e6e55d02f5332007f24512a093584c260018bad7 kcharselect-18.08.3.tar.xz" +sha512sums="4f822f978b6101e3d2cb1defc8761af2f9b2afc570459d4d9714d65484e10b6fec25fdce18cd01f34eb3725c71f3d44ffb70905e3efdd0b8ff71cd7152db8c16 kcharselect-18.12.2.tar.xz" diff --git a/user/kcmutils/APKBUILD b/user/kcmutils/APKBUILD index a88c36dcd..f8650aa17 100644 --- a/user/kcmutils/APKBUILD +++ b/user/kcmutils/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcmutils -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for writing System Settings modules" url="https://api.kde.org/frameworks/kcmutils/html/index.html" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="94201af642820b8bf236544db07aa8fcf63b28d05d684034a5753abad989c0c108d805c204f5fcdabb6c75145cd213c9b517f4cf66755477ff5ddfc6c8047861 kcmutils-5.52.0.tar.xz" +sha512sums="dbb8e24a86378ab283cb934fc27caa4dc3a91e3f90d70a12d64bb08dc669427e64469720507265c2cc2276133bbfe4f57c48c7a7498b5f020d503d0fcba9c3ea kcmutils-5.54.0.tar.xz" diff --git a/user/kcodecs/APKBUILD b/user/kcodecs/APKBUILD index badbba98f..5bfa7eed2 100644 --- a/user/kcodecs/APKBUILD +++ b/user/kcodecs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcodecs -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for manipulating strings in differing encodings" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8ebba1d317cbed57406f69519bb75d9641120bedec44cde7ea61a20e0b137fbc698119b03ce785aba24510e77f4f60b808dd19277548fad313fe87b1208eba62 kcodecs-5.52.0.tar.xz" +sha512sums="75e8d3800c0906a437d8d0d957c91d00b423ecb513f1f62d08dcffb1ddf70c65b78f430fc8519334a75f77b15fcb9869d7761ac87fa5936b7a8af88ecaac60ae kcodecs-5.54.0.tar.xz" diff --git a/user/kcolorchooser/APKBUILD b/user/kcolorchooser/APKBUILD index ed4eb2bca..edaf5eaae 100644 --- a/user/kcolorchooser/APKBUILD +++ b/user/kcolorchooser/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcolorchooser -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Simple application to choose a colour from the screen" url="https://www.kde.org/applications/graphics/kcolorchooser/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4985587ceb4714197a5948f54b879574b4747588ec18dfc14111d7eebaf179de7a87c03c78392164a53b950ea9a095a1b256e2cef035c5e5727048e32a2afd21 kcolorchooser-18.08.3.tar.xz" +sha512sums="156b179b0a6ba58f8d467426dc219fefa112cf8fee9c71ace15b436c7620b6f1faade3b1c1f54fa99b790e530fdacb75e8005014e05f16ce5618dc9e553e8527 kcolorchooser-18.12.2.tar.xz" diff --git a/user/kcompletion/APKBUILD b/user/kcompletion/APKBUILD index 24467f145..dc4fb6a3f 100644 --- a/user/kcompletion/APKBUILD +++ b/user/kcompletion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcompletion -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for implementing automatic completion of input" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="21de65fa4a72d32d12e948a432006e4846ce7b7ea7760793dd3047465186dde64b51154472fd1507f2908006750566f5fbb609f578e658bf038f90502e96e957 kcompletion-5.52.0.tar.xz" +sha512sums="af813411090d25f85d1b409bd971d9f610cc7c1ce01463f70cf57791af9dafe88957d74be0b63c4ca8f7d2a790c48d34613a03bed03552cae30346576849f654 kcompletion-5.54.0.tar.xz" diff --git a/user/kconfig/APKBUILD b/user/kconfig/APKBUILD index be859c1a9..93e221ccc 100644 --- a/user/kconfig/APKBUILD +++ b/user/kconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfig -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for managing software configuration" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ecf2e809270679cf7f3d57628e941fd3ee69c70104354582fb57f046c7a0dbf8ab1a23812e0d3636f8f2d846c3ccace81a73c04664464796017617b97ad3250 kconfig-5.52.0.tar.xz" +sha512sums="2a35d635db47e3b1e4fa3919ec73190a8d0bb9e82c4a8487ae7b87ba73cb54659e97124c9761de4dc303d8697f8f17b3d27d30b43e47bb870a052be87c843de7 kconfig-5.54.0.tar.xz" diff --git a/user/kconfigwidgets/APKBUILD b/user/kconfigwidgets/APKBUILD index 91e70bd8d..e492802ff 100644 --- a/user/kconfigwidgets/APKBUILD +++ b/user/kconfigwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kconfigwidgets -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework providing widgets for software configuration" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="235e092d233b8d11355545411fabd4c29e94d1e8c724868bad600d7da1296b276ffd70361c960883f9c148480b7cf7cad5d6e24354007240f793464272f9dc24 kconfigwidgets-5.52.0.tar.xz" +sha512sums="c6ec2d90c3c227eb9b092bf5b33c39f99ca4f68b1337cc0655d679648710987d13e1c8d9622ad5683ba5b2b3037aca510d96ff64d04a41dd442f3bed74398b73 kconfigwidgets-5.54.0.tar.xz" diff --git a/user/kcontacts/APKBUILD b/user/kcontacts/APKBUILD index 490ef3f30..bc599897f 100644 --- a/user/kcontacts/APKBUILD +++ b/user/kcontacts/APKBUILD @@ -1,16 +1,16 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcontacts -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Library for working with contact information" url="https://www.kde.org" arch="all" license="LGPL-2.1-only" -depends="" +depends="iso-codes" depends_dev="qt5-qtbase-dev" makedepends="$depends_dev cmake extra-cmake-modules kconfig-dev kcoreaddons-dev - ki18n-dev kcodecs-dev" + ki18n-dev kcodecs-dev iso-codes-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/kcontacts-$pkgver.tar.xz" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="866c8d70e03985c346e1a4f8c6ba0114045e1650cb846b1a15ff44cfbe569de3107b9f6c75e2354d6bb5a08ce388ce78c0871e57ffcdb28ff246e69a5444aeb1 kcontacts-18.08.3.tar.xz" +sha512sums="c5316952cc7b1cf51625af2318d03d6ab257f4dcaf9ee77cff2f754205af256c8e3ef757abb1eb605f25051cb3df86f9811b610f2581799113f0a6d32b164f3c kcontacts-18.12.2.tar.xz" diff --git a/user/kcoreaddons/APKBUILD b/user/kcoreaddons/APKBUILD index 19e7a18f6..a94b25c34 100644 --- a/user/kcoreaddons/APKBUILD +++ b/user/kcoreaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcoreaddons -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Core KF5 framework" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0f82e703e9071645cde95a89a5dd3b12da8a477be5d2e01a70c7f42a749d46d86ef44b4ccd4557bf3e23d1794607fa990eadcef6f4a431b775cbaa909e5b8442 kcoreaddons-5.52.0.tar.xz" +sha512sums="8e4a2cd59a0ecdf09317e67aa20b96f37562035beb744d189856094bcb06944e175c78515374a8a090446e63c8174b2a949b744dff36f0e21c455a2cb5df5df9 kcoreaddons-5.54.0.tar.xz" diff --git a/user/kcrash/APKBUILD b/user/kcrash/APKBUILD index 823a5ec13..46275a105 100644 --- a/user/kcrash/APKBUILD +++ b/user/kcrash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kcrash -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for gracefully handling software errors~" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3e951b8cb809e25823c1dc41a736f42a2b413b4d17d91c555def014ae2a38ed4a0ff8297f3977e68d5cfb3445c26126b9212f08e7d1e6ef8aeb01a53e663a0ac kcrash-5.52.0.tar.xz" +sha512sums="1dae5de58b8f91e463af8bf745a474472f2d53d2c2ea3bdbff2477c9220a720df1c7f97400e58a3060f891120ced85bb37f9458a7b17b6c1af1be765c9fea671 kcrash-5.54.0.tar.xz" diff --git a/user/kdbusaddons/APKBUILD b/user/kdbusaddons/APKBUILD index 6e3416f06..145f56cb1 100644 --- a/user/kdbusaddons/APKBUILD +++ b/user/kdbusaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdbusaddons -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for coping with D-Bus" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3cfb4a97e65af365bed3d2b7208ac01bf7f8ed226094caee6bd05fd3c9247a3496fa64d91940687e06bc2209601e7d03efefffc2f79f01b026f5a773ec2f232d kdbusaddons-5.52.0.tar.xz" +sha512sums="3ed4e8d3861aa894ba895fbec1c792f1f6c35a4d1c1617b367b772076ed1417bceed427e1b9046158cc1f85c0fd0d14b23093f8c3804cae9b5b93508a43deab2 kdbusaddons-5.54.0.tar.xz" diff --git a/user/kde-education/APKBUILD b/user/kde-education/APKBUILD index 98f6d1ba7..f2f7830fc 100644 --- a/user/kde-education/APKBUILD +++ b/user/kde-education/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-education -pkgver=18.08.3 -pkgrel=1 +pkgver=18.12.2 +pkgrel=0 pkgdesc="Educational software from the KDE Software Collection" url="https://www.kde.org/applications/education/" arch="noarch" diff --git a/user/kde-games/APKBUILD b/user/kde-games/APKBUILD index 542efa024..74b961b63 100644 --- a/user/kde-games/APKBUILD +++ b/user/kde-games/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-games -pkgver=18.08.3 -pkgrel=1 +pkgver=18.12.2 +pkgrel=0 pkgdesc="The KDE games collection" url="https://www.kde.org/applications/games/" arch="noarch" diff --git a/user/kde-graphics/APKBUILD b/user/kde-graphics/APKBUILD index 2a84246c6..4c00e5818 100644 --- a/user/kde-graphics/APKBUILD +++ b/user/kde-graphics/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-graphics -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Graphics software from the KDE Software Collection" url="https://www.kde.org/applications/graphics/" diff --git a/user/kde-multimedia/APKBUILD b/user/kde-multimedia/APKBUILD index 5a19acc6d..731664ea4 100644 --- a/user/kde-multimedia/APKBUILD +++ b/user/kde-multimedia/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-multimedia -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Multimedia software from the KDE Software Collection" url="https://www.kde.org/applications/multimedia/" diff --git a/user/kde-system/APKBUILD b/user/kde-system/APKBUILD index 07eea36a0..762abd606 100644 --- a/user/kde-system/APKBUILD +++ b/user/kde-system/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-system -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="System utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/system/" @@ -9,7 +9,7 @@ arch="noarch" options="!check" # Empty meta package, no point in testing. license="NCSA" depends="dolphin kdf khelpcenter kinfocenter konsole krfb ksysguard ksystemlog - kwalletmanager xdg-utils yakuake" + kwalletmanager partitionmanager xdg-utils yakuake" makedepends="" source="org.adelie-linux.about-system.desktop" diff --git a/user/kde-utilities/APKBUILD b/user/kde-utilities/APKBUILD index b83782a1a..8c1a45489 100644 --- a/user/kde-utilities/APKBUILD +++ b/user/kde-utilities/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kde-utilities -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Desktop utiltiies from the KDE Software Collection" url="https://www.kde.org/applications/utilities/" diff --git a/user/kde/APKBUILD b/user/kde/APKBUILD new file mode 100644 index 000000000..dbb054a1e --- /dev/null +++ b/user/kde/APKBUILD @@ -0,0 +1,20 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kde +pkgver=5 +pkgrel=1 +pkgdesc="The K Desktop Environment" +url="https://www.kde.org/" +arch="noarch" +license="NCSA" +options="!check" # Metapacakge +subpackages="" +depends="adelie-kde-theme kde-education kde-games kde-graphics kde-multimedia + kde-system kde-utilities plasma-desktop + + kgamma5 khotkeys kmenuedit ksshaskpass plasma-workspace-wallpapers + user-manager" +source="" + +package() { + mkdir -p $pkgdir +} diff --git a/user/kdeclarative/APKBUILD b/user/kdeclarative/APKBUILD index 44a2d143c..877ddaae8 100644 --- a/user/kdeclarative/APKBUILD +++ b/user/kdeclarative/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdeclarative -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Frameworks for creating KDE components using QML" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3464a45e53ff1cb51b648946d908e8d0aefb3ac8a6fd233afaf5313c1aa265c1bcf27d6ec624388470efadac28e445ad4906371154adf6b099df377324f47f2e kdeclarative-5.52.0.tar.xz" +sha512sums="57a042a3c9be486b9582f133a0d6688758d1ae2dd4079168d3830cbd6b2d656b22d7b1fa321f77c1d14e216e2714984303db943df623b71d29c87d7c410871c2 kdeclarative-5.54.0.tar.xz" diff --git a/user/kded/APKBUILD b/user/kded/APKBUILD index a2ed48191..ccd6935d7 100644 --- a/user/kded/APKBUILD +++ b/user/kded/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kded -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Central KDE workspace daemon" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c2b2178f652359ace6ff0e3a626bb215851980e70ec34f01c26895932c4ea6fc94ea4421a3ebb864e3150fba26f40d53f779f0e9863326e0b12fe5117bf615aa kded-5.52.0.tar.xz" +sha512sums="696f98b222616200a308c97c04d3fcc1f941bd46bf4ff8913d5d3e95c46f385906dc71c43e55d44938aab21a572786130370b5a1210a811390c356a50a2ccc77 kded-5.54.0.tar.xz" diff --git a/user/kdegraphics-thumbnailers/APKBUILD b/user/kdegraphics-thumbnailers/APKBUILD new file mode 100644 index 000000000..de17985db --- /dev/null +++ b/user/kdegraphics-thumbnailers/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kdegraphics-thumbnailers +pkgver=18.12.1 +pkgrel=0 +pkgdesc="KDE thumbnailing sofware" +url="https://www.KDE.org/" +arch="all" +license="GPL-2.0-only AND LGPL-2.1+" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kio-dev libkdcraw-dev + libkexiv2-dev" +subpackages="" +source="https://download.kde.org/stable/applications/$pkgver/src/kdegraphics-thumbnailers-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="06cb7995dc9b09133ae9d60d418a266a72899f55f3e02bfd36e988c94264b100829f003c2e5169b558cbc4c84fa3e69481d7d9565d0b7cdba86ae55e5a8495e1 kdegraphics-thumbnailers-18.12.1.tar.xz" diff --git a/user/kdelibs4support/APKBUILD b/user/kdelibs4support/APKBUILD index 59d7010f4..40da9c4ab 100644 --- a/user/kdelibs4support/APKBUILD +++ b/user/kdelibs4support/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdelibs4support -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Legacy support for KDE 4 software" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5dd615ffd92a6c30b63cea1c4f8f8c7ca92244dae8b38d5caee4474d9203368007b959d11106a9da99a57b91635175b62c5d03e4237588549fe2ef7e905bbc5 kdelibs4support-5.52.0.tar.xz" +sha512sums="860c2de36c1a1587c423eaa8f770be254d0458f3c223592ac07f116015ee2f597b913039180bf832e892cfc1060eb3830fe45c786466771441e3a1815a6a5065 kdelibs4support-5.54.0.tar.xz" diff --git a/user/kdenlive/APKBUILD b/user/kdenlive/APKBUILD index e817a478a..2e8999e4a 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=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Libre video editor" url="https://kdenlive.org/" @@ -13,7 +13,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtscript-dev kio-dev kbookmarks-dev kcoreaddons-dev kconfig-dev kconfigwidgets-dev mlt-dev kdbusaddons-dev kwidgetsaddons-dev knotifyconfig-dev knewstuff-dev knotifications-dev kguiaddons-dev ktextwidgets-dev kiconthemes-dev - kdoctools-dev kfilemetadata-dev" + kdoctools-dev kfilemetadata-dev qt5-qtwebkit-dev v4l-utils-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/kdenlive-$pkgver.tar.xz" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="10ef69fdd971b3333d275da68c38ec16f30075bf50b4f0b3d02ff623814f1dea02a8c1df6ab6f5262579813f2b6309d101106ef561cd8bb42cf33c277bab1c7b kdenlive-18.08.3.tar.xz" +sha512sums="f6cf9f45abea531268c255bd70a87a95435e5bf254ffb8830884ee9c315f8ac81a7bb7ccaa0bb80884f3561967f942aee1b248039e05864be28c2130d3f134f1 kdenlive-18.12.2.tar.xz" diff --git a/user/kdesignerplugin/APKBUILD b/user/kdesignerplugin/APKBUILD index 9eec66a18..0e0fd39e9 100644 --- a/user/kdesignerplugin/APKBUILD +++ b/user/kdesignerplugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesignerplugin -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Qt Designer plugin for KDE widgets" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0ffb936b658b41d8ff665cafa16be807a8d2aebacba13148a17c05a9c1d694e1cb6cfc012a412e5546ba6ed9888ad30499fd191ec403c6aa77bf6247ca53d1cb kdesignerplugin-5.52.0.tar.xz" +sha512sums="ac566101b0b991376d31612033a86a8db6bce30734fed3a6022f6d6cfde812b6df6a65f73578ebd6fa31b3954a1af7b134e38bf795b512cf5aa4af684b87c1a7 kdesignerplugin-5.54.0.tar.xz" diff --git a/user/kdesu/APKBUILD b/user/kdesu/APKBUILD index 96007dba1..bd1f01af5 100644 --- a/user/kdesu/APKBUILD +++ b/user/kdesu/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdesu -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for elevating privileges" url="https://api.kde.org/frameworks/kdesu/html/index.html" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4a79e11301878dad2b611b14f660276d138608e476b2209c7545ab05ced36b7c8133a1e63ee3f5e29343c8c76f79f613a7fcfe69afa4c9c6d0c6f516f35689e7 kdesu-5.52.0.tar.xz" +sha512sums="6491ec9b13d802fa78917cb95aad80cd3de746fbb37f1fb9bef56a53021be95adb15156352cfc96664fcee0c5ef90a9045e1b2086d2af9b2c657ecc50146285f kdesu-5.54.0.tar.xz" diff --git a/user/kdewebkit/APKBUILD b/user/kdewebkit/APKBUILD index 96e146fb2..9d00ce5d9 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.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="KDE integration with WebKit" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2f79353a5ab9b19d6cd57a5150c9272a5b73906aae7c27499928df6c0a53ad94a8e86a9466e4a5f6188a1eadd4a692e102ef9ec3a8b6b929209c6fcb26d49547 kdewebkit-5.52.0.tar.xz" +sha512sums="6d4a5cede572653db64826d29470e7f2f1ecded97547c4ee49f5ca51e218c22ffeb84dbd0f0953e4e55d993aff617d262cc6f974902c5dc0219642dffb1611f1 kdewebkit-5.54.0.tar.xz" diff --git a/user/kdf/APKBUILD b/user/kdf/APKBUILD index db70b51f6..2ee121577 100644 --- a/user/kdf/APKBUILD +++ b/user/kdf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdf -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="View disk usage information" url="https://utils.kde.org/projects/kdf/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="254fce406169797cce36be40d6507a7a4e081073926d7861a091abceaa4aabc0b0a00ac47172a990830bbb7981efacda6244958d783733ed160b885482053b2e kdf-18.08.3.tar.xz" +sha512sums="5e5adad7b2c8645c0a707893e455801cde2b04fb9592a63984340f45488241ad2d876eb43c29ca689f87646ccec06237cafc7a769f2a3a9daf4b161575690c21 kdf-18.12.2.tar.xz" diff --git a/user/kdiamond/APKBUILD b/user/kdiamond/APKBUILD index 44f4dcc62..01d9873c6 100644 --- a/user/kdiamond/APKBUILD +++ b/user/kdiamond/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdiamond -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Three-in-a-row game" url="https://games.kde.org/game.php?game=kdiamond" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="87394059c0dcedf9a46f21bdfa537e5ac9c55b58b405e1d12fb737ddb051233c2ff8f9dd211dccbd369a4264cc05a2bdd02a77da90b52669a6eb451897a49ca5 kdiamond-18.08.3.tar.xz" +sha512sums="c1485a681cadc39954c9580aaffc93669a471dd78dc82f9db276909784827f8000d2c5e471fd7407666ebe1f86e4e7c182b772c79ffce73b3cdb9e69b4ecea39 kdiamond-18.12.2.tar.xz" diff --git a/user/kdnssd/APKBUILD b/user/kdnssd/APKBUILD index 2343c892c..5f9341b3e 100644 --- a/user/kdnssd/APKBUILD +++ b/user/kdnssd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdnssd -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for discovering network services using Zeroconf" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a1ce2e1e63ef61edcd3ee3376d0065a4094bf4dcaf279c9cff9b72bbdcc553869ccc5b69b419cb10ae7e181d0587a1b21e977ac87277ddaade3c396bf215cebb kdnssd-5.52.0.tar.xz" +sha512sums="984277624e5ecca308101bff788c1dccb7b257801aa16f6430aa8d5e349ff71752081a689c8d10ec316e57c8a37df83bd5a43940c73fb46206cb201cee6c2722 kdnssd-5.54.0.tar.xz" diff --git a/user/kdoctools/APKBUILD b/user/kdoctools/APKBUILD index 31ad88192..f11c59983 100644 --- a/user/kdoctools/APKBUILD +++ b/user/kdoctools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kdoctools -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Tools to generate user-readable documentation from DocBook XML" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="62be111cf594f8e4c3c1591329e26ebb557d8d65fcdcaba679ee8089e4b473a89921f8f640ff6354b6ba99ba731f2b18dec3054576f0d248d6b4fd75e65172b9 kdoctools-5.52.0.tar.xz" +sha512sums="b389fd1a7b2ea32d13ddca128ed2cb6375856f1c40f83c29a46e9ed1713de6e28e4415743403de37cf1f8a4ddcba4d7cc1e295e5c50443c4faf02939854f72cb kdoctools-5.54.0.tar.xz" diff --git a/user/kemoticons/APKBUILD b/user/kemoticons/APKBUILD index 505d25ef1..560ae3b07 100644 --- a/user/kemoticons/APKBUILD +++ b/user/kemoticons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kemoticons -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Emoticons to express emotions in KDE" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="234adb4deeeb673737f6a9abd78ed4a4c36ff39bc4b97f9f1bfcc859fc472cbb08948e77e85707afcb9bd4171073f57e799a7fb7e2a394764055d20ac5c0fbc9 kemoticons-5.52.0.tar.xz" +sha512sums="3b76a6e92cdc0db08179e35c2728f8729c0b1e15d54d17ccec2f265266535f5bf8edc791530d3e65a1ab2b645fd898cb0dba4dade95490f4a73b90c804719886 kemoticons-5.54.0.tar.xz" diff --git a/user/kfilemetadata/APKBUILD b/user/kfilemetadata/APKBUILD index 5ba69dfb4..744378ad7 100644 --- a/user/kfilemetadata/APKBUILD +++ b/user/kfilemetadata/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfilemetadata -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="File metadata extraction framework" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="270c0b9ad16f7a598fe9d0741d29e1def875931de85e9dbf6744f9b040408b762bd7f845172ecf62923ca6a07b551963469fe21a811cfcf341e91ccf1b7c35cc kfilemetadata-5.52.0.tar.xz" +sha512sums="bfa8287e5c8df363908a441419d377d33ea2cd93a4fc69fc47c69da80ad0e3a80e60f26b4856c3d3e04128e6ac59b214ee0613e37dda29f2537f502789bd4801 kfilemetadata-5.54.0.tar.xz" diff --git a/user/kfind/APKBUILD b/user/kfind/APKBUILD index 8a75a31c9..6d7dbbb17 100644 --- a/user/kfind/APKBUILD +++ b/user/kfind/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfind -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Standalone search utility for KDE" url="https://www.kde.org/applications/utilities/kfind/" @@ -9,7 +9,7 @@ arch="all" license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdelibs4support-dev - karchive-dev kdoctools-dev kwidgetsaddons-dev" + karchive-dev kdoctools-dev kfilemetadata-dev kwidgetsaddons-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/kfind-$pkgver.tar.xz" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f0a8b1b7792ae3d72039ede7ec07c75269f141f168850b3a2b2d40b22ab1fba1c41a1c50a232f8431f2864e128c97a675910e6a51c6a7fb9cad942e057a349c9 kfind-18.08.3.tar.xz" +sha512sums="4f8ad6b7f12fe8c76b6966e4063b4640942c9c80d77148db60811819e1d325da0e47ec04868e2d0b9d4392c8bb9f2d30176d947c357dc06ad0b8d9c84c66054c kfind-18.12.2.tar.xz" diff --git a/user/kfloppy/APKBUILD b/user/kfloppy/APKBUILD index 479c6cd69..a19f4fb37 100644 --- a/user/kfloppy/APKBUILD +++ b/user/kfloppy/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfloppy -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Utility for formatting floppy diskettes" url="https://utils.kde.org/projects/kfloppy/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="19d006fa5497a896673138c002333b77cd08a7a46425d03e62484940ae8a16e233d5fbce44d2951f0afbcd9e32cdfb9887b760f87bd9d00d093cf8ec6ab697d3 kfloppy-18.08.3.tar.xz" +sha512sums="40b686c021cf866c6cb2c319adadb0b19b83687420d3142ffd825019bf84128c3d145c053bbb182066669fd7dd7d72cf52a6a14086cd1009a2cc5c54bfbeeb84 kfloppy-18.12.2.tar.xz" diff --git a/user/kfourinline/APKBUILD b/user/kfourinline/APKBUILD index 932b476f3..3177e59e2 100644 --- a/user/kfourinline/APKBUILD +++ b/user/kfourinline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kfourinline -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Two player board game based on Connect Four" url="https://games.kde.org/game.php?game=kfourinline" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d7fb81034163fee2ab98b49286e64127468b405592efe18863084ead4cd5f6e8288b22df712daa57afab215c736a3f1be5f9a094e13a550bc01de583bf148030 kfourinline-18.08.3.tar.xz" +sha512sums="0e68a9bb652b91a71019cb6883cbcbf79f706598faec9a507993a2c4ee6189877f40c924a24bc130f7878ba1bb5a052c5f8bae3c0f44fd0db62d2ad3784116d9 kfourinline-18.12.2.tar.xz" diff --git a/user/kgamma5/APKBUILD b/user/kgamma5/APKBUILD new file mode 100644 index 000000000..83ed6b482 --- /dev/null +++ b/user/kgamma5/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kgamma5 +pkgver=5.12.7 +pkgrel=0 +pkgdesc="Control monitor gamma from KDE 5" +url="https://www.KDE.org/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev + kconfigwidgets-dev kdoctools-dev ki18n-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/kgamma5-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="074dffc56a333bf88bb1942b3021c690822a234e26d41ff1b2d3e81f7f86f6ac272cb80f6f2552cbc5098880de520aebb8549f2a004608b824ea0c48f4e01cc6 kgamma5-5.12.7.tar.xz" diff --git a/user/kgeography/APKBUILD b/user/kgeography/APKBUILD index 73629a8c0..1e554da9f 100644 --- a/user/kgeography/APKBUILD +++ b/user/kgeography/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgeography -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Geography learning tool and trainer" url="https://www.kde.org/applications/education/kgeography/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ced01a2aa2c9f4245b9c62f33ada378f032c4f34977cc14e52a1767e9f19e241af980fb5318df3e064f21a71dc0e2318bf4c016f6f5a6ff512c3726f4c9aab9b kgeography-18.08.3.tar.xz" +sha512sums="87d94cec460bd42995bbd4b48e095de57cde965bddc4f571f3bb9c20b02cda8272f2c02a1d20145e5b10a7b91baf1db61f45e4124b39df3bc0c719f9cbd335a6 kgeography-18.12.2.tar.xz" diff --git a/user/kget/APKBUILD b/user/kget/APKBUILD index 397b5d21b..d309835f8 100644 --- a/user/kget/APKBUILD +++ b/user/kget/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kget -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Versatile download manager" url="https://www.kde.org/applications/internet/kget/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="48c611522ca1637fa43537c75985dc685228c209ff2703ed5e7544b556710ca7f6f9aa7ccb8dfabc5fbf1089f6e53deb48863f11283f052e69600db272b2f7eb kget-18.08.3.tar.xz" +sha512sums="419446b23438472420536437c9df59a9c5ded14725c69f3a5fab28ede0039458bbf011eaeeedc2d2dfb6b0113060eea7a39c26ed1f46f624584ad6468be66e02 kget-18.12.2.tar.xz" diff --git a/user/kglobalaccel/APKBUILD b/user/kglobalaccel/APKBUILD index d3db7ed13..7d64695f4 100644 --- a/user/kglobalaccel/APKBUILD +++ b/user/kglobalaccel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kglobalaccel -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for implementing global shortcuts/accelerators" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="57bfecd678107046fcf4c58c28663db0bd0d12b36f4d093505dd335ed46a5b25a5baa5370e5b14101f00e2745aef44becfc5abb8ed852cac956dfd907562bf0a kglobalaccel-5.52.0.tar.xz" +sha512sums="aaab8ba98ea7229ccd31da07efd21d16e1bd44da9534e05fee73473becc3a7098857335be00c30aa247f15454cb83cc2a0b11ab1c1385c8b682aebf06e0d6fce kglobalaccel-5.54.0.tar.xz" diff --git a/user/kgoldrunner/APKBUILD b/user/kgoldrunner/APKBUILD index 21ecd76b6..58d751d4f 100644 --- a/user/kgoldrunner/APKBUILD +++ b/user/kgoldrunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgoldrunner -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Puzzle game with a gold hunt, dodging enemies, and digging around" url="https://games.kde.org/game.php?game=kgoldrunner" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="42177d168a1f63847e711fbea9c59850e2f0914733550fe5eba8d66a014e7d3593a6565ad163bf8c67ad6fe95f0a5e0305d07717de5d484d13f78998f51d0d59 kgoldrunner-18.08.3.tar.xz" +sha512sums="4d918dbb02675954dd9854c4bd37a84356921235026f38c3c4abf0f7326b162b6ef59543b8b20c2ea11877000c3ab1cc9984aab006db95f67e41dd435f0eab28 kgoldrunner-18.12.2.tar.xz" diff --git a/user/kgpg/APKBUILD b/user/kgpg/APKBUILD index 95d5f0175..c867edbc3 100644 --- a/user/kgpg/APKBUILD +++ b/user/kgpg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kgpg -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Simple interface for GnuPG, a powerful encryption utility" url="https://utils.kde.org/projects/kgpg/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0726e9f3c4a5ae460123ad361e09e06b5eeb4fd4255645e65e65fcde608664becfb1a5c0499b39a0c32de83a531adb4eb14f9c770ac587fd2a5a95f3fe8a215a kgpg-18.08.3.tar.xz" +sha512sums="31b9cc27712f08214240b704f508aff69b7e7c26143e48ed26d8086de20c4d325650f79a59a909138a91fc33b375a0f76c10faa96e4d5cbdc85a0dfc8faada09 kgpg-18.12.2.tar.xz" diff --git a/user/kguiaddons/APKBUILD b/user/kguiaddons/APKBUILD index 0545df670..63a3e5070 100644 --- a/user/kguiaddons/APKBUILD +++ b/user/kguiaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kguiaddons -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for creating high-level user interfaces" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b89013b2f7a75c8258d00956875b87746246a55b16039b789372439bb36ae8c54ca2f3fb893ad1e53a29cead28d50e5c789982f129f1666e29217947c2359c3d kguiaddons-5.52.0.tar.xz" +sha512sums="660bc3ddb7f9c9ddfd042473b4f7783bc603be72a584f2e180f2060cb4ebacd2644e058595474c5a04fe61570cdac54e65335a4e780b0cfeda2015be140a29e1 kguiaddons-5.54.0.tar.xz" diff --git a/user/khangman/APKBUILD b/user/khangman/APKBUILD index e06fa5808..46defb1d3 100644 --- a/user/khangman/APKBUILD +++ b/user/khangman/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khangman -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Hangman word game" url="https://www.kde.org/applications/education/khangman/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="276f2a532bc8b434fc2bfbd924a6dd58832f21106898af102243b6673090ab088cc9e1409dc50046bab7fbc552407738ae8e052a7b5282070e0cc8b8162f3b9a khangman-18.08.3.tar.xz" +sha512sums="9c4ec0b98ed63e008e559eaa802bf83c4c8577181b1da7ac911744bc2919533550de37faa445f07d3d96df013f0c33220c64b7c65a44a47b0480c74d1df92434 khangman-18.12.2.tar.xz" diff --git a/user/khelpcenter/APKBUILD b/user/khelpcenter/APKBUILD index dc55222d8..6e000f73f 100644 --- a/user/khelpcenter/APKBUILD +++ b/user/khelpcenter/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khelpcenter -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Graphical documentation viewer" url="https://www.kde.org/applications/system/khelpcenter/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4d117bf1c7615d1767bc00a5c8c3cc13f7a9a981414feb9e960ceaea264b1e8ef78fca610d19649089c3571dc9d8e70321e387c98a7186ce343817cf6b040bff khelpcenter-18.08.3.tar.xz" +sha512sums="72e22dee68d90bdd147b6f8b29c7a21cda6d555b0713c78a04f8ea90c47c06b4db148d1ea734b96b54032aba0de02d1c9d1440a90b968a9e135e146bf1c48caf khelpcenter-18.12.2.tar.xz" diff --git a/user/khmeros-fonts/APKBUILD b/user/khmeros-fonts/APKBUILD new file mode 100644 index 000000000..4eca9227a --- /dev/null +++ b/user/khmeros-fonts/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=khmeros-fonts +pkgver=5.0 +pkgrel=0 +pkgdesc="Khmer typefaces from Open Forum of Cambodia" +url="http://www.khmeros.info/fonts" +arch="noarch" +options="!check" # No test suite. +license="LGPL-2.1-only" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://downloads.sourceforge.net/khmer/All_KhmerOS_$pkgver.zip" +builddir="$srcdir/All_KhmerOS_$pkgver" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="5fded88a9149d0fd59a377f08d9e1ea63ecffede58cde42e28504a48b12b35dec699b1ea0e0bbb95465c281d5b19ddfbe808a3c4ef40cd46295aaa069bd9127f All_KhmerOS_5.0.zip" diff --git a/user/kholidays/APKBUILD b/user/kholidays/APKBUILD index 3e34036b2..1f19194a9 100644 --- a/user/kholidays/APKBUILD +++ b/user/kholidays/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kholidays -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="List of national holidays for many countries" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="098a2560e1c4814f0add048fc43244b3721bee3d50ff29e7f12c70ee6282659463b504094da03628e08f726f37e20f5a0c609fac4d37e6a1a25a3bdde7654b9d kholidays-5.52.0.tar.xz" +sha512sums="709b229c31cb59692d979d8dc36574997e05d674b2cd14913c620a968b243bbcd88f14e9f488f6aec6615102f713c1b4d34f6b817111396cdfedd470d358a675 kholidays-5.54.0.tar.xz" diff --git a/user/khotkeys/APKBUILD b/user/khotkeys/APKBUILD new file mode 100644 index 000000000..a77c93a0c --- /dev/null +++ b/user/khotkeys/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=khotkeys +pkgver=5.12.7 +pkgrel=0 +pkgdesc="Hot key mapping for KDE Plasma 5" +url="https://www.KDE.org/" +arch="all" +license="LGPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcmutils-dev + kdbusaddons-dev kdelibs4support-dev kglobalaccel-dev ki18n-dev kio-dev + kxmlgui-dev libice-dev libx11-dev plasma-framework-dev + plasma-workspace-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/khotkeys-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="5cdfb182fc6c5edabc7bd979c86c423243ab390e25981359c68cfb1a258503fdf26b723399f4e3a688212c3a92703aaeb359b7c71ada216657282952dd4092b4 khotkeys-5.12.7.tar.xz" diff --git a/user/khtml/APKBUILD b/user/khtml/APKBUILD index 4a67fa62d..981e56cf2 100644 --- a/user/khtml/APKBUILD +++ b/user/khtml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=khtml -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="The KDE HTML library, ancestor of WebKit" url="https://konqueror.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="99010dd06907bcf6c549078f53052fe0cc153fb3c07686b5d3e4d77b8d5fe19fd0bb13a6d17f8e7efe525bf84b2bf9bd3a05948862b5a43de94929f21e0bd69f khtml-5.52.0.tar.xz" +sha512sums="622b4c3de23ae3424c9d15651479a7c23fd2011fc81256eba56b9e4b7f7b405b57710903f098475dd46771aaf865b973253a7a16b6074c6aed211c2567d3ff83 khtml-5.54.0.tar.xz" diff --git a/user/ki18n/APKBUILD b/user/ki18n/APKBUILD index dfa4e6f6d..e5a5b1f7f 100644 --- a/user/ki18n/APKBUILD +++ b/user/ki18n/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ki18n -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for creating multi-lingual software" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="67bebc2dbc92d4ebe49760b5a7bd5fe0f6e1cbebda35a72ba45722a22790e802ca35e66ffaa648fea79c55a0b7ea4def3deda303279c8c602838500c47e4bd08 ki18n-5.52.0.tar.xz" +sha512sums="1c974a8445cac7474b989b641b154c131f6231d97979d3c54e04b6182b10f87d3412d9e75503ead09499e83d30e2eafeeff9ddd8683fd2005889e675311a5bb6 ki18n-5.54.0.tar.xz" diff --git a/user/kiconthemes/APKBUILD b/user/kiconthemes/APKBUILD index d77047b5f..e4046ea52 100644 --- a/user/kiconthemes/APKBUILD +++ b/user/kiconthemes/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiconthemes -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for icon theming" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6a77ca06dc4f600e3ab5d3c1a24538423fe9c6f472d07dacbe4d42315e626903206301fd5b5f1a83d74243cfaffcc035e5925138d641b0979aec203ccd55e0ba kiconthemes-5.52.0.tar.xz" +sha512sums="2a2f053cb2cc1cdab4dc30f42e51431e205a75406079df583c97f2ca39911cc39f9dbb6f56b44138242d7a9e54234dc36280b48859bf3867b805d66da16e4454 kiconthemes-5.54.0.tar.xz" diff --git a/user/kidletime/APKBUILD b/user/kidletime/APKBUILD index b60bc30af..062d63afc 100644 --- a/user/kidletime/APKBUILD +++ b/user/kidletime/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kidletime -pkgver=5.52.0 -pkgrel=1 +pkgver=5.54.0 +pkgrel=0 pkgdesc="Framework for determining a user's idle time" url="https://api.kde.org/frameworks/kidletime/html/index.html" arch="all" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="abab5fd1e4946dc58410c1d446e97835ed1598ed00dfcf708cd4d2e048809c91f91a6b6da425f767e45a83b80506362dd716f70521b0f1b2101750ebb65fc036 kidletime-5.52.0.tar.xz" +sha512sums="accb3192afa4a13b0d545442e89d0875c6a056dca53581a41c6a51dfe6d775eaa6d5e7cd6d75407b882c94a52fe1e38cf4f97636745bb6a15a7dc9b00f7f4693 kidletime-5.54.0.tar.xz" diff --git a/user/kig/APKBUILD b/user/kig/APKBUILD index 4d9436cea..6fb088bfd 100644 --- a/user/kig/APKBUILD +++ b/user/kig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kig -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Interactive geometry learning and exploration tool" url=" https://www.kde.org/applications/education/kig/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c85a109e628bf129f859ff3577e1b57284a5424266769e807abcd65f3198c041a3ab11ef274fd4f45636d77be070141a496a5227e176f04b8e8a186a966049ff kig-18.08.3.tar.xz" +sha512sums="81f28a9974cfbd04663391d0f488f3f68407672d56b17fd699616dc7089aa0ea6e64c3f76ba0afe4bd8099f3cce574aaeeff1a7d425a16483bda2670810a82dd kig-18.12.2.tar.xz" diff --git a/user/kigo/APKBUILD b/user/kigo/APKBUILD index 1a67e7c3b..0273fe2b8 100644 --- a/user/kigo/APKBUILD +++ b/user/kigo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kigo -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Go or Igo game for KDE" url="https://www.kde.org/applications/games/kigo/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b8df9f0e9a0a3d193102889c0be0e07e93192aa9622d1909b6d2d47be5279b898cb6e7d7bbe4239270d774a9dabccff3bb5291426eb0228ddfe41b923ae42f93 kigo-18.08.3.tar.xz" +sha512sums="5d6ec5e5efc314fb09978e0eac289c03e568dd25563ad4a4c1aacfb9755eeeaeb664aaeb32c62fe46e7302d7dbd2dd63859c7d19317a3637496f4b617426118f kigo-18.12.2.tar.xz" diff --git a/user/killbots/APKBUILD b/user/killbots/APKBUILD index 972b6b30b..ff8ac53d9 100644 --- a/user/killbots/APKBUILD +++ b/user/killbots/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=killbots -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Simple game of evading killer robots" url="https://www.kde.org/applications/games/killbots/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6acbac422208b36dd2c780438923e599a5065862c4b810cc302c1c55a70321c4cc297b4266409fba388d9fd1f380478b8e6c6fa118a0e129450aad09250a40bb killbots-18.08.3.tar.xz" +sha512sums="299ebec3dab351e14c0b8127ad83ee64d46f4af7c008f26500ad03c8df28330bd79062e82f60ba5594a03f5445e1ddf4773d0ff794e90030ce4da5408a6c5ec2 killbots-18.12.2.tar.xz" diff --git a/user/kinit/APKBUILD b/user/kinit/APKBUILD index 45b577427..2fa0519a0 100644 --- a/user/kinit/APKBUILD +++ b/user/kinit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kinit -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="KDE initialisation routines" url="https://www.kde.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ae3e1352bd5fa95a10637e26535fede2294b0048ca35efed66d58d687b857ad5605502cbbe2636f1bf193176fcaf8b8a9057c1c572f0776c814641962899b88b kinit-5.52.0.tar.xz" +sha512sums="ad7fa0228a4595cce754e65227ab979859827e1773148dd00de95e95ad25d78dae80a4cf04106a1bba5953c6c0acdcaea5e966c83de2f402be33dcc588106ecb kinit-5.54.0.tar.xz" diff --git a/user/kio-extras/APKBUILD b/user/kio-extras/APKBUILD index 97d894c42..4ab45daa7 100644 --- a/user/kio-extras/APKBUILD +++ b/user/kio-extras/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio-extras -pkgver=18.08.3 +pkgver=18.12.1 pkgrel=0 pkgdesc="KIO plugins for various data tasks" url="https://www.kde.org/" @@ -12,8 +12,8 @@ depends="" depends_dev="qt5-qtbase-dev qt5-qtsvg-dev karchive-dev kconfig-dev kio-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev kdoctools-dev kiconthemes-dev ki18n-dev solid-dev kbookmarks-dev kguiaddons-dev - kdnssd-dev kpty-dev kactivities-dev phonon-dev libssh2-dev - libtirpc-dev taglib-dev" + kdnssd-dev kpty-dev kactivities-dev phonon-dev libtirpc-dev + taglib-dev libmtp-dev gperf khtml-dev" makedepends="$depends_dev cmake extra-cmake-modules shared-mime-info" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/kio-extras-$pkgver.tar.xz" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f79ab19abedd47baeffea4b1e99acc21611c9d435f0de14751594c97c373eaa493da07fd5d754b1f62f696e4f445b493861566845794d6d32e63e0354189d726 kio-extras-18.08.3.tar.xz" +sha512sums="6546dde9b0c34f298bf400071cff47dcdd43b006a31203d03fdb9144b71489543b30a1aa178195d9c144237eb5837ff5848b1534f63fed12a22883c9d0aa7b05 kio-extras-18.12.1.tar.xz" diff --git a/user/kio/APKBUILD b/user/kio/APKBUILD index 6f3338fad..b2ae829ce 100644 --- a/user/kio/APKBUILD +++ b/user/kio/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kio -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for data and file management" url="https://www.kde.org/" @@ -46,5 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b5a91c9eedc91eb933f16874163b2882986975c67ef329497b2ae936926292241d05f4dae022054d5db673e195e80159ad1cb70a26a5c23a192223bbe6b28c36 kio-5.52.0.tar.xz +sha512sums="163929bd8e6e4d3be5390090511cafd11213e476a0460e5fdcffde15181332545380ef25f6350e465dbc7f9872a6b771e891f5302af64bd3ced162b2a94a8c6d kio-5.54.0.tar.xz 280b2a610613786e688c06f4d4b51d3b9d583472bf1941b7b5873fece31b5df0b2f8f08f8de677ebb39fc906c57a2fa50d7890105c0aeb930b82986e0b504623 strcpy-ppc.patch" diff --git a/user/kirigami2/APKBUILD b/user/kirigami2/APKBUILD index ef51198e2..c0062c189 100644 --- a/user/kirigami2/APKBUILD +++ b/user/kirigami2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kirigami2 -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for rapidly designing usable interfaces" url="https://www.kde.org/" @@ -49,4 +49,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="431b1f91aab2bdb4ddf74cb870c3deb6cc67a99252affea06228536eeb39b50fb15e54c6918c6a045c37066055b9f261e130dabc195da2e47287be8dbe14ce55 kirigami2-5.52.0.tar.xz" +sha512sums="c85dbc8790faed84e7b59f703966f4404fe6a7c7d7e83ba4ae6d6469cd01d2a594aa7b5fbda460839df504a23a38b1881748c9a21071cc68de050e3760f25406 kirigami2-5.54.0.tar.xz" diff --git a/user/kiriki/APKBUILD b/user/kiriki/APKBUILD index e5e2b3443..aafc67ce1 100644 --- a/user/kiriki/APKBUILD +++ b/user/kiriki/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiriki -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Yahtzee-like dice game for one or more players" url="https://games.kde.org/game.php?game=kiriki" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="df09b4603ac4023fdb245488d82937c896545aa6201ff17d297b42e679ebdf2009f42984f5e63961252cda60e4ec53965b92eb7a383315e016fa622ce9b93ff0 kiriki-18.08.3.tar.xz" +sha512sums="673470bddd59f73156ac57eb3e8124da36f811be3e9f3e2b64af53ae2fe7805188704c84e55d0f55bcc9c09c16bff56aad282aeb585e270216cacdbb034ad4b0 kiriki-18.12.2.tar.xz" diff --git a/user/kitemmodels/APKBUILD b/user/kitemmodels/APKBUILD index 7cb9a2d33..f6d21c093 100644 --- a/user/kitemmodels/APKBUILD +++ b/user/kitemmodels/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemmodels -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for sorting and searching objects" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8c5806e6e88f7ccff904e3a305c8eaf77a86b54191a28876b51e397b497bc6f4e543a776ea15b52c4169541ea7e03e51341d64c08f3ed0aed6e0b2d2629d31ee kitemmodels-5.52.0.tar.xz" +sha512sums="fc2941ef7e48a72a6c08cbbe78b1cf16c4b0e6f06c692386d8ce6ea7ec323b067b051d3489aa8fb0c0f02e5d92a8937f6b5013c04211851f6507da30e5811475 kitemmodels-5.54.0.tar.xz" diff --git a/user/kitemviews/APKBUILD b/user/kitemviews/APKBUILD index 5f4cc6ef8..43800c932 100644 --- a/user/kitemviews/APKBUILD +++ b/user/kitemviews/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kitemviews -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for displaying collections of items" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="09840ce85ea479f920ed99e48be6159893b1236e4966157d2f92f48008618209806ee0d49356a940038680ff4e480069f38b7e803dab7561568295fe066ecab7 kitemviews-5.52.0.tar.xz" +sha512sums="2e664c0a05ae9e52fae93ecb509a64e1996a286c91083aed61f367dc0b4d0d51f2929ba10288be9a08dacae9c3f36953836812ef9097e3dce970830ed22fc794 kitemviews-5.54.0.tar.xz" diff --git a/user/kiten/APKBUILD b/user/kiten/APKBUILD index 0513859da..95b91610a 100644 --- a/user/kiten/APKBUILD +++ b/user/kiten/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kiten -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Japanese reference and study tool" url="https://www.kde.org/applications/education/kiten/" @@ -10,7 +10,7 @@ license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev kcompletion-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev ki18n-dev - kdoctools-dev khtml-dev kxmlgui-dev" + kdoctools-dev khtml-dev knotifications-dev kxmlgui-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/kiten-$pkgver.tar.xz" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2f81b613563a4071c04c91e789ac50c0d64780005280ff7358cf9057535be5203caf74dc7b6d6cf6d312fdbb23641ac65cad4d750ed63bd6e521bc4c87453b28 kiten-18.08.3.tar.xz" +sha512sums="f06165b217ed7bd27a25e5df62f8cae6018634ea03c616695151aa48e579a2dd0a514a637019316197b7ab6f3de471968cbe68ca9eec9bc04479444725b12b77 kiten-18.12.2.tar.xz" diff --git a/user/kjobwidgets/APKBUILD b/user/kjobwidgets/APKBUILD index 5cd7fcb74..1594c3e07 100644 --- a/user/kjobwidgets/APKBUILD +++ b/user/kjobwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjobwidgets -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework providing widgets that show job progress" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7cb0439f004f4ede9842e09cb5ef959933b0014a0efa72be6021ec38fad19aae999de1ba87848794829fb2edac0b85f1b18b545b0baad0707d71aa1f73af478b kjobwidgets-5.52.0.tar.xz" +sha512sums="2b5eb64557611f400c4d5cc12c5e062a2ea2bd84e17fdceb34c4fa16d746fa04443bde5961f1c01713ca2a61e1b39172723ca58b6c45888d13650ee752be9701 kjobwidgets-5.54.0.tar.xz" diff --git a/user/kjs/APKBUILD b/user/kjs/APKBUILD index b0b71cb21..2cf5f49de 100644 --- a/user/kjs/APKBUILD +++ b/user/kjs/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjs -pkgver=5.52.0 -pkgrel=1 +pkgver=5.54.0 +pkgrel=0 pkgdesc="Independent, free JavaScript engine" url="https://www.kde.org/" arch="all" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c6ea92978cc9c1e57a193ea64fa314f73d2c5cfc14a89b98cf722d8f25429c5b91a3541d5b2e46e3def0adfd2da93c318ec3850cd109654d8af3074de929fb7 kjs-5.52.0.tar.xz" +sha512sums="22ad1133cfe8f5186cfdc517a8bf07eba8ac3f19dea62e2f77d1ba9d34d655d26d195d2929a40180d755efcb7814339fb976090373bdc393fbf5ef6cab8d5d32 kjs-5.54.0.tar.xz" diff --git a/user/kjsembed/APKBUILD b/user/kjsembed/APKBUILD index 104248f51..639f955c8 100644 --- a/user/kjsembed/APKBUILD +++ b/user/kjsembed/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjsembed -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="JavaScript bindings for QObject" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0841109086737572bf3a4dc0f24e262f2c56dbd800193923402b7c6df2213fb7489b23467abf70539642ecf3cbcdadd30e3692c6a0fa31e8ce34be102a3e3067 kjsembed-5.52.0.tar.xz" +sha512sums="d6aa8a20eabbb918ead0388be23701cbcbce87eb72a4048064d7f6d1137dc9cd618cb53dd5a756bda0a143ae8423cf9167901a5dbc3acba312d3257e873c4713 kjsembed-5.54.0.tar.xz" diff --git a/user/kjumpingcube/APKBUILD b/user/kjumpingcube/APKBUILD index 65d50305e..d3ad71449 100644 --- a/user/kjumpingcube/APKBUILD +++ b/user/kjumpingcube/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kjumpingcube -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Dice-driven tactical game" url="https://games.kde.org/game.php?game=kjumpingcube" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9e8b6ae890b1f1ffa29908bb0ed563f736d6499e81bbcb7b0deccc325697731084ffd2b382e5325df341613a2833fdfafc5cb1b6183c603c0c3e126a8b9bdd9b kjumpingcube-18.08.3.tar.xz" +sha512sums="3d9bd31fe0e134138b7a4e70b497f58ee65ea716d68185c162d1e89b4998240b9fbeefe2f8232f335d1d96af4d135b72897c4d406d9a97e3355390be6eef74af kjumpingcube-18.12.2.tar.xz" diff --git a/user/kleopatra/APKBUILD b/user/kleopatra/APKBUILD index b980e4aed..c8c89833e 100644 --- a/user/kleopatra/APKBUILD +++ b/user/kleopatra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kleopatra -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Certificate manager and cryptography GUI" url="https://www.kde.org/applications/utilities/kleopatra/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3740481570653f718eb469f1cdfbfa69e7b41104b26403c3902667894d17321f6119b3dbf1487d59c7fbfd6707cd6dcca562aeba6036cdb41a9b29530bfa5a6b kleopatra-18.08.3.tar.xz" +sha512sums="e8273c5564c2a48afbd0c9ae467092afc3fa80cd6d374da7273e110c2b1d3c2cbc093b8e7eee682dac204ceb851352f6e4ae6263d8d689d8c3e1bb93f924906d kleopatra-18.12.2.tar.xz" diff --git a/user/klettres/APKBUILD b/user/klettres/APKBUILD index fa2623e86..a77d726c4 100644 --- a/user/klettres/APKBUILD +++ b/user/klettres/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klettres -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Learn alphabets for multiple languages" url="https://www.kde.org/applications/education/klettres/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="19cf9701136dd707752db35287b8883c31016da7c6658b4fcf5c357e1d0006b692370f317a0a186aaeba695093127add7cc652078c4c7affcc86d7dd04366c34 klettres-18.08.3.tar.xz" +sha512sums="d78550d6ec790c95085a13466abdf8ff03cd2062a5aad54c462f74649cbd48716f8e306642ded2b648ac5d8d9a1f564b0f82c1907ace10413872f9e4bf0b0d99 klettres-18.12.2.tar.xz" diff --git a/user/klickety/APKBUILD b/user/klickety/APKBUILD index f88cfba18..eed85e6ca 100644 --- a/user/klickety/APKBUILD +++ b/user/klickety/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klickety -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Fun, simple colour matching game" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="64b93852829bc45c4235a05b2efad619bedfd5bd1aaf7f380e8381c6e23e01881fecc92cff4a67bbe16d1f4d2c3db0c221e10072428f1b757d74191a8123dd18 klickety-18.08.3.tar.xz" +sha512sums="ccbbfa489f418aa5977e2747b9aad52e7c9b48860c52dcbb90a5453a0849dd6e0a6e48b5d171b8f5bc07793b1985c8842b75af2b5235fc86269c09508920ec02 klickety-18.12.2.tar.xz" diff --git a/user/klines/APKBUILD b/user/klines/APKBUILD index 4e128f8f8..9f57d87df 100644 --- a/user/klines/APKBUILD +++ b/user/klines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=klines -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Simple yet addictive single-player game" url="https://games.kde.org/game.php?game=klines" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="089ed0c4f8ffa0381879dcb57ed658ba627e7678de83dcf6dc98111afbddbf743938947ba5d830fb1f8348e3de17f06cfe0888ecc901e4d66b87ff71543a4d2f klines-18.08.3.tar.xz" +sha512sums="14f6bb5483df8dfde20617b75e095775c56658e8868d805600649ae76b8f85779ccddb02ee7b08f6e189fb3977952360a25b61138aaaaab6666e1e128f785c39 klines-18.12.2.tar.xz" diff --git a/user/kmag/APKBUILD b/user/kmag/APKBUILD index 693e7b2e8..7275749d3 100644 --- a/user/kmag/APKBUILD +++ b/user/kmag/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmag -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Screen magnification utility" url="https://www.kde.org/applications/utilities/kmag/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="220f933b0b83924bf6589b1b488cd18653e7531bad9f0d97c149c79e5bb4e2c1d441bce111c0f0304bb7c6ae33554bd666577a5a2e0a191f1e072cfe118b5146 kmag-18.08.3.tar.xz" +sha512sums="afbfa16b4d0ef6dd619c89a2352aafa50f2d1fc95e03d2a58bad851f9c3117715d30f4c6eee5ced3657dc2537afad4bc8704232bcdfd55eaf0589f7cc0e4f471 kmag-18.12.2.tar.xz" diff --git a/user/kmahjongg/APKBUILD b/user/kmahjongg/APKBUILD index 4242a7f12..d66be5766 100644 --- a/user/kmahjongg/APKBUILD +++ b/user/kmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmahjongg -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Mah Jongg desktop game" url="https://games.kde.org/game.php?game=kmahjongg" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ceabdbdaa89040cb5bae0512ee592c1f55da23b8a7c085f79e312a4919e4bca9c9c984b0c141af75924e0b9bc812dfc13e6feede70d2549c1d45b08a4c0d24c7 kmahjongg-18.08.3.tar.xz" +sha512sums="2fb089edb1549dfb43d03f1781a09a71459893de79e77be0fc720c71ad7615208ab8712426a8ca4ffd7cfdff5cba892566613bfd5e6b0d5a274353c7c44b2abb kmahjongg-18.12.2.tar.xz" diff --git a/user/kmediaplayer/APKBUILD b/user/kmediaplayer/APKBUILD index 5c06862d9..d3015d199 100644 --- a/user/kmediaplayer/APKBUILD +++ b/user/kmediaplayer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmediaplayer -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Media player framework for KDE 5" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2d667cdc3034da9cc522f6305b0a623be6dde3a1d7d34ced5d2f261470fe6b8420069551d368032b47e20c48b39abad61f1cfd0febc532b39594e74b5667f311 kmediaplayer-5.52.0.tar.xz" +sha512sums="c49db70a8bc7a27cb49917eb83fa9e15666d25b5e641babc0af424910c73ae646d63767c5c5bef28db60489bfa52456d736e0d6f0ae04b1fd2a4d8d3027e1ba7 kmediaplayer-5.54.0.tar.xz" diff --git a/user/kmenuedit/APKBUILD b/user/kmenuedit/APKBUILD new file mode 100644 index 000000000..0ec9952e0 --- /dev/null +++ b/user/kmenuedit/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kmenuedit +pkgver=5.12.7 +pkgrel=0 +pkgdesc="Menu editor for Plasma 5" +url="https://www.KDE.org/" +arch="all" +license="GPL-2.0+ AND GPL-2.0-only" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kdbusaddons-dev ki18n-dev + kiconthemes-dev kio-dev kxmlgui-dev sonnet-dev kdelibs4support-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/kmenuedit-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7bc5df0512b58bcc9e403449a3cafd7889a815d17d7387986750477e1420e71fce4d98980a789a16240ef6d2a7f316df9e0a1525c96b89df193aa601a2571062 kmenuedit-5.12.7.tar.xz" diff --git a/user/kmime/APKBUILD b/user/kmime/APKBUILD index ec5663ffa..133d008e4 100644 --- a/user/kmime/APKBUILD +++ b/user/kmime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmime -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="KDE support library for MIME" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1dc8113b0853b29eeeb7c30a69c30f4778f8e176d49a3e05cb0229b9575394ab9d3461cd5dffee7aac2e3ec738b5023c859ab94209a788c40efe28685f079ebd kmime-18.08.3.tar.xz" +sha512sums="4453a563981e6e44fc8485eab99ed2df96e020ad260e8e8d9e0e99d179f613d8ca495bd96e850bc082274392aa000b8191777d661eb468aa0052214556919152 kmime-18.12.2.tar.xz" diff --git a/user/kmines/APKBUILD b/user/kmines/APKBUILD index 618e491fd..83a41c23c 100644 --- a/user/kmines/APKBUILD +++ b/user/kmines/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmines -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Classic Minesweeper game" url="https://games.kde.org/game.php?game=kmines" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="24e4d00ce9bb595d598fa9c473167b005c0a7fb6ff7e84858aaf29fa018ca295d1e5172064ac1f42efb10b6d7ddf018577e1f331895bf5d4c2805950995805c2 kmines-18.08.3.tar.xz" +sha512sums="e8d23b27c60ad2c0ad2438d2f1e36d29434185da32b8f6146919095f04e53b1a5d0ce2d24b43536d65403023eb4217f4212764ad01bfc8eaeb1525db2bc12d0e kmines-18.12.2.tar.xz" diff --git a/user/kmix/APKBUILD b/user/kmix/APKBUILD index 32f15e694..bacc12095 100644 --- a/user/kmix/APKBUILD +++ b/user/kmix/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmix -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="KDE sound mixer" url="https://www.kde.org/applications/multimedia/kmix/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6cbc2bb5ceefd4a834a59662da67b51dac4ae4ae046af72ae7a87532c5e6fd26f401473713ebef6e81aca1d247870cd06c7b4c8f8b0880966ed3ba6f4f567994 kmix-18.08.3.tar.xz" +sha512sums="137b2c5d72c60d82be7a814cbf77d454f7432b9f306fc8d0c4968c61f8370caf6fa92bbd22e0b3c553b59e6d4890e37052d9fea821cf53e2de1155d0d2ccd928 kmix-18.12.2.tar.xz" diff --git a/user/kmousetool/APKBUILD b/user/kmousetool/APKBUILD index a7b67a0e8..c2f674e15 100644 --- a/user/kmousetool/APKBUILD +++ b/user/kmousetool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmousetool -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Tool to assist with clicking the mouse button" url="https://userbase.kde.org/KMouseTool" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7caf340cc7570eda6b563d8fc498a386a33dcac54bd998c040ebec60e108c87a83a2b114841540bffe094ab247d4561ec78c6ca82b44fa203120bf0c5cefe7b2 kmousetool-18.08.3.tar.xz" +sha512sums="b48ea9eed503c6a167444fb6c50ed34679d5c2a42c7e0c3475029be84cffc09c644e51db0028566dcc93064ce1576c4b0ed0fc62a13877768d9c7c32f7eb47d4 kmousetool-18.12.2.tar.xz" diff --git a/user/kmplot/APKBUILD b/user/kmplot/APKBUILD index 7d37c15bd..091add4ce 100644 --- a/user/kmplot/APKBUILD +++ b/user/kmplot/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kmplot -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Mathematical function plotter" url="https://www.kde.org/applications/education/kmplot/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c03eb0f08b5a2182a888dfb40f97eccef4e4e2fcf4f7fef91e66b4e0045e4ba38df50b15f309e972cf56569cc527f210ffefd72f236f94ef881652f07cfd1d67 kmplot-18.08.3.tar.xz" +sha512sums="c747777bc344d1dee7f6a6c7b0e43ceab7a991158a62bd82d80754361c9a6bc68622dbb06d13a2d345b5348664c1e8b3ff46f2af139386ff1f2dc6ad84bcbd67 kmplot-18.12.2.tar.xz" diff --git a/user/knavalbattle/APKBUILD b/user/knavalbattle/APKBUILD index 73fbb8ba5..d5e7006fc 100644 --- a/user/knavalbattle/APKBUILD +++ b/user/knavalbattle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knavalbattle -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Ship sinking game from KDE" url="https://www.kde.org/applications/games/knavalbattle/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d0d41ab446f2583bcbf5ca9486ef1b2c622c82c39d0aad0abdb371b99461c59fdd5488e67bde9ab12953043e4a0b4dec7dbfe5d605c8ffdddd1d927b647d1b3b knavalbattle-18.08.3.tar.xz" +sha512sums="6241735210257c8521c0cf37cb6894d3fbbbc26f4934bc20004673c0e468e04e86219646c142d27d6e8dcb7e847040118ea9d2a8ee29cfb49221b4eb315ea48d knavalbattle-18.12.2.tar.xz" diff --git a/user/knetwalk/APKBUILD b/user/knetwalk/APKBUILD index 4d15078ea..26ebda1a4 100644 --- a/user/knetwalk/APKBUILD +++ b/user/knetwalk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knetwalk -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Build up a computer network by placing the wires correctly" url="https://www.kde.org/applications/games/knetwalk/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a31170250287e4d97e91eca41cfc2b1c0c51e67824723f8740ca2faf5f543fb6e7f9183f703ea84d82692e733e8d849d9efa5cbc7af67a091dbb096114feafcb knetwalk-18.08.3.tar.xz" +sha512sums="3a1e8d647fd08cde52a44be671f2c7a95fb247883bfde99e0bb9f8246133df30370df939bbe43198f10a19291d60b0d13ba3ba6673ddb7f5a6fd960bf04092c1 knetwalk-18.12.2.tar.xz" diff --git a/user/knewstuff/APKBUILD b/user/knewstuff/APKBUILD index 37c908e13..5ec9d7892 100644 --- a/user/knewstuff/APKBUILD +++ b/user/knewstuff/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knewstuff -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for discovering and downloading plugins, themes, and more" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="96655a5586e3ddb09e78b70b550969bdb0b7ee2c0946402a0e68a8d75fab3b5070c0ce05ad3d2122ce948bdc4e87b466f1ba6fe1cdf841beba2ae9b26e361711 knewstuff-5.52.0.tar.xz" +sha512sums="96fd8100c78e7d4f9c0ca26ad12587f952455b302ae195184e6fb0ae601b2806668cf2b6dca012e08441622fd72e99c30a52fe901d7af60c4b59701d72b1196a knewstuff-5.54.0.tar.xz" diff --git a/user/knotifications/APKBUILD b/user/knotifications/APKBUILD index 92b7a19fe..bbf4a5895 100644 --- a/user/knotifications/APKBUILD +++ b/user/knotifications/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifications -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for sending notifications to users" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c595088859170c17819d0b6eee75b39166bf247e47ae675685b55df542981b0bb8757ca8428852b0f5ad85f0f1ffd59d682f561534581ebd43ee90abc4c8ba39 knotifications-5.52.0.tar.xz" +sha512sums="66098068d707f4b5b5147b2e02dec7b4a11c95af1dcc02ec933d1b5b63d8dab1e7776a34aae80cfb5671ae7e27cfd50dad5566e26152fb94de076384b77cdcfa knotifications-5.54.0.tar.xz" diff --git a/user/knotifyconfig/APKBUILD b/user/knotifyconfig/APKBUILD index 54c220422..0ef974619 100644 --- a/user/knotifyconfig/APKBUILD +++ b/user/knotifyconfig/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=knotifyconfig -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for configuring notifications" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ee02d6d54b4f35d6142b742397962d9d64925893da69d41b5faa2f9993fbddcf438e11a54417fc55f9e3f0ee4177559ef55817eaa860c4dccfce86ed6b481e58 knotifyconfig-5.52.0.tar.xz" +sha512sums="f9ae7eab977be273ed12a56e903b324986794d286409aed657af22c09ba7e623f3590779916481a4c80f606abeb9ab37cf544e74a9254290b10b89abb43c7573 knotifyconfig-5.54.0.tar.xz" diff --git a/user/kolf/APKBUILD b/user/kolf/APKBUILD index b0d05f582..d2f460552 100644 --- a/user/kolf/APKBUILD +++ b/user/kolf/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolf -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="2D miniature golf game from KDE" url="https://www.kde.org/applications/games/kolf/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e916b8ad647c0e6ebedf076e6fc6ed8040c0010bde70290955e6ce9a158123436536c210ab25cbf12a325e00776088a57a19a46bf22e4c67bdf33cc737c4e466 kolf-18.08.3.tar.xz" +sha512sums="4ca61873bb5a4c765be7098197ac7d22d0c1452ed2404b90a10c26eaac7440612dda1ba6ca49f00fcecefb7071f19601853d3ccfdbe46e538783a8e85fa38fd0 kolf-18.12.2.tar.xz" diff --git a/user/kollision/APKBUILD b/user/kollision/APKBUILD index 376973255..958a8cd4c 100644 --- a/user/kollision/APKBUILD +++ b/user/kollision/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kollision -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Simple ball dodging game" url="https://games.kde.org/game.php?game=kollision" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="26150d77ea6fa523c641739798c2b0ba50666ac980aa98ca860234c0c9b84ae5ded52a307cbe1c93acfd974e45eae380493fcdb340146d4f8437eac9f63915e6 kollision-18.08.3.tar.xz" +sha512sums="2a2b6c1d35e3b7cae1524029548e6b2ed357e4f37339d78b561246f1667d0493fc22e975aa0939beaa9d6a8936aa242ac0abe88d95d04d792189f10b9cda33cf kollision-18.12.2.tar.xz" diff --git a/user/kolourpaint/APKBUILD b/user/kolourpaint/APKBUILD index 086b99da6..44b1ae653 100644 --- a/user/kolourpaint/APKBUILD +++ b/user/kolourpaint/APKBUILD @@ -1,10 +1,10 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kolourpaint -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Simple painting program for KDE" -url="https://www.kolourpaint.org/" +url="https://kolourpaint.org/" arch="all" # yes, there is 2 only *and* 2+ code here. license="BSD-2-Clause AND LGPL-2.0-only AND LGPL-2.0+" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="259eab582cddd2f3bc398e1a99933840ce4abb7ccaa3333c339ee6497a98016f235715e8d7f32f9134416b05d90efdef5ae3f1063192287bd53af6cd2ab3b820 kolourpaint-18.08.3.tar.xz" +sha512sums="0f0198d3fe655fd6e943322ac60127462487e8740752cf46fbc30755407c70044d50b5f30bdd6f3931c8b01e093fec0cf9b1666ea392f7c8fd5228780279937c kolourpaint-18.12.2.tar.xz" diff --git a/user/konquest/APKBUILD b/user/konquest/APKBUILD index 4d88ec388..5e6723f27 100644 --- a/user/konquest/APKBUILD +++ b/user/konquest/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konquest -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Galactic strategy game" url="https://games.kde.org/game.php?game=konquest" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ac6a4534ea111828a140800e6f084047cb41b639fe861fde2c1633872002e7e900b07637681535925845bd35851a9b20f40453d2e91487ed45ebf5f0a69f33f2 konquest-18.08.3.tar.xz" +sha512sums="798aa7ad0d819bc1bc338d3f627177b1dc14953630682c3b960d150f25f8dbe4a5eb2e3f4bcf2fe15dd51985aaf592d08e8967698c48ffe61f6223b55a8546fc konquest-18.12.2.tar.xz" diff --git a/user/konsole/APKBUILD b/user/konsole/APKBUILD index a3e5dcb25..66c271e7b 100644 --- a/user/konsole/APKBUILD +++ b/user/konsole/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=konsole -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Terminal emulator for Qt/KDE" url="https://konsole.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3dcc5111e7a7fa389dda862b4a895379ffdb7a39d6568b3b958bf36631e3b3424a6abf2b9166f8567fcdf2d2d6f305a2e13f7575ce63549b0ebb4ebc27b33a82 konsole-18.08.3.tar.xz" +sha512sums="3bf32dc9d39dbffb855a043728cca99b21819015a7ca1df56f17f18ec6b5cd5d53bd85f46381bafae72d3747d5b9e6beeff8a79e029800c5af599b169074bf68 konsole-18.12.2.tar.xz" diff --git a/user/koruri/APKBUILD b/user/koruri/APKBUILD new file mode 100644 index 000000000..58229ed88 --- /dev/null +++ b/user/koruri/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=koruri +pkgver=20180915 +pkgrel=0 +pkgdesc="Japanese typeface based on M+ FONTS and Open Sans" +url="https://osdn.net/projects/koruri/" +arch="noarch" +options="!check" # No test suite. +license="Apache-2.0 AND custom:M+-FONTS" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://mirrors.gigenet.com/OSDN//koruri/70038/Koruri-$pkgver.tar.xz" +builddir="$srcdir/Koruri-$pkgver" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="0a78240e75782c07752e29e8591d5eab2b15fd0f784e569c60c438c2a1e49c462fa6e4e1734c1922d8bb0b1eb22fd4c74a71c0c0b7d127fb1d4c410835b98bd7 Koruri-20180915.tar.xz" diff --git a/user/kpackage/APKBUILD b/user/kpackage/APKBUILD index 64ac3f2e2..fa022f0bb 100644 --- a/user/kpackage/APKBUILD +++ b/user/kpackage/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpackage -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Frameworks for managing KDE data packages" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6db698fd82d2f5f73e7e514d727cb4edd7d2fba3cc8a5ec928e4b718c4c74fb658ef84944f6af7983900ca859f4167e71fee1eb52bbca3e711b1913e271d2897 kpackage-5.52.0.tar.xz" +sha512sums="d26f5dad3634a442d55bae94903ec6d781fa1984a780eec4b1f9ea0f9d3ae50b0defd3ddb078d7b0410626250ded1ee1e5ca1f5ea7ecee1ede4a0ef30463a8c8 kpackage-5.54.0.tar.xz" diff --git a/user/kparts/APKBUILD b/user/kparts/APKBUILD index 260835db3..090f2c44e 100644 --- a/user/kparts/APKBUILD +++ b/user/kparts/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kparts -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for user interface components" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6f1e1aca216bc794cd55f299f464e376d9b3e9c54fe54d1c30e5a931ec38cf9c7a20934ad099e6f1a5f6c0b6272d78590dc46b99dcecb6510572cbbd91a6bad1 kparts-5.52.0.tar.xz" +sha512sums="607a9a89b9d3b4434a46fe84fd13588bb2d99a43b6cc7a85abc1c336613834743f0b6ef832f31126cbf3a0ea6260c8e889927d7cc9d7cb0ad61215d1c6c4e272 kparts-5.54.0.tar.xz" diff --git a/user/kpat/APKBUILD b/user/kpat/APKBUILD index 53b1872ba..1fb9a2eac 100644 --- a/user/kpat/APKBUILD +++ b/user/kpat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpat -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Collection of card games for KDE" url="https://games.kde.org/game.php?game=kpat" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ae902eb9e392c261ee96579ecec6c678cba29d1b3de1b35d7c88d2b133fb3ee26687737f09269b6d6ad9c61bda4098cc2d6b90c43352278c54eefe427f0ce7d kpat-18.08.3.tar.xz" +sha512sums="1eddfb90fb130ea1f70b21788e7f8ac4c26cd6c96dbb7de47227770593317935d57ae9e12cdc9bfb056a22af91fed24c626441408fba6b3c89c42ca6deda9d4a kpat-18.12.2.tar.xz" diff --git a/user/kpeople/APKBUILD b/user/kpeople/APKBUILD index 52ea168c3..d6db40186 100644 --- a/user/kpeople/APKBUILD +++ b/user/kpeople/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpeople -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Provides access to all contacts and groups them by physical person" url="https://api.kde.org/frameworks/kpeople/html/index.html" @@ -45,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="edebc67d49366d01e99992cffad492fb5b10bb9d822dd3a275ebbe50d2d50e5ff725727eee45bf1fc0ac73793be7223b2dffb260b636e5c504ead4e70581a2c9 kpeople-5.52.0.tar.xz +sha512sums="8f4709cfb256eb7f836d64ee5dcec9962323a8d2d4b362a01fb140af53b7b16db5dd6bd4c8246af67086bee4e2baa9b40e66e877486900c32eb51cb3483a899c kpeople-5.54.0.tar.xz 77df2aefcdfb8e5b9c2fef7a6bfd79066819b0c6958b9e2f8fe94860155aaae9c284a110a15a189cd5b423dc7aa017b952196370f60a4fb382ed7eb77f15abd9 dont-crash-test.patch" diff --git a/user/kphotoalbum/APKBUILD b/user/kphotoalbum/APKBUILD index 4eb23d07d..86590bce3 100644 --- a/user/kphotoalbum/APKBUILD +++ b/user/kphotoalbum/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kphotoalbum pkgver=5.4 -pkgrel=0 +pkgrel=1 pkgdesc="Versatile photo album software by KDE" url="https://www.kphotoalbum.org/" arch="all" @@ -10,8 +10,8 @@ license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev phonon-dev karchive-dev kcompletion-dev kconfig-dev kcoreaddons-dev kdoctools-dev ki18n-dev - kiconthemes-dev kjobwidgets-dev kio-dev ktextwidgets-dev kxmlgui-dev - kwidgetsaddons-dev libjpeg-turbo-dev exiv2-dev libkipi-dev" + kiconthemes-dev kjobwidgets-dev exiv2-dev ktextwidgets-dev kxmlgui-dev + kwidgetsaddons-dev libjpeg-turbo-dev kio-dev libkipi-dev libkdcraw-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kphotoalbum/$pkgver/kphotoalbum-$pkgver.tar.xz" diff --git a/user/kpimtextedit/APKBUILD b/user/kpimtextedit/APKBUILD index dd58a6090..d305928a8 100644 --- a/user/kpimtextedit/APKBUILD +++ b/user/kpimtextedit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpimtextedit -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Text editor for Personal Information Managers (PIMs)" url="https://pim.kde.org/" @@ -13,7 +13,8 @@ depends_dev="qt5-qtbase-dev kwidgetsaddons-dev syntax-highlighting-dev ktextwidgets-dev sonnet-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev ki18n-dev grantlee-dev kcodecs-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev - kdesignerplugin-dev kemoticons-dev kiconthemes-dev kio-dev kxmlgui-dev" + kdesignerplugin-dev kemoticons-dev kiconthemes-dev kio-dev kxmlgui-dev + qt5-qtspeech-dev" subpackages="$pkgname-dev $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/kpimtextedit-$pkgver.tar.xz" @@ -43,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3a5ca2c2fc30f1c961a6f8b76a01c29be4b36c4e512e3c0cfaaa36c95fa9ba548f0d56cca3b9be86f2453c5c4be990b031cb2cd52a0747e1ab8af798156a7da7 kpimtextedit-18.08.3.tar.xz" +sha512sums="6961f0fff5343bf77518b0d7e4991375c1a4d8b909ca81019c4a9574806942a115d08a4793bb7cfd4f6aca97d4b3e0909c6475a66c25b89866f16509899a5326 kpimtextedit-18.12.2.tar.xz" diff --git a/user/kplotting/APKBUILD b/user/kplotting/APKBUILD index 819a750ed..89f78f698 100644 --- a/user/kplotting/APKBUILD +++ b/user/kplotting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kplotting -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for data plotting functions" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2fd925ebe040a37ce5f86f06ba8613cc1b738c2d6e8711920f6ae4833625fc098c0acf3937bc03c92be91f68aed5162f86e65abaf4289da07e1bac2d7bffac63 kplotting-5.52.0.tar.xz" +sha512sums="85cec93bd25a673bcaed993c9130529c1f16e726b3c40f84395f1c2e4810b85503dc3f015ef5cdc1289b793cc19abd956d54a61c2f8e1626ab73b9112107b61d kplotting-5.54.0.tar.xz" diff --git a/user/kpmcore/APKBUILD b/user/kpmcore/APKBUILD new file mode 100644 index 000000000..102059e09 --- /dev/null +++ b/user/kpmcore/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=kpmcore +pkgver=3.3.0 +pkgrel=0 +pkgdesc="Core routines for KDE Partition Manager" +url="https://www.kde.org/applications/system/kdepartitionmanager" +arch="all" +license="LGPL-2.1+" +depends="" +depends_dev="libatasmart-dev parted-dev qt5-qtbase-dev" +makedepends="$depends_dev cmake extra-cmake-modules kcoreaddons-dev ki18n-dev + kwidgetsaddons-dev util-linux-dev" +subpackages="$pkgname-dev $pkgname-lang" +source="https://download.kde.org/stable/kpmcore/$pkgver/src/kpmcore-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="62a0a341fbbec426291e2c9dd183a20466fce48ffaa360dd816c58402ee03c1f61c4ef7887d0a66c4693d77c2183a5da3477b828ba4ac2ed405f684ffb27125e kpmcore-3.3.0.tar.xz" diff --git a/user/kpty/APKBUILD b/user/kpty/APKBUILD index ea3045840..51989384f 100644 --- a/user/kpty/APKBUILD +++ b/user/kpty/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kpty -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for implementing terminal emulation" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8580fa72268a18ecc029d95e24d5a8556a5cf955f729843ed3d061c19d44b6faf6681923c658a9d7dfe0253e941c4129c59ed1c0c761ebb83361b80699263e77 kpty-5.52.0.tar.xz" +sha512sums="1eb83b3034d950a7561a043f68eea17322f6547a19f399bd500c9ce28bdf02b86d60ed6b4aa976ae4b75cb674ebaa3e4c9c1642601d4470b884ba4ca0ba249c6 kpty-5.54.0.tar.xz" diff --git a/user/krdc/APKBUILD b/user/krdc/APKBUILD index 449f9d308..69ccd16a2 100644 --- a/user/krdc/APKBUILD +++ b/user/krdc/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krdc -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="View and control remote desktops (RDP and VNC)" url="https://www.kde.org/applications/internet/krdc/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6efd562839d512dc5188b18c3a33b8dd3b13d6021ea211a0c1691100e9948aef27ec3a3beefd213f9e939606f5b7c2bfa6027955369b38d5ad1d10c381d466e8 krdc-18.08.3.tar.xz" +sha512sums="0e40c3bf4ba15db7953d3406bdfc080610b4997a28dc80a036979fa69e47846d51ba72563a8f7af040fb5108e7fdde7472c00a972dac252bc9cf98aa16d5924e krdc-18.12.2.tar.xz" diff --git a/user/kreversi/APKBUILD b/user/kreversi/APKBUILD index 1ff1d6e91..31cdd3868 100644 --- a/user/kreversi/APKBUILD +++ b/user/kreversi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kreversi -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Reversi game" url="https://games.kde.org/game.php?game=kreversi" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e239328b253b8835446638c78ce7931952da4acf162587aff24c69960e56b63890a1a9cbf9e92f1943174e065e962ad7d0d4c00ae3baf69fc109d16ddf7607b0 kreversi-18.08.3.tar.xz" +sha512sums="a4e8877b1299d6a0787d655a9a1b9e7ad57ccf9a4b1af26eba5133b752c55f0064e6d6206da43609afcbafca6150f693739011e87ce14b24a977a29a68843d97 kreversi-18.12.2.tar.xz" diff --git a/user/krfb/APKBUILD b/user/krfb/APKBUILD index 5a06b57d8..95806d107 100644 --- a/user/krfb/APKBUILD +++ b/user/krfb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krfb -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Share your screen with others for remote watching or assistance" url="https://www.kde.org/applications/system/krfb/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7e629b29065b1d2c84cf888bb4c1d65a4d532feac5daafebb9169e0ce92ebd67a1dd6bb99c4b8157a9b7bcd75466a09856ef1f1bcceb656a36685546d66da315 krfb-18.08.3.tar.xz" +sha512sums="7e0a5493fb178ea7ea762599536fdfbedfceae20a0cc0190e17f09d0436d6121f5b986f9f080c8443982201a7d80b66de3f0940868df2c3589c9bfdb23471219 krfb-18.12.2.tar.xz" diff --git a/user/krita/APKBUILD b/user/krita/APKBUILD index 4b872a52e..c85aaf521 100644 --- a/user/krita/APKBUILD +++ b/user/krita/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krita pkgver=4.1.5 -pkgrel=0 +pkgrel=1 pkgdesc="Digital painting program by KDE" url="https://krita.org/" arch="all" @@ -14,7 +14,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev karchive-dev kconfig-dev ki18n-dev kitemmodels-dev kitemviews-dev kwindowsystem-dev zlib-dev qt5-qtsvg-dev qt5-qtmultimedia-dev kcrash-dev libice-dev libx11-dev libxcb-dev fftw-dev libpng-dev boost-dev tiff-dev libjpeg-turbo-dev - kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev" + kio-dev eigen-dev exiv2-dev lcms2-dev poppler-qt5-dev gsl-dev libxi-dev + libraw-dev" subpackages="$pkgname-lang" source="https://download.kde.org/stable/krita/$pkgver/krita-$pkgver.tar.gz" diff --git a/user/kross/APKBUILD b/user/kross/APKBUILD index df6cdf18f..d67379691 100644 --- a/user/kross/APKBUILD +++ b/user/kross/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kross -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for scripting KDE applications" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6641fa38612767d67bf8b0ff00864d03caee337f00418071c5d0a959513a85ed60a11ec8f6ba1b333ac4da259d432d2b3f3dd0e71c55056489779256d6b7bc71 kross-5.52.0.tar.xz" +sha512sums="eefae897541d4d6c9b1920452a2172c390328a1ecc5a9cf765b8a46f07b8bcf5563727957ed6e3e0da243c4b6550e2aaef78b705af3035be8b6e2d73e193f11b kross-5.54.0.tar.xz" diff --git a/user/kruler/APKBUILD b/user/kruler/APKBUILD index 3be6f38ed..0eb229f2c 100644 --- a/user/kruler/APKBUILD +++ b/user/kruler/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kruler -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Screen ruler" url="https://www.kde.org/applications/graphics/kruler/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="44be1edab33549e7e00a87c16e2abbdc6cf8aab7ce7b265605b82b74c678d3453b0c694a35af00258446c713e4f6e5e9c0472b02c79a058fd5376217761cdcfd kruler-18.08.3.tar.xz" +sha512sums="6e2484a67b6cb81bb00a5b7a3e3b7334642e7034f9f8106636cf38f1206c2c914f704d2c09bbdd84e7dba64e5fe99bf1b28283f17fe88dd25f46d413e62ace82 kruler-18.12.2.tar.xz" diff --git a/user/krunner/APKBUILD b/user/krunner/APKBUILD index d2c8241b4..9439e4eb9 100644 --- a/user/krunner/APKBUILD +++ b/user/krunner/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=krunner -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Parallel query system" url="https://api.kde.org/frameworks/krunner/html/index.html" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="688d99e8375319b36ecd2781bb14beda76a9c27b5d8e172be098776d71b35aed265c83e46d49a7be03bbd80ae117b2c03fcd8cae8206e7444f0194bf941d73e5 krunner-5.52.0.tar.xz" +sha512sums="1ed1590424736d0d38249740435e6a1e289089bdb650b5fc7eaff05c86e296b372a1dc7833f7fbaa8dcf1ca33653d6ff1241929abf8795f87e73ab85ac6299b1 krunner-5.54.0.tar.xz" diff --git a/user/kservice/APKBUILD b/user/kservice/APKBUILD index 2d0e088f2..90d2b321a 100644 --- a/user/kservice/APKBUILD +++ b/user/kservice/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kservice -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for implementing plugins and services" url="https://www.kde.org/" @@ -45,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7c3ba6dab342c6c86b849d88dba0f160871a619fb7f3c3abaa9ccd4ead3687c909ea15ccf3accb5304e9d1f702d4a416b971f0b88c19f07604c08881288e4e35 kservice-5.52.0.tar.xz" +sha512sums="df64846676aa7877a34d245adb612b938eaa220e30f58ae9ea7800e97e1278f83b6777a8e65a3841535b450145dce194c45c5d3fad1c366d334f4cdfe8058475 kservice-5.54.0.tar.xz" diff --git a/user/kshisen/APKBUILD b/user/kshisen/APKBUILD index b11b5680a..ad0abe4e3 100644 --- a/user/kshisen/APKBUILD +++ b/user/kshisen/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kshisen -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Mixture of Solitaire and Mah Jongg" url="https://games.kde.org/game.php?game=kshisen" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c38205319f142a9cc7b70042ea142fdc0904fe0af8c56056d87269599507b69970f1f45f9f023b02767baa693104bf946314847fb949358f3783f08b0de07581 kshisen-18.08.3.tar.xz" +sha512sums="88f3ecd93866b5db3642f92349b307d4b6ebe783013f9c26825514af31367d70b69c4059af602ad4d44ddb7272e305066d22cc6d7b1cdf042315bef1259d15d3 kshisen-18.12.2.tar.xz" diff --git a/user/ksirk/APKBUILD b/user/ksirk/APKBUILD index 3e59b076d..b059786fa 100644 --- a/user/ksirk/APKBUILD +++ b/user/ksirk/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksirk -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Strategy game from KDE" url="https://www.kde.org/applications/games/ksirk/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="59bf76dfe9bf39c485e178a5d95b8b6daaccbdf411aa7447aa55b4ffc146ad7b4bfb3f9b56209ce093baae09a212ca9c6fd5a7cf5dd799fba561be3847c50d20 ksirk-18.08.3.tar.xz" +sha512sums="b517f8b0c3b1c9fa365a2b3383a0563982dcd5e745b7ad138d268c6635468d267a6f1a4d2260f64e46e723c8a8f72c32912d13b14be01db748cd461945d2a679 ksirk-18.12.2.tar.xz" diff --git a/user/ksnakeduel/APKBUILD b/user/ksnakeduel/APKBUILD index c0b3c0a14..adb84aa96 100644 --- a/user/ksnakeduel/APKBUILD +++ b/user/ksnakeduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksnakeduel -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Tron-like game" url="https://www.kde.org/applications/games/ksnakeduel/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1948c62da1e348d1cc093a0577af38db8352a25d12608eb1fe20a8a93d93f8b5f9d78b1e8c529a6d269940104c392047291f387426161a34d417eb482243e63f ksnakeduel-18.08.3.tar.xz" +sha512sums="a2c1d2ff0af013c59ff1a84c2e7d4c6565018ab3b8f9ce603161b8af53add1e72d764cc26c372594dc10d127b2768c3aa988b5122271aec3c0a0276947693d01 ksnakeduel-18.12.2.tar.xz" diff --git a/user/kspaceduel/APKBUILD b/user/kspaceduel/APKBUILD index 2f35bb924..48e64f36a 100644 --- a/user/kspaceduel/APKBUILD +++ b/user/kspaceduel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kspaceduel -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Space arcade game from KDE" url="https://www.kde.org/applications/games/kspaceduel/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b69c6deef012f9dd7a4a174920c9791839b1dc6aa3d70b903493018d6169871f32b7fce1ac5ab54c3f45c23f3ffb69737d108c69242522b101d7c98d90136d80 kspaceduel-18.08.3.tar.xz" +sha512sums="be36f5c15540854b51bf6dbce59604eff0efcd7a80a57672ec04274621f0f47057d53f9a8a92b3e530bb68ddc893411a69e1e3f6e050d2ec1520f3cbe70a0471 kspaceduel-18.12.2.tar.xz" diff --git a/user/ksquares/APKBUILD b/user/ksquares/APKBUILD index 7fbd7fa72..bcd34a624 100644 --- a/user/ksquares/APKBUILD +++ b/user/ksquares/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksquares -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Fun and exciting game of Dots and Boxes" url="https://games.kde.org/game.php?game=ksquares" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0252c5d00a661e29ab82af18d624aee3486a28ff4a58bfe0a4460603430dac6342c9f41231a971e8184c88c2e5b76c54cb5c4fe11d9493eb8026bce02201ee1d ksquares-18.08.3.tar.xz" +sha512sums="fd832514835831062c9ff1eb658dc47fa1fe2ea5e6bbde9130a194fda7b992598ee27d96b8e9b5db8c0dbc8e50b05d6056fa70c2fcca988e491c831e1ecf59a3 ksquares-18.12.2.tar.xz" diff --git a/user/ksshaskpass/APKBUILD b/user/ksshaskpass/APKBUILD new file mode 100644 index 000000000..513a419e1 --- /dev/null +++ b/user/ksshaskpass/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ksshaskpass +pkgver=5.12.7 +pkgrel=0 +pkgdesc="Plasma integration for SSH agents" +url="https://www.KDE.org/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev + kdoctools-dev ki18n-dev kwallet-dev kwidgetsaddons-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/ksshaskpass-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="0c613b5263721a510844b24f4311d906f229acdbb72967902973f995b88973f68f13fd098bf702d1281023f17eafb87de388589062da1b58923479e6fe831a7a ksshaskpass-5.12.7.tar.xz" diff --git a/user/kstars/APKBUILD b/user/kstars/APKBUILD index 11b503db3..b98404eda 100644 --- a/user/kstars/APKBUILD +++ b/user/kstars/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kstars -pkgver=2.9.8 +pkgver=3.0.0 pkgrel=0 pkgdesc="Desktop planetarium" url="https://www.kde.org/applications/education/kstars/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev knotifyconfig-dev kauth-dev kconfig-dev kcrash-dev kdoctools-dev kwidgetsaddons-dev knewstuff-dev ki18n-dev kio-dev kxmlgui-dev kplotting-dev knotifications-dev eigen-dev mesa-dev - qt5-qtwebsockets-dev" + qt5-qtwebsockets-dev libraw-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/kstars/kstars-$pkgver.tar.xz 0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch @@ -48,5 +48,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="52bc57cd5c46d470f6b49441512708c4446da6cb894cc4f450e8a98616fac8a7d8bcce7ceebcc9a78763f7df612b9cf33498944feed24f2a4104f6b838dc7925 kstars-2.9.8.tar.xz +sha512sums="e574c2529898d66bc79e1cf88ce778dddeedfdfed4ea23921219226121b60be042a94e6865e9076efff038a0a529587901f9a4ab2cd5b658440a8bf39c0c4d08 kstars-3.0.0.tar.xz 8c81a6db810a99b7d8bf7adca15767fdbfb79269ab2de1e4136de3c75266dde2fd572b961f63dc9b4f619abf7292e02eed5d29ca9ba53586f30871aba6015fdb 0001-htmesh-Fix-compile-error-on-modern-Linux-systems.patch" diff --git a/user/ksudoku/APKBUILD b/user/ksudoku/APKBUILD index c285ce184..78e827de3 100644 --- a/user/ksudoku/APKBUILD +++ b/user/ksudoku/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksudoku -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Desktop Sudoku (symbol placement / logic) game" url="https://games.kde.org/game.php?game=ksudoku" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7c57f178a834027d23ed24f0f2b2c76956e204211539845ce275b0eb021a5d2c8dc99e977cdc8f8f26db01f6363875efb6102a8829e880225a917aa016e6e40f ksudoku-18.08.3.tar.xz" +sha512sums="23031ef64f76a425fa5657ba088a6a6cebbfabd3d53e574a899ac9020072759f371e787b0eb425bb12560aaf1dd673499316410b4c1d67ea887c53b60a7cf5ef ksudoku-18.12.2.tar.xz" diff --git a/user/ksystemlog/APKBUILD b/user/ksystemlog/APKBUILD index a6a2507d5..2092d221e 100644 --- a/user/ksystemlog/APKBUILD +++ b/user/ksystemlog/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ksystemlog -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Friendly, powerful system log viewer tool" url="https://www.kde.org/applications/system/ksystemlog/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0cdf798c3d6c51851fd3cc2eda04e445a413459ee29d7b98d799a749d21a6a80447bce37651ac22e4b652fc10452dc2fb6408108cce2a968e7fc7f2379b0c915 ksystemlog-18.08.3.tar.xz" +sha512sums="4eb98902462b661e5351ecd65f93c723d4d6d96215cda3de87dde26af9f8acd1086776f95466a9cace97314c781e18e62c93d31721e0a1fe5156a7ba2e52c95e ksystemlog-18.12.2.tar.xz" diff --git a/user/kteatime/APKBUILD b/user/kteatime/APKBUILD index 16b5aef6a..36a332fb6 100644 --- a/user/kteatime/APKBUILD +++ b/user/kteatime/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kteatime -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Steep responsibly" url="https://www.kde.org/applications/games/kteatime/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8530abc2aa61d4b309b6eeda075184b8572b5a82dd59a7c2a19e209ac2440e0b560d587e79af772d92d1fafd04940919a8258729c25ca812aaab419fa0f244f5 kteatime-18.08.3.tar.xz" +sha512sums="a10b9f7bbd2b994b1943aba0bf7c2b1be353c87547b2ef86cc36f2f9e67d9d2540b44132aa9f88fc7db16cc83b93a932add5bb0076459a74361aea742a6ce7ae kteatime-18.12.2.tar.xz" diff --git a/user/ktexteditor/APKBUILD b/user/ktexteditor/APKBUILD index af51d7fae..143405fdc 100644 --- a/user/ktexteditor/APKBUILD +++ b/user/ktexteditor/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktexteditor -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Reusable, programmable text editor widget" url="https://www.kde.org/" @@ -48,4 +48,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="98442415124e4202d13ec99e84f9ff260bff959efdd7703555eecb74594c93125e83180fbb5527d216d5ef57da60055e89b48f331ddf0e2024f7686c78c6b7f0 ktexteditor-5.52.0.tar.xz" +sha512sums="8402fb036887ef853e455b4c80b3f4ff7fa6a65fc37e94d4fb2e94c09a59f2e49d7403dbf94aa3f2b2eb7ac6f43c5aede9aaa45ab5e9597a62b8a5d9b7ad0500 ktexteditor-5.54.0.tar.xz" diff --git a/user/ktextwidgets/APKBUILD b/user/ktextwidgets/APKBUILD index 749e92a74..b2cec5cec 100644 --- a/user/ktextwidgets/APKBUILD +++ b/user/ktextwidgets/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktextwidgets -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework providing widgets for text manipulation" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="043afc71b6357ea5c256ea0ee13819a7590debf2dfb7dda958ca4c3f89ccfaf20cee1445a93cd11bc8de6db0e8d04af43118ad327e72be2622fc673cf23d3a36 ktextwidgets-5.52.0.tar.xz" +sha512sums="0a3e12a422bb8aa1c79cf96cbd95d7544ba812e12b9a9b838efc014336e56c3f21bce80084ec9ed3c164b317dd9588db3ef28a729b01bdd05e9ea024d47ce767 ktextwidgets-5.54.0.tar.xz" diff --git a/user/ktimer/APKBUILD b/user/ktimer/APKBUILD index cf4ab4f3e..f725a6fcd 100644 --- a/user/ktimer/APKBUILD +++ b/user/ktimer/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktimer -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Tool to execute programs after some time" url="https://www.kde.org/applications/utilities/ktimer/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a7c4aab964d85f813b4567cb822b9cb845ee29520175f04cbf60a4a729a1acbe569bf02e2af01b6b545fdae4b4dd912839f8d419765d63e45aa33ab534a3cd81 ktimer-18.08.3.tar.xz" +sha512sums="8a1f22cc4f2c0e542ab39937314a02c173605524b4d7a59a58448343232d1a7243239aca10a0d5d9a42a994ef1815ca43d22e5ffe442797532e2c4a75dac8431 ktimer-18.12.2.tar.xz" diff --git a/user/ktouch/APKBUILD b/user/ktouch/APKBUILD index 21bac8747..dfe3f7a4f 100644 --- a/user/ktouch/APKBUILD +++ b/user/ktouch/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktouch -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Touch typing tutor" url="https://www.kde.org/applications/education/ktouch/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a6c0a7bffb754a5f92555cf6658e5bd2b79e563831824674c17e939df8ca7d971677188f5f473a27bb00651ad5b903e454169eec0e51fc14900bc9c6bc00ec0d ktouch-18.08.3.tar.xz" +sha512sums="e3555175eed16902dae37ad1fd8e80bcc0fcb776b7d0dbb27cbdff462498fe61bfc9edd2759655786e440cbdc47edc84cfdcc66c83b86871cea8511043f0c8bf ktouch-18.12.2.tar.xz" diff --git a/user/ktuberling/APKBUILD b/user/ktuberling/APKBUILD index 8931a3f9b..65eb5bbf4 100644 --- a/user/ktuberling/APKBUILD +++ b/user/ktuberling/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ktuberling -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Simple constructor game" url="https://games.kde.org/game.php?game=ktuberling" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cb6974bd426b23da04399110528a414ff8af512dcf8c9ac7c2a45279c827233eca4e8995bfa5f54a815baeed35f9c567b762d752c0df453532a6bf4aaa7bc180 ktuberling-18.08.3.tar.xz" +sha512sums="ac9833ed4f47921983b1103acd530d9f9b7fc368b41773abe1f4fd637ecaccb589455fefc1a02cbd8e75faa768a045d026e6f9d4be6b14d16ae1961033d351c1 ktuberling-18.12.2.tar.xz" diff --git a/user/kturtle/APKBUILD b/user/kturtle/APKBUILD index cf8c5779d..f0c64a58a 100644 --- a/user/kturtle/APKBUILD +++ b/user/kturtle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kturtle -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Educational programming environment" url="https://www.kde.org/applications/education/kturtle/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="061cc40fab9a99d65cbe20ea6ad65ca37da3df51773224a6a4f6339b3d4bca3ce4bc49b77c88a78e17c6dcb52f01e82d303babb106519cb23a0af5e2d1678d2c kturtle-18.08.3.tar.xz" +sha512sums="c8a352732972ee51e8fc796465354776ee5d4646dedd2768301e7a04526301bb8ee0f36b45107a1729b87fc3c99d6a68aa97043088b2252de14347f432669b2d kturtle-18.12.2.tar.xz" diff --git a/user/kubrick/APKBUILD b/user/kubrick/APKBUILD index 962fc11b4..34d1c37a1 100644 --- a/user/kubrick/APKBUILD +++ b/user/kubrick/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kubrick -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="3D cube puzzle solving game" url="https://www.kde.org/applications/games/kubrick/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7070f17a6aa1a2bc2098bb619569356f06afbe8c84207d69a437cbd06cb0a24836619151c408f1aaeacb7d98834a3838d8ee50b5b5f0828c3f364c3b823d8d8f kubrick-18.08.3.tar.xz" +sha512sums="ab736a60f8b873c55e32762131b199dda4acae62804431a2e737a99c2138bab1b76c95af8d1a2d10def9717b6ed385b1e18ff60f94500167a23ac7823c19c550 kubrick-18.12.2.tar.xz" diff --git a/user/kunitconversion/APKBUILD b/user/kunitconversion/APKBUILD index 7d63022f9..f8ee549b4 100644 --- a/user/kunitconversion/APKBUILD +++ b/user/kunitconversion/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kunitconversion -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Convert between metric and imperial" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f7eac193f00335dd3316d4ffca9b1a7f310815ab8f34095f95eb3a1e8f15fb95093c799587550d0ba22d359b6bfe77706e0093a155dd9f6b2f26cc05971b8600 kunitconversion-5.52.0.tar.xz" +sha512sums="657b13bf4d49fcceab6005ccbbe439f011be5865ac95c3a06317edda8f2fca90cda2dcb8d415235f2edf4af3616ab35e55a9b40b94d29d0dbfc6b5e74fc3fbb5 kunitconversion-5.54.0.tar.xz" diff --git a/user/kwallet/APKBUILD b/user/kwallet/APKBUILD index 498decac3..910635c7a 100644 --- a/user/kwallet/APKBUILD +++ b/user/kwallet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwallet -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Secure storage system for passwords built atop Qt" url="https://www.kde.org/" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="63a84d0016b59297274f55eba901e0219e6c38bd6316007edda94cddd496488b4baa35c7cb38447bde70f65c35bedbe2aa5ce21b68a6a1574cf6275f62073ca6 kwallet-5.52.0.tar.xz +sha512sums="f30ceda97180a562853923a0ad1cefbadbed51bbbf4b29405bbe85ccae3dc815053903367ba3638e7a7293eda7fbb7df88f527d6176fc6c2286088c38ce0069a kwallet-5.54.0.tar.xz edca12963a5db9db05b3b4d581c1b970569f3b96dc672422e561c189c9024b69710732281f054514ce3d596688a5b0ba512766f4fd768eea8e00a18dcfd59179 kwallet-5.22.0-blowfish-endianness.patch" diff --git a/user/kwalletmanager/APKBUILD b/user/kwalletmanager/APKBUILD index 73899597a..803edd37c 100644 --- a/user/kwalletmanager/APKBUILD +++ b/user/kwalletmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwalletmanager -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Manage KDE wallets" url="https://www.kde.org/applications/system/kwalletmanager/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5b0a8256df7bbd7d82b167311030c8ddbe9870ffc9f7fb5ef5f523729d7c9ec11bc3a934462a6c645c1f3abd9ffe0e69c76ea3e9b118cb7534a9f702e626c5ac kwalletmanager-18.08.3.tar.xz" +sha512sums="e71da87436069a8c34cf84ddd4025cfb7040039b48c21fcfeb588acc5f26dd9d46e8b206c0b2371357335e7d40e7720ac2d6c8ec13e00a8fd97413f065af8a1d kwalletmanager-18.12.2.tar.xz" diff --git a/user/kwave/APKBUILD b/user/kwave/APKBUILD index 537f14414..ec904a31d 100644 --- a/user/kwave/APKBUILD +++ b/user/kwave/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwave -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Sound editor built for KDE" url="https://kwave.sourceforge.net/" @@ -46,5 +46,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ddce5e748403e0678fa6713521713b5320b3c8732e5e70cb056b3c2da63e6480e47a47112521266d9df31ffd7750fa6c29485ee45bfdfbc215e3b3013173e469 kwave-18.08.3.tar.xz +sha512sums="794dfd7747d5dc1348b881b7a1e498e0116cdf8b0aa2d00422d306253d558d2cc5f63d0b87a0e1de79fa6ddcbe645c3710f9514f0acfd5b0387bf5e525736fce kwave-18.12.2.tar.xz 43474f73281a7e3e97e2aa9e8c5b7aac50c8153c4ec09345a9ff43eb3c90a17c1dd9fbd2c630967ff87a5b21139f4efd0ecc44f36052549cc2036fd1db1dfac4 remove-msgcat.patch" diff --git a/user/kwayland/APKBUILD b/user/kwayland/APKBUILD index 4f7c61bd3..63d5ae8fc 100644 --- a/user/kwayland/APKBUILD +++ b/user/kwayland/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwayland -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Qt wrapper libraries for Wayland" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="db36b42e491bf25faf45aa0c5b6b924558e8472f616ae70132bf48ca30fc620ce090690e01111d6cdd01ad3b9b0dbed45f1685c28aa67cb337e9eeb66575098c kwayland-5.52.0.tar.xz" +sha512sums="8b6eaa2f57b09857447f702e2e0f253413edd6938459d407437aac7dddf1313002f6c4c4f32df861c723479fdf4642084a360cd6406729cb42c627f488ac6aa7 kwayland-5.54.0.tar.xz" diff --git a/user/kwidgetsaddons/APKBUILD b/user/kwidgetsaddons/APKBUILD index 18d70812b..3571dbf18 100644 --- a/user/kwidgetsaddons/APKBUILD +++ b/user/kwidgetsaddons/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwidgetsaddons -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework containing ready-made widgets for common tasks" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="86f2f32ab3071358c6d2887fcf0105a3d84d60e2e58898a48857776cc42e0a2c45d53d786879449fed79fd86dd58b2a9ae2053b7b254fb3590222e915e533cd3 kwidgetsaddons-5.52.0.tar.xz" +sha512sums="e52375a10af10bd1134d33e793511fa91c135079d2479686ce0f559e31e2e6a71de311773c6c6353343b8ebd3c29e35aa604402cf6cc0b53169775c3babc6bc8 kwidgetsaddons-5.54.0.tar.xz" diff --git a/user/kwindowsystem/APKBUILD b/user/kwindowsystem/APKBUILD index cb585dc32..ed4148241 100644 --- a/user/kwindowsystem/APKBUILD +++ b/user/kwindowsystem/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwindowsystem -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for introspecting the running X11 window manager" url="https://www.kde.org/" @@ -43,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fa24a29cc814c226cb3f80784f8e07ffdcfe77e03ad3f010ea0b9da3365ca24416c3f3d920fdc557688c3a5a1465cdb946a8dde7962b3bc15dca0a58785fc098 kwindowsystem-5.52.0.tar.xz" +sha512sums="144181636b5f272a4a248bfa90ebc2410ab4b0adca034b086ce86fc208d63607f00f1b8e2193647d5fc72c696f3b02d5d718a3125d4703c548e7a8a85da47690 kwindowsystem-5.54.0.tar.xz" diff --git a/user/kwordquiz/APKBUILD b/user/kwordquiz/APKBUILD index 743d57787..c416ea996 100644 --- a/user/kwordquiz/APKBUILD +++ b/user/kwordquiz/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kwordquiz -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Flash card trainer for KDE" url="https://www.kde.org/applications/education/kwordquiz/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="889f6bbc34cc7d9f6ffaebfdeb0e7dd07c166cde237e8d2cd029ead5ce8a3ca0e78df6de546e1eef0a822ad716135206aa0b11da5f21b31e61d795a2568ed01c kwordquiz-18.08.3.tar.xz" +sha512sums="8f0cb12dbab3f688b8779074ed6b6b57a1a79acdb460cc1c0e91d0e7d6bf9e0e7bf1662f797efb0325d01550b3ff24fdaaa3ff30e36490cf7f039e155e823929 kwordquiz-18.12.2.tar.xz" diff --git a/user/kxmlgui/APKBUILD b/user/kxmlgui/APKBUILD index 95177923d..dc799c694 100644 --- a/user/kxmlgui/APKBUILD +++ b/user/kxmlgui/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlgui -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for creating user interfaces using XML" url="https://www.kde.org/" @@ -44,4 +44,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="cad39799e4649a6607ba6f10928c02e68d6e7c9420b4f401fcb55fa10a7b74a2304ba226680fb50fa674207b10e9dec0fcba7233e74e514c7dbac5df4a020f8b kxmlgui-5.52.0.tar.xz" +sha512sums="bde15df90e758f778116d29446dd30b16628b02050ac6ba73dd2c9505bbf26f13106a7257680009169dc1d8c196ac7f3e8c1ffad2d63a6f0a9b8fb66ae89bbf5 kxmlgui-5.54.0.tar.xz" diff --git a/user/kxmlrpcclient/APKBUILD b/user/kxmlrpcclient/APKBUILD index b37a054d6..8480f168c 100644 --- a/user/kxmlrpcclient/APKBUILD +++ b/user/kxmlrpcclient/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kxmlrpcclient -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Qt library for writing XML-RPC clients" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c25bad253e71910466028959575a6f7e164563775f6c8b99aefe8c313387360a359d467ffa35698f5b28397963982daebeebee3f8fd0e9627c56263319a4e20d kxmlrpcclient-5.52.0.tar.xz" +sha512sums="853f1a4c79a1fca278e2eb7d5c53aa47e4998276112428ec9cb3388c73eb9dcc4374510890ffbfc0ad52812622fae73ed4fd871e053dc4663d8ccd1883b76a83 kxmlrpcclient-5.54.0.tar.xz" diff --git a/user/lbxproxy/APKBUILD b/user/lbxproxy/APKBUILD new file mode 100644 index 000000000..f72865a4f --- /dev/null +++ b/user/lbxproxy/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=lbxproxy +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 proxy server for the Low Bandwidth extension" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libice-dev liblbxutil-dev libx11-dev libxext-dev util-macros + xorgproto-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e025101ba6743f98717958c3ff561df3f0fea7b491b2a41639cb8a84ffe9d82d980dcaaa8f50408e3a1a8ecfbd29fbe599a16a0f5de454b05ff82bc2629f68f2 lbxproxy-1.0.3.tar.bz2" diff --git a/user/lesscpy/APKBUILD b/user/lesscpy/APKBUILD new file mode 100644 index 000000000..dba0fced1 --- /dev/null +++ b/user/lesscpy/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=lesscpy +pkgver=0.13.0 +pkgrel=0 +pkgdesc="LESS language compiler, written in Python" +url=" " +arch="noarch" +license="MIT" +depends="python3 py3-ply py3-six" +makedepends="python3-dev" +subpackages="" +source="lesscpy-$pkgver.tar.gz::https://github.com/lesscpy/lesscpy/archive/$pkgver.tar.gz" + +build() { + cd "$builddir" + python3 setup.py build +} + +check() { + cd "$builddir" + python3 setup.py check +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="fc540e792dd5b094e284d23257ee48aef7c72cd1733a3d5ffa1ab87821db694c6ab3f2afc0d3b39b82bc5b8a8d52b496e5b413186c4190b6fd59eb687cd38014 lesscpy-0.13.0.tar.gz" diff --git a/user/libart-lgpl/APKBUILD b/user/libart-lgpl/APKBUILD index e234aeced..8eb73fdb3 100644 --- a/user/libart-lgpl/APKBUILD +++ b/user/libart-lgpl/APKBUILD @@ -3,7 +3,7 @@ pkgname=libart-lgpl pkgver=2.3.21 pkgrel=6 pkgdesc="Library for high-performance 2D graphics" -url="http://www.levien.com/libart/" +url="https://www.levien.com/libart/" arch="all" options="!check" # No test suite. license="LGPL-2.0+" diff --git a/user/libcanberra/APKBUILD b/user/libcanberra/APKBUILD index 9e105c892..bd41ad019 100644 --- a/user/libcanberra/APKBUILD +++ b/user/libcanberra/APKBUILD @@ -2,19 +2,18 @@ # Maintainer: William Pitcock <nenolod@dereferenced.org> pkgname=libcanberra pkgver=0.30 -pkgrel=3 +pkgrel=4 pkgdesc="Event sound library for free desktops" url="http://0pointer.de/lennart/projects/libcanberra/" arch="all" options="!check" # No test suite. license="LGPL-2.1+" -depends="" -depends_dev="alsa-lib-dev gstreamer-dev gtk+2.0-dev gtk+3.0-dev libogg-dev - libtool libvorbis-dev pulseaudio-dev" -makedepends="$depends_dev lynx" +depends="sound-theme-freedesktop" +makedepends="alsa-lib-dev gstreamer-dev gtk+2.0-dev gtk+3.0-dev libogg-dev + libtool libvorbis-dev lynx pulseaudio-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-gtk2 $pkgname-gtk3 $pkgname-gstreamer $pkgname-pulse" -source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz" +source="http://0pointer.de/lennart/projects/$pkgname/$pkgname-$pkgver.tar.xz" prepare() { cd "$builddir" @@ -42,6 +41,7 @@ package() { gtk2() { pkgdesc="Gtk+ 2.x Bindings for libcanberra" + install_if="$pkgname=$pkgver-r$pkgrel gtk+2.0" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libcanberra-gtk.so.* \ "$subpkgdir"/usr/lib/ @@ -51,6 +51,7 @@ gtk2() { gtk3() { pkgdesc="Gtk+ 3.x Bindings for libcanberra" + install_if="$pkgname=$pkgver-r$pkgrel gtk+3.0" mkdir -p "$subpkgdir"/usr/lib/gnome-settings-daemon-3.0/gtk-modules \ "$subpkgdir"/usr/bin \ "$subpkgdir"/usr/share/gnome/autostart \ diff --git a/user/libcddb/APKBUILD b/user/libcddb/APKBUILD index de8b4f6ff..f28442f59 100644 --- a/user/libcddb/APKBUILD +++ b/user/libcddb/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=libcddb pkgver=1.3.2 -pkgrel=4 +pkgrel=5 pkgdesc="Library that implements the different protocols (CDDBP, HTTP, SMTP) to access data on a CDDB server (e.g. http://freedb.org)." url="https://sourceforge.net/projects/libcddb/" arch="all" @@ -12,7 +12,9 @@ license="LGPL-2.0+" depends="" makedepends="" subpackages="$pkgname-dev" -source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" +source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 + connect-ppc64.patch + " prepare() { cd "$builddir" @@ -37,4 +39,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a libcddb-1.3.2.tar.bz2" +sha512sums="0e07e7d37f2013164d75b530a5528f54847271fd20f3b7bedb192a05d1f61dcf006d10dc2927efe155a01eddcc57b940bc31d8ac88d5dfc4f1a09771caa84e0a libcddb-1.3.2.tar.bz2 +70f6644c7b4f40d556d81b87bcdf7a07b96f48dd741a25c6918c44bc38edd2598cc46f50a23d7c77ea8d98c9193c7ef589c277801a7ac098e9845b0a7f086993 connect-ppc64.patch" diff --git a/user/libcddb/connect-ppc64.patch b/user/libcddb/connect-ppc64.patch new file mode 100644 index 000000000..0c79fdc4d --- /dev/null +++ b/user/libcddb/connect-ppc64.patch @@ -0,0 +1,41 @@ +--- libcddb-1.3.2/lib/cddb_net.c.old 2009-03-01 03:28:07.000000000 +0000 ++++ libcddb-1.3.2/lib/cddb_net.c 2019-01-03 06:43:42.480000000 +0000 +@@ -273,7 +273,7 @@ + int timeout_connect(int sockfd, const struct sockaddr *addr, + size_t len, int timeout) + { +- int got_error = 0; ++ int got_error = 0, conn_result; + + /* set socket to non-blocking */ + #ifdef BEOS +@@ -299,7 +299,7 @@ + #endif /* BEOS */ + + /* try connecting */ +- if (connect(sockfd, addr, len) == -1) { ++ if ((conn_result = connect(sockfd, addr, len)) == -1) { + /* check whether we can continue */ + if (errno == EINPROGRESS) { + int rv; +@@ -333,6 +333,9 @@ + } + } + } ++ } else if (conn_result == 0) { ++ /* it worked without needing timeout */ ++ got_error = 0; + } else { + /* connect failed */ + got_error = -1; +--- libcddb-1.3.2/lib/cddb_net.c.old 2009-03-01 03:28:07.000000000 +0000 ++++ libcddb-1.3.2/lib/cddb_net.c 2019-01-03 07:30:27.050000000 +0000 +@@ -325,6 +325,8 @@ + default: + /* we got connected, check error condition */ + l = sizeof(rv); ++ /* Work around Linux/ppc64 bug */ ++ rv = 0; + getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &rv, &l); + if (rv) { + /* something went wrong, simulate normal connect behaviour */ diff --git a/user/libcdio/APKBUILD b/user/libcdio/APKBUILD index c1e7bc351..031f11fae 100644 --- a/user/libcdio/APKBUILD +++ b/user/libcdio/APKBUILD @@ -1,14 +1,14 @@ -# Contributor: Carlo Landmeter # Maintainer: pkgname=libcdio pkgver=2.0.0 -pkgrel=0 +pkgrel=1 pkgdesc="GNU Compact Disc Input and Control Library" url="https://www.gnu.org/software/libcdio/" arch="all" license="GPL-3.0+" depends="" -makedepends="libcddb-dev ncurses-dev linux-headers" +depends_dev="ncurses-dev" +makedepends="$depends_dev libcddb-dev linux-headers" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools ${pkgname}++:_cpp" source="https://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2 disable-broken-test.patch" diff --git a/user/libdv/APKBUILD b/user/libdv/APKBUILD new file mode 100644 index 000000000..e3dfc12f8 --- /dev/null +++ b/user/libdv/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libdv +pkgver=1.0.0 +pkgrel=0 +pkgdesc="Quasar DV codec for digital camcorders" +url="http://libdv.sourceforge.net/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="popt-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://downloads.sourceforge.net/libdv/libdv-$pkgver.tar.gz" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-xv + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="19887a6f452fa7da8924901ad841f5c4a434a3bde56c932ddb43717592aa744281e3a8ad220231e11d7e6bc3b0e704952a8324e5f85d4e088675edceeeca7dc8 libdv-1.0.0.tar.gz" diff --git a/user/libdvdread/APKBUILD b/user/libdvdread/APKBUILD index e6263d32a..c88455a7a 100644 --- a/user/libdvdread/APKBUILD +++ b/user/libdvdread/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Timo Teräs <timo.teras@iki.fi> # Maintainer: pkgname=libdvdread -pkgver=6.0.0 +pkgver=6.0.1 pkgrel=0 pkgdesc="Library for reading DVD video discs" url="http://dvdnav.mplayerhq.hu/" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479 libdvdread-6.0.0.tar.bz2" +sha512sums="550c01f6afcaca217d8852fdd9f4a54790239b674a45bb7c1c23a58fb5dec009e3028049a54f0904c08f15f5ad994e66bd6bea9cc8d5a8808e8b638ff8e27c4b libdvdread-6.0.1.tar.bz2" diff --git a/user/libertine-fonts/APKBUILD b/user/libertine-fonts/APKBUILD new file mode 100644 index 000000000..bc202bf17 --- /dev/null +++ b/user/libertine-fonts/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libertine-fonts +pkgver=5.3.0 +pkgrel=0 +pkgdesc="Libre, multilingual typefaces" +url="http://libertine-fonts.org/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1 OR (GPL-2.0-only WITH Font-exception-2.0)" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://downloads.sourceforge.net/linuxlibertine/LinLibertineOTF_${pkgver}_2012_07_02.tgz" +builddir="$srcdir/" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/OTF/ *.otf +} + +sha512sums="a441a127fb56413a69de3a435f3c5870b53ef2d3b6c341f7bf14e112f90d698ed2e7f9b002e0fcf951b93fa7f29be229bd796f8679f0b610d06705f02e01a6c7 LinLibertineOTF_5.3.0_2012_07_02.tgz" diff --git a/user/libev/APKBUILD b/user/libev/APKBUILD index d1b32c7da..e13d861ef 100644 --- a/user/libev/APKBUILD +++ b/user/libev/APKBUILD @@ -1,7 +1,7 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: pkgname=libev -pkgver=4.24 +pkgver=4.25 pkgrel=0 pkgdesc="Event dispatch library" url="http://software.schmorp.de/pkg/libev.html" @@ -36,5 +36,5 @@ package() { rm "$pkgdir"/usr/include/event.h } -sha512sums="e4cb3b5dd4b9828d5b8da840c73ae4604258a8c4330aafa5472298b83bf944628f36918f0ddd47d9069d255639f0b24a2cf8d349f0644ffd50de823bcb54a31a libev-4.24.tar.gz +sha512sums="83455d4dcb626a28d8477aaea27cdee6bc88b273fae926a57eed9f6a59d4b0ea2eef0f41ad09ff711aea2956ed83a591aa53cfe8aa242f7d0a4da19180d764c4 libev-4.25.tar.gz b5bc1b5ed1e605cd45a01adce70c1a97188c0b46a36333f12eccd4407c95d96f18adff90ee8c5733c1783a36b4adc5ef67d6b470104339a1ac5c4539a2a4599e libev-4.11-Add-pkgconfig-support.patch" diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD index 13869d231..518fb3c64 100644 --- a/user/libfm-qt/APKBUILD +++ b/user/libfm-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libfm-qt -pkgver=0.13.1 +pkgver=0.14.0 pkgrel=0 pkgdesc="Qt library for file management and bindings for libfm" url="https://lxqt.org" @@ -9,7 +9,7 @@ arch="all" license="LGPL-2.1+" depends="" depends_dev="libfm-dev menu-cache-dev libexif-dev" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.5.0 qt5-qttools-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev qt5-qtx11extras-dev $depends_dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/libfm-qt/releases/download/$pkgver/libfm-qt-$pkgver.tar.xz" @@ -25,8 +25,8 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS -O0" \ + -DCMAKE_C_FLAGS="$CFLAGS -O0" \ -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="29b8f686950a7b0ea86468d01ca64a6ff8316ccd5f0144808a4332692cf96199431470880a9b560780efeba7add833ab6a0d9b4b24220f8fb7091cc5ef151dc8 libfm-qt-0.13.1.tar.xz" +sha512sums="2d496f3963dd7e7a433ec16c87ca4682c1fb1564b935499bbeee354f09cbf2a0dcdeab2609e9429e87035731ea9f0a9c64c0bcec55be2eb92f806067d6d2e02a libfm-qt-0.14.0.tar.xz" diff --git a/user/libfm-qt/libfm-qt-0.11.2-const-fixes.patch b/user/libfm-qt/libfm-qt-0.11.2-const-fixes.patch deleted file mode 100644 index f9732fce2..000000000 --- a/user/libfm-qt/libfm-qt-0.11.2-const-fixes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- libfm-qt-0.11.2/src/folderview.cpp.old 2016-12-21 11:44:23.000000000 -0600 -+++ libfm-qt-0.11.2/src/folderview.cpp 2017-10-12 19:33:06.121769699 -0500 -@@ -727,7 +727,7 @@ - if(!selIndexes.isEmpty()) { - PathList paths; - QModelIndexList::const_iterator it; -- for(it = selIndexes.begin(); it != selIndexes.end(); ++it) { -+ for(it = selIndexes.constBegin(); it != selIndexes.constEnd(); ++it) { - FmFileInfo* file = model_->fileInfoFromIndex(*it); - paths.pushTail(fm_file_info_get_path(file)); - } ---- libfm-qt-0.11.2/src/utilities.cpp.old 2016-12-21 11:44:23.000000000 -0600 -+++ libfm-qt-0.11.2/src/utilities.cpp 2017-10-12 19:39:07.683967576 -0500 -@@ -40,7 +40,7 @@ - QList<QUrl>::const_iterator it; - FmPathList* pathList = fm_path_list_new(); - -- for(it = urls.begin(); it != urls.end(); ++it) { -+ for(it = urls.constBegin(); it != urls.constEnd(); ++it) { - QUrl url = *it; - FmPath* path = fm_path_new_for_uri(url.toString().toUtf8()); - fm_path_list_push_tail(pathList, path); diff --git a/user/libfontenc/APKBUILD b/user/libfontenc/APKBUILD index 508804ee8..666a58e81 100644 --- a/user/libfontenc/APKBUILD +++ b/user/libfontenc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libfontenc pkgver=1.1.3 -pkgrel=3 +pkgrel=4 pkgdesc="X11 font encoding library" url="https://www.X.Org/" arch="all" @@ -19,8 +19,7 @@ build() { --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --disable-static \ - --with-encodingsdir=/usr/share/fonts/encodings + --disable-static make } diff --git a/user/libfs/APKBUILD b/user/libfs/APKBUILD new file mode 100644 index 000000000..fd242d2f0 --- /dev/null +++ b/user/libfs/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libfs +pkgver=1.0.7 +pkgrel=0 +pkgdesc="X11 Font Server client library" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xtrans" +depends_dev="util-macros" +makedepends="$depends_dev xorgproto-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://www.x.org/releases/individual/lib/libFS-$pkgver.tar.bz2" +builddir="$srcdir/libFS-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f libFS-1.0.7.tar.bz2" diff --git a/user/libgda/APKBUILD b/user/libgda/APKBUILD new file mode 100644 index 000000000..e585373cb --- /dev/null +++ b/user/libgda/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libgda +pkgver=5.2.8 +pkgrel=0 +pkgdesc="GNOME Database Access library" +url="http://www.gnome-db.org/" +arch="all" +options="!check" # "Disk I/O error" in multi-threaded. all others pass +license="GPL-2.0+ AND LGPL-2.0+" +depends="iso-codes" +makedepends="db-dev glib-dev gobject-introspection-dev graphviz-dev gtk+3.0-dev + gtksourceview-3.0-dev intltool iso-codes-dev itstool libgcrypt-dev + libgee-dev libsoup-dev libxml2-dev libxml2-utils libxslt-dev + postgresql-dev sqlite-dev vala-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" +source="https://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-$pkgver.tar.xz + cs.patch + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-ui \ + --enable-vala + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece libgda-5.2.8.tar.xz +911383ba387ecfd2c53bee777aa540f8490c52fdd82e20d23b7f61e5d8591643be9d2c50d4d45183d96b2a44d2e800ceb788bf7e871ade3a9166584c86af9be5 cs.patch" diff --git a/user/libgda/cs.patch b/user/libgda/cs.patch new file mode 100644 index 000000000..08ebc5d88 --- /dev/null +++ b/user/libgda/cs.patch @@ -0,0 +1,13 @@ +Thanks Avengence on #talos-workstation + +--- libgda-5.2.8/tools/browser/help/cs/cs.po.old 2018-11-07 14:39:18.000000000 +0000 ++++ libgda-5.2.8/tools/browser/help/cs/cs.po 2019-01-10 00:31:40.050000000 +0000 +@@ -2998,7 +2998,7 @@ + msgstr "" + "Jak bylo zmíněno v předchozím oddíle, každý atribut je mapována na sloupec. " + "Typ sloupce je normálně určen automaticky (řetězec, číslo, …), ale můžete " +-"jej i vynutit připojením „::<typ>“ za název atributu pro požadovaný typ." ++"jej i vynutit připojením „::<typ>“ za název atributu pro požadovaný typ." + + #. (itstool) path: section/p + #: C/ldap-connections.page:67 diff --git a/user/libgee/APKBUILD b/user/libgee/APKBUILD new file mode 100644 index 000000000..d769dc6c3 --- /dev/null +++ b/user/libgee/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libgee +pkgver=0.20.1 +pkgrel=0 +pkgdesc="GObject collection library" +url="https://wiki.gnome.org/Projects/Libgee" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="glib-dev" +subpackages="$pkgname-dev" +source="https://download.gnome.org/sources/libgee/0.20/libgee-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b991acfea965e0afa007adac0df1763c3b97b31bf2832c0408128d02f4bb237a03c583b4dd107de1ed877ef042614352c845b6ba5f8b6fb535f43e2400746d7f libgee-0.20.1.tar.xz" diff --git a/user/libgphoto2/APKBUILD b/user/libgphoto2/APKBUILD index 76e277987..7bd75969d 100644 --- a/user/libgphoto2/APKBUILD +++ b/user/libgphoto2/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libgphoto2 -pkgver=2.5.21 +pkgver=2.5.22 pkgrel=0 pkgdesc="Digital camera library" url="http://www.gphoto.org" @@ -46,4 +46,4 @@ package() { "$pkgdir/lib/udev/rules.d/54-gphoto.rules" } -sha512sums="08e5d6a7b7603b92d3e24d3ee7843aa980525f25b7315e7ca6f17a6a1e059748471d9cf0b19392ea965cf0eb094386be275fcb5b97de1d9e7df6c66fe92a81c6 libgphoto2-2.5.21.tar.bz2" +sha512sums="8f02c460324c115810f56a9408ecba7aabb801947249c1ee79f0f0a1db1d785d34992508232bad7af112aed2dfc6b213365cee694dd0e7d5edf4072c63fa01cb libgphoto2-2.5.22.tar.bz2" diff --git a/user/libgsf/APKBUILD b/user/libgsf/APKBUILD index 8fc1adab3..086da1e6c 100644 --- a/user/libgsf/APKBUILD +++ b/user/libgsf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=libgsf -pkgver=1.14.44 +pkgver=1.14.45 pkgrel=0 pkgdesc="Library for manipulating structured files" url="https://www.gnome.org/" @@ -45,4 +45,4 @@ package() { rm -f "$pkgdir"/usr/share/man/man1/gsf-office-thumbnailer.1 } -sha512sums="17be4898e800d653d97af1afc780b14eb596ea03443d7dd8f2687152ca1c9cbdfe5fad0686742e2c9e2dac4a40f65fa260b7b5dc3b2d79a4738e552ad7e6310f libgsf-1.14.44.tar.xz" +sha512sums="2e993150b6fec336a14fd85d5c631e4a3b43187039dab0cba3b8badf62873f39814392db92bb737b92aa9a6d8b4ba41f1fb248c1fe07b88cddd28ded5e4d9ebd libgsf-1.14.45.tar.xz" diff --git a/user/libgxps/APKBUILD b/user/libgxps/APKBUILD new file mode 100644 index 000000000..5deb16d48 --- /dev/null +++ b/user/libgxps/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libgxps +pkgver=0.3.1 +pkgrel=0 +pkgdesc="GObject-based library for manipulating and rendering XPS documents" +url="https://wiki.gnome.org/Projects/libgxps" +arch="all" +license="LGPL-2.1+" +depends="" +depends_dev="glib-dev" +makedepends="$depends_dev meson cairo-dev freetype-dev gobject-introspection-dev + gtk+3.0-dev lcms2-dev libarchive-dev libjpeg-turbo-dev ninja tiff-dev" +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 \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + ninja -C output +} + +check() { + cd "$builddir" + ninja -C output test +} + +package() { + cd "$builddir" + DESTDIR="$pkgdir" ninja -C output install +} + +sha512sums="80401bd3c9753c74e425c5c08510cac314ad255ebeda9676bd5396a217770c7f5d8733c64b649cc6fdaa43423bb1a4ad21e1e0e3f7903f486e75a1d678850239 libgxps-0.3.1.tar.xz" diff --git a/user/libiec61883/APKBUILD b/user/libiec61883/APKBUILD new file mode 100644 index 000000000..b84e7b3e4 --- /dev/null +++ b/user/libiec61883/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libiec61883 +pkgver=1.2.0 +pkgrel=0 +pkgdesc="Library for transmission of media streams over FireWire (1394)" +url="https://ieee1394.wiki.kernel.org/index.php/Libraries#libiec61883" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="libraw1394-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://www.kernel.org/pub/linux/libs/ieee1394/libiec61883-$pkgver.tar.gz" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="303391dc5d75298039f51bcb9c53061f5ada92210c81dfe860994c05e8e03d6d9d1a662fad780d5766c17a8aade665d996ab3454fc93bc06981a3832e6de4066 libiec61883-1.2.0.tar.gz" diff --git a/user/libkdcraw/APKBUILD b/user/libkdcraw/APKBUILD new file mode 100644 index 000000000..6b346adad --- /dev/null +++ b/user/libkdcraw/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libkdcraw +pkgver=18.12.1 +pkgrel=0 +pkgdesc="RAW image file format support for KDE" +url="https://www.KDE.org/" +arch="all" +license="GPL-2.0+ AND LGPL-2.0+" +depends="" +depends_dev="qt5-qtbase-dev" +makedepends="$depends_dev cmake extra-cmake-modules libraw-dev" +subpackages="$pkgname-dev" +source="https://download.kde.org/stable/applications/$pkgver/src/libkdcraw-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="6adc597e93e6a299c50554c94fbf3bfcc934a97205af04ded7a5c84a980372e72eba23aba063548e5c6cb53a218bc04cbaefbd137450fade09939df578804ffb libkdcraw-18.12.1.tar.xz" diff --git a/user/libkdegames/APKBUILD b/user/libkdegames/APKBUILD index 6e8f85da3..053bef995 100644 --- a/user/libkdegames/APKBUILD +++ b/user/libkdegames/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkdegames -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Library for common routines shared between KDE games" url="https://www.kde.org/applications/games/" @@ -44,6 +44,12 @@ check() { package() { cd "$builddir" make DESTDIR="$pkgdir" install + + # causes crashes in KPat: + # https://bugs.kde.org/show_bug.cgi?id=402220 + # Qt doesn't care: + # https://bugreports.qt.io/browse/QTBUG-72779 + rm -r "$pkgdir"/usr/share/carddecks/svg-{ancient-egyptians,future,jolly-royal,konqi-modern,standard,xskat-french} } carddecks() { @@ -52,4 +58,4 @@ carddecks() { mv "$pkgdir"/usr/share/carddecks "$subpkgdir"/usr/share/ } -sha512sums="614c3428593f005401f98a975884015f7647da303e67d03440685aaf70302fc20f34997b14bf8b5661d6b83fd291e181accf6829432ede259d122ad73f01ac67 libkdegames-18.08.3.tar.xz" +sha512sums="b4a15461c36feebd1e3d3ba4da15c59e9593763c5ce3604aab09eff3de735493384e34db410210104b105f981b18db89f9b65c7bee276e087d4434d975d48725 libkdegames-18.12.2.tar.xz" diff --git a/user/libkeduvocdocument/APKBUILD b/user/libkeduvocdocument/APKBUILD index aaac051a1..30d6d0bab 100644 --- a/user/libkeduvocdocument/APKBUILD +++ b/user/libkeduvocdocument/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkeduvocdocument -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Library for manipulating KVTML files" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9cec451a939414654efb559f38ed9a42ce673dd17e2af016408f60dd98d7b8cc4c08b75d8fce8c0d680637b123ec14c85a1a4a8c54f0c9617d4b8afa8baa9fd0 libkeduvocdocument-18.08.3.tar.xz" +sha512sums="d046fe802388fb275418341e894c6eb14d476a81566251e021ceeae0cf807778d6e1149054d9032214867b2427dbed1daab16442844b8e87fde9a30259e02bdb libkeduvocdocument-18.12.2.tar.xz" diff --git a/user/libkexiv2/APKBUILD b/user/libkexiv2/APKBUILD new file mode 100644 index 000000000..d9017d837 --- /dev/null +++ b/user/libkexiv2/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libkexiv2 +pkgver=18.12.1 +pkgrel=0 +pkgdesc="KDE integration with Exiv2 EXIF data library" +url="https://www.KDE.org/" +arch="all" +license="GPL-2.0+" +depends="" +depends_dev="qt5-qtbase-dev" +makedepends="$depends_dev cmake extra-cmake-modules exiv2-dev" +subpackages="$pkgname-dev" +source="https://download.kde.org/stable/applications/$pkgver/src/libkexiv2-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f89d105c4e081311851d649065640ed9b53761d8eaf273afc734a34dae52df9e834806a6d71299312f95e5c8267414efee1b30671b4469a1b6b604b0de90e6a0 libkexiv2-18.12.1.tar.xz" diff --git a/user/libkipi/APKBUILD b/user/libkipi/APKBUILD index 21062fdd6..740647ef5 100644 --- a/user/libkipi/APKBUILD +++ b/user/libkipi/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkipi -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="KDE Image Plugin Interface library" url="https://www.digikam.org/" @@ -36,4 +36,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6cda4e56e6c879471ffd8204ef13e817a8d34b8161c6bbe66dd898f02cf215a53df8537447f7dba3fd3a812e52d62a53dd423bf30fb2bb9cf76ae32a917e51f9 libkipi-18.08.3.tar.xz" +sha512sums="4c1e5541ef9446973532499d07adea683e11269efbb13542c9b2b78b9b66b03c419d2764b0497e02e690beb31c7cbe644920dc13690270425ce34f6a0ffc08c0 libkipi-18.12.2.tar.xz" diff --git a/user/libkleo/APKBUILD b/user/libkleo/APKBUILD index 8122014b2..658974ef1 100644 --- a/user/libkleo/APKBUILD +++ b/user/libkleo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkleo -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="KDE encryption library" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5bd2aac755e6dad05e05e1c49b83cccf8b349c9231533dc821b3ba1dcc4da3fb66f7e8aaaeebdd1c080a28d94b9646afb248b5bee44e3bec8447d1293dda5f10 libkleo-18.08.3.tar.xz" +sha512sums="06dba154a77df481678208c7b687c1b7b7664fbde971ba5b4f854bdcdc6ab6e1f09864b989da7c929fa1b56bae4042d37ed2d39b6d2eacfeda726cfc82e61839 libkleo-18.12.2.tar.xz" diff --git a/user/libkmahjongg/APKBUILD b/user/libkmahjongg/APKBUILD index 63386cd48..b99c26bf6 100644 --- a/user/libkmahjongg/APKBUILD +++ b/user/libkmahjongg/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libkmahjongg -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Library with Mah Jongg logic" url="https://www.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="655211a0e79d5671bfc9579a42c70f11c32b322ed987635ec1e2f35ed9a5e24ceea73619dfdb30db8d1c0b0e197314a2279947149819c812013bc3f51b86d15f libkmahjongg-18.08.3.tar.xz" +sha512sums="1a7a387ab7541ba78da302d97ba8c6350c1a974565bd2f99dadf10084e4a4bc0989d49d11b4715cdd436edfc89df08ea0fc3a7ed9c5c1672345f7f6a35bd5162 libkmahjongg-18.12.2.tar.xz" diff --git a/user/libksane/APKBUILD b/user/libksane/APKBUILD index 557d7f362..a46e557f6 100644 --- a/user/libksane/APKBUILD +++ b/user/libksane/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libksane -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="KDE scanning library" url="https://www.kde.org" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f2aae62e445d3cef43e2d974fd2fe080f0504ed4415b08427b65d4e863ab8e4284422c5607db987d80ec68ddc6b9fb28ad9c512fc50f2871f51f89d0d3e63d24 libksane-18.08.3.tar.xz" +sha512sums="4da3646241fc73be4ca28b3344a4e085a2f5fdfcb03900047207c2750ed1fecb9d3590a8b7ebf8a5178d504b2b2865dffd647a26c9475b9db382dacfd7f8d8f6 libksane-18.12.2.tar.xz" diff --git a/user/liblbxutil/APKBUILD b/user/liblbxutil/APKBUILD new file mode 100644 index 000000000..def4dc83c --- /dev/null +++ b/user/liblbxutil/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=liblbxutil +pkgver=1.1.0 +pkgrel=0 +pkgdesc="Utility library for X11 Low Bandwidth extension" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="xorgproto-dev zlib-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="93bdefef297d46a301dd1cab35ad186438e340822ba5aac20e9d8f4c51cd66e4118b0d9f4afc48ef33a67c6e413f551bcb59089d01597ed175b400902b9f23f4 liblbxutil-1.1.0.tar.bz2" diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD index 2669632bf..cf58ff16b 100644 --- a/user/liblxqt/APKBUILD +++ b/user/liblxqt/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=liblxqt -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Core LXQt library" url="https://lxqt.org" arch="all" @@ -11,7 +11,7 @@ license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev qt5-qttools-dev libxscrnsaver-dev libqtxdg-dev kwindowsystem-dev - polkit-qt-1-dev lxqt-build-tools>=0.5.0" + polkit-qt-1-dev lxqt-build-tools>=0.6.0" subpackages="$pkgname-dev" source="https://github.com/lxqt/liblxqt/releases/download/$pkgver/liblxqt-$pkgver.tar.xz" @@ -28,7 +28,6 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -38,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="17d6ab8aa7475e1d2ca90b9c3d8b0a438003f740fa878b09937e0214f0139b6f69eb833e7179e981260ae67079fd70c19423d1a4948a2a18061539fb2191e9ad liblxqt-0.13.0.tar.xz" +sha512sums="ed4009ae7a0f556c84131083946a62a8a91d66c12a75902e2841b7a8388cd93cd493e42674bbf34fe5d20f8d86685ad2ad197c0b2222d7a08558bc8a2946ca86 liblxqt-0.14.0.tar.xz" diff --git a/user/liblxqt/versioning.patch b/user/liblxqt/versioning.patch deleted file mode 100644 index 14d6eba24..000000000 --- a/user/liblxqt/versioning.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Nurd liblxqt-0.11.1/CMakeLists.txt liblxqt-0.11.1.new/CMakeLists.txt ---- liblxqt-0.11.1/CMakeLists.txt 2017-01-01 21:49:10.000000000 +0000 -+++ liblxqt-0.11.1.new/CMakeLists.txt 2017-10-11 17:31:00.502689492 +0000 -@@ -6,6 +6,11 @@ - set(QTXDG_MINIMUM_VERSION "2.0.0") - set(LXQTBT_MINIMUM_VERSION "0.3.1") - -+set(LXQT_MAJOR_VERSION 0) -+set(LXQT_MINOR_VERSION 11) -+set(LXQT_PATCH_VERSION 1) -+set(LXQT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PATCH_VERSION}) -+ - include(CMakePackageConfigHelpers) - include(GNUInstallDirs) # Standard directories for installation - diff --git a/user/libmodplug/APKBUILD b/user/libmodplug/APKBUILD new file mode 100644 index 000000000..23046bebe --- /dev/null +++ b/user/libmodplug/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libmodplug +pkgver=0.8.8.5 +pkgrel=0 +pkgdesc="Library for MOD music files" +url="http://modplug-xmms.sourceforge.net/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="https://downloads.sourceforge.net/modplug-xmms/libmodplug-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332 libmodplug-0.8.8.5.tar.gz" diff --git a/user/libmtp/APKBUILD b/user/libmtp/APKBUILD new file mode 100644 index 000000000..3f8e07b45 --- /dev/null +++ b/user/libmtp/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libmtp +pkgver=1.1.16 +pkgrel=0 +pkgdesc="Library for accessing MTP (Media Transfer Protocol) devices" +url="http://libmtp.sourceforge.net/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="libgcrypt-dev libusb-dev" +subpackages="$pkgname-dev" +source="https://downloads.sourceforge.net/libmtp/libmtp-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="0540271930c1c932c5d06dcdd30142d407a4fadd022b195e8339d614fa3ec9b050605bf013b28ac6451f4dfcddf7add949c928acb1382802ab5fd6311c1628a0 libmtp-1.1.16.tar.gz" diff --git a/user/libnftnl/APKBUILD b/user/libnftnl/APKBUILD new file mode 100644 index 000000000..432f60b07 --- /dev/null +++ b/user/libnftnl/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> +# Maintainer: multiplexd <multi@in-addr.xyz> +pkgname=libnftnl +pkgver=1.1.2 +pkgrel=0 +pkgdesc="Netfilter library providing interface to the nf_tables subsystem" +url="https://netfilter.org/projects/libnftnl" +arch="all" +license="GPL-2.0+" +makedepends="libmnl-dev" +subpackages="$pkgname-dev" +source="https://netfilter.org/projects/libnftnl/files/$pkgname-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir"/tests + make check # builds test binaries +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="808e0efd2ff32a65cca1e6113cc29aece1335364b94ad87438d19b0887d0bd34de11942fa411e4105ef153f2cce862ded17ebc441c413b839ac506471e530569 libnftnl-1.1.2.tar.bz2" diff --git a/user/libnice/APKBUILD b/user/libnice/APKBUILD new file mode 100644 index 000000000..15c544c34 --- /dev/null +++ b/user/libnice/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libnice +pkgver=0.1.15 +pkgrel=0 +pkgdesc="GLib-based Interactive Connectivity Establishment (ICE) library" +url="https://nice.freedesktop.org/wiki/" +arch="all" +license="MPL-1.1 AND LGPL-2.1-only" +depends="" +depends_dev="glib-dev" +makedepends="$depends_dev gobject-introspection-dev gstreamer-dev openssl-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://nice.freedesktop.org/releases/libnice-$pkgver.tar.gz + dont-error-on-socket-close.patch + " + +build() { + cd "$builddir" + LDFLAGS="-Wl,-z,stack-size=1048576" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-static + make +} + +check() { + cd "$builddir" + # multi-make causes test-drop-invalid test to fail + make -j1 check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="60a8bcca06c0ab300dfabbf13e45aeac2085d553c420c5cc4d2fdeb46b449b2b9c9aee8015b0662c16bd1cecf5a49824b7e24951a8a0b66a87074cb00a619c0c libnice-0.1.15.tar.gz +c81aff0f8a674315997f2ecc1f0cbc501b54d49c142949aee68af42aaccf2a2f61d5eb46ce8c123b05fb98c2cd5ef5751b9228783e5e221b12be06b805da0ad3 dont-error-on-socket-close.patch" diff --git a/user/libnice/dont-error-on-socket-close.patch b/user/libnice/dont-error-on-socket-close.patch new file mode 100644 index 000000000..458a86b02 --- /dev/null +++ b/user/libnice/dont-error-on-socket-close.patch @@ -0,0 +1,11 @@ +--- libnice-0.1.15/tests/test-pseudotcp.c.old 2018-10-21 07:25:59.000000000 +0000 ++++ libnice-0.1.15/tests/test-pseudotcp.c 2019-01-10 19:09:03.440000000 +0000 +@@ -161,7 +161,7 @@ + + static void closed (PseudoTcpSocket *sock, guint32 err, gpointer data) + { +- g_error ("Socket %p Closed : %d", sock, err); ++ g_debug ("Socket %p Closed : %d", sock, err); + } + + struct notify_data { diff --git a/user/libpwquality/APKBUILD b/user/libpwquality/APKBUILD new file mode 100644 index 000000000..8b0c98a81 --- /dev/null +++ b/user/libpwquality/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libpwquality +pkgver=1.4.0 +pkgrel=0 +pkgdesc="Password quality checking library" +url=" " +arch="all" +license="BSD-3-Clause OR GPL-2.0+" +depends="" +makedepends="cracklib-dev linux-pam-dev python3-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py3-pwquality:py3" +source="https://github.com/libpwquality/libpwquality/releases/download/libpwquality-$pkgver/libpwquality-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-pam \ + --with-python-binary=python3 + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +py3() { + pkgdesc="$pkgdesc (Python 3 bindings)" + depends="python3" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ +} + +sha512sums="b8049f8b71bbfd4d345dbd4c4cffd29e9029b0fca4c95527af54d11a3b06e4708236b630df6c66738368298679c96cb3bf26b1b5d95cb3c5f7e1073cab8a98d9 libpwquality-1.4.0.tar.bz2" diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD index e49fb0742..7fa245f54 100644 --- a/user/libqtxdg/APKBUILD +++ b/user/libqtxdg/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libqtxdg -pkgver=3.2.0 -pkgrel=1 +pkgver=3.3.0 +pkgrel=0 pkgdesc="Qt5-based library implementing the XDG spec" url="https://lxqt.org" arch="all" @@ -23,7 +23,7 @@ build() { -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" \ -DBUILD_TESTS=True \ @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="1a52e79e97cd148c9f406402134d6feaa6ccb8d10cfa7c0e2a3fbf728690e193c05e444012b87e38790ce0570d1cf71c6c2cee7105f11d43923040543e0dd143 libqtxdg-3.2.0.tar.xz" +sha512sums="e71e251870886aa71a1ce9372962cfa93c96ee91518f01758b4c015d36d1f4c95bf94eb8a54683bb2ab221c96514be4adb0387e18dcbaacde9d783fe9e6867d4 libqtxdg-3.3.0.tar.xz" diff --git a/user/libraw/APKBUILD b/user/libraw/APKBUILD new file mode 100644 index 000000000..0318fcd26 --- /dev/null +++ b/user/libraw/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libraw +pkgver=0.19.2 +pkgrel=0 +pkgdesc="Read RAW image files from digital cameras" +url="https://www.libraw.org/" +arch="all" +license="LGPL-2.1-only OR CDDL-1.0" +depends="" +makedepends="jasper-dev lcms2-dev libjpeg-turbo-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://www.libraw.org/data/LibRaw-$pkgver.tar.gz" +builddir="$srcdir/LibRaw-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="163b783f26887219d02694c6ca7cdc5571b15efe3922f7e3ca122a875568bd060c40a364451ea94af44c2ae48705bf96cbef196c7e935e42efe6ee316bb291fa LibRaw-0.19.2.tar.gz" diff --git a/user/libsass/APKBUILD b/user/libsass/APKBUILD new file mode 100644 index 000000000..b96567340 --- /dev/null +++ b/user/libsass/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libsass +pkgver=3.5.5 +pkgrel=0 +pkgdesc="Library for preprocessing CSS" +url="http://sass-lang.com/libsass" +arch="all" +options="!check" # Tests require sassc, which requires this library. +license="MIT" +depends="" +# There is no .so symlink in the -dev package. +depends_dev="$pkgname=$pkgver-r$pkgrel" +makedepends="" +subpackages="$pkgname-dev" +source="libsass-$pkgver.tar.gz::https://github.com/sass/libsass/archive/$pkgver.tar.gz" + +build() { + cd "$builddir" + make BUILD="shared" +} + +package() { + cd "$builddir" + mkdir -p "$pkgdir" + make BUILD="shared" PREFIX="/usr" DESTDIR="$pkgdir" install +} + +sha512sums="dcb73a5080c00023b60a19ea037ba5af481253a7b47492bd7114bf45ab78ed931c7b207fa8f12ed200a39760553d72ae92dbe4eb80b826b59a6201fb34008fe5 libsass-3.5.5.tar.gz" diff --git a/user/libsecret/APKBUILD b/user/libsecret/APKBUILD new file mode 100644 index 000000000..4fc79e95b --- /dev/null +++ b/user/libsecret/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libsecret +pkgver=0.18.7 +pkgrel=0 +pkgdesc="Library for storing and retrieving passphrases" +url="https://wiki.gnome.org/Projects/Libsecret" +arch="all" +options="!check" # Test suites require DBus-Python. +license="LGPL-2.1+ AND LGPL-2.0+" +depends="" +makedepends="docbook-xsl glib-dev gobject-introspection-dev libgcrypt-dev + libxslt" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://ftp.acc.umu.se/pub/gnome/sources/libsecret/0.18/libsecret-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="a8890ec52dcfba585fd665ee89e81f4a1d6a04b67bcf4f3422f27973a4ef6fc1281bf54e92160d39dd696ae08a633bab5fe25c1124baf32eb5b414e98ddfa084 libsecret-0.18.7.tar.xz" diff --git a/user/libsigc++/APKBUILD b/user/libsigc++/APKBUILD new file mode 100644 index 000000000..624c2d4bc --- /dev/null +++ b/user/libsigc++/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=libsigc++ +pkgver=2.10.1 +pkgrel=0 +pkgdesc="Library for type-safe callbacks in C++" +url="https://libsigcplusplus.github.io/libsigcplusplus/" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e2bd7b1a97019be010dee1594271bbf7cae92b28e31dcb3c6d7d60643a0996233f0a75a9337b4afcb5b7dc453bfc3159d82f6daacfbcd8993a39ccecaf811bb2 libsigc++-2.10.1.tar.xz" diff --git a/user/libspectre/APKBUILD b/user/libspectre/APKBUILD new file mode 100644 index 000000000..2e43f6abc --- /dev/null +++ b/user/libspectre/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libspectre +pkgver=0.2.8 +pkgrel=0 +pkgdesc="Library for rendering PostScript documents" +url="https://www.freedesktop.org/wiki/Software/libspectre/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="cairo-dev gnu-ghostscript-dev" +subpackages="$pkgname-dev" +source="https://libspectre.freedesktop.org/releases/libspectre-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86 libspectre-0.2.8.tar.gz" diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD index 712c843a7..3bf73d5d6 100644 --- a/user/libsysstat/APKBUILD +++ b/user/libsysstat/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libsysstat -pkgver=0.4.1 -pkgrel=1 +pkgver=0.4.2 +pkgrel=0 pkgdesc="Library for querying system information & statistics" url="https://lxqt.org" arch="all" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e0f6497be9a7205b6053cdae0fcd88d8b4723489ca97f1ed2cf6704cae149abc3f3339c777aca638abb054e171c6e592b5a10c129aff0a1f42083bd91ab11eb5 libsysstat-0.4.1.tar.xz" +sha512sums="9059b9d20edbb7ecd89e722b48c6603b8042030ffad06d3eac167bb518691c2733d314649dc4c42a839d4812c7b65dcd043a13a6bd5b56678da112a8065717df libsysstat-0.4.2.tar.xz" diff --git a/user/libtirpc/APKBUILD b/user/libtirpc/APKBUILD index 64124563a..5231ff63d 100644 --- a/user/libtirpc/APKBUILD +++ b/user/libtirpc/APKBUILD @@ -3,7 +3,7 @@ pkgname=libtirpc pkgver=1.1.4 pkgrel=1 pkgdesc="Transport Independent RPC library (SunRPC replacement)" -url="http://libtirpc.sourceforge.net/" +url="https://sourceforge.net/projects/libtirpc/" arch="all" options="!check" # No test suite. license="BSD-3-Clause" diff --git a/user/libtommath/APKBUILD b/user/libtommath/APKBUILD new file mode 100644 index 000000000..41e3a1ea1 --- /dev/null +++ b/user/libtommath/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libtommath +pkgver=1.1.0_rc1 +pkgrel=0 +pkgdesc="Theoretic multiple-precision integer library" +url="https://www.libtom.net/LibTomMath/" +arch="all" +license="Unlicense" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="https://github.com/libtom/libtommath/releases/download/v${pkgver/_/-}/ltm-${pkgver/_/-}.tar.xz" +builddir="$srcdir/$pkgname-${pkgver/_/-}" + +build() { + cd "$builddir" + make PREFIX=/usr -f makefile.shared +} + +check() { + cd "$builddir" + make PREFIX=/usr -f makefile.shared test_standalone +} + +package() { + cd "$builddir" + make PREFIX=/usr DESTDIR="$pkgdir" -f makefile.shared install +} + +sha512sums="4cee5d59cd2eaf14591ee280dcdcdd5915f38584b7259b5752e7316cd1a9966f1c969ee3b64d136ae7044c5834cfc8c781db300ede503ec2e657083de3692fd2 ltm-1.1.0-rc1.tar.xz" diff --git a/user/libuninameslist/APKBUILD b/user/libuninameslist/APKBUILD new file mode 100644 index 000000000..1deffebdc --- /dev/null +++ b/user/libuninameslist/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libuninameslist +pkgver=20180701 +pkgrel=0 +pkgdesc="Library of Unicode names and annotation data" +url=" " +arch="all" +license="BSD-3-Clause" +depends="" +makedepends="python3-dev" +subpackages="$pkgname-dev $pkgname-doc py3-uninameslist:py3:noarch" +source="https://github.com/fontforge/libuninameslist/releases/download/$pkgver/libuninameslist-dist-$pkgver.tar.gz" + +build() { + cd "$builddir" + PYTHON=python3 ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +py3() { + pkgdesc="$pkgdesc (Python 3 bindings)" + depends="python3" + cd "$builddir"/py + python3 setup.py install --prefix=/usr --root="$subpkgdir" +} + +sha512sums="839f8a0c3a81b4b19ce6ddfa08fa9ca99fdcefe2ef2b2c5515b276fab594fb5325ae9c83b58e19c559c033e880bd098687022c8ec3da028b143f4a72c471f19c libuninameslist-dist-20180701.tar.gz" diff --git a/user/libwebp/APKBUILD b/user/libwebp/APKBUILD index 7970ad4ef..8af3e8313 100644 --- a/user/libwebp/APKBUILD +++ b/user/libwebp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com> # Maintainer: pkgname=libwebp -pkgver=1.0.1 +pkgver=1.0.2 pkgrel=0 pkgdesc="Libraries for working with WebP images" url="https://developers.google.com/speed/webp/" @@ -42,4 +42,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="44e0c278b4569c03c39a1e047bccd7b4270bda12feae0dadc54f8a61fd6a66be011229f1e7e853f64749bcd9ea9e8146989e2b632459b67a4aaea4a8033a1361 libwebp-1.0.1.tar.gz" +sha512sums="e095b8fdf0096395daf12892b3b74c472868e727f23640ba7aa5922a5a028b778a6a60d8a94f696f6c0ca49577dfc9a0b599ecb74ad831ade48c6db812b71d2e libwebp-1.0.2.tar.gz" diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD index c3d89fd43..d722a9c53 100644 --- a/user/libwnck/APKBUILD +++ b/user/libwnck/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=libwnck -pkgver=3.24.1 +pkgver=3.30.0 +_pkgmaj=${pkgver%.*} pkgrel=0 pkgdesc="Window navigator construction kit library from Gnome" url="https://gnome.org" @@ -10,9 +11,7 @@ license="LGPL-2.0+" makedepends="glib-dev gtk+3.0-dev gobject-introspection-dev vala-dev startup-notification-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/libwnck/3.24/libwnck-$pkgver.tar.xz" -sha512sums="e8a31ab2dc0c282f1e0994ce6a2ccd18678dc5c140943399262e795052b7f5da2d6a5d388a74f4b10f8fac66ab138983a9caaee4e72c92a17c01ca5c39b731e1 libwnck-3.24.1.tar.xz" -builddir="$srcdir/libwnck-$pkgver" +source="https://download.gnome.org/sources/libwnck/$_pkgmaj/libwnck-$pkgver.tar.xz" build() { cd "$builddir" @@ -36,3 +35,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="79842e4645de828941ac030eeff9d232b18a51fe0d18baf5ceb2beaf897d328ee5bf3b297501e2b27e66c63d42f6546a7605a37c6d7d52ff76e9b2bc5c328128 libwnck-3.30.0.tar.xz" diff --git a/user/libxfont/APKBUILD b/user/libxfont/APKBUILD new file mode 100644 index 000000000..918cbc02e --- /dev/null +++ b/user/libxfont/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=libxfont +pkgver=1.5.4 +pkgrel=0 +pkgdesc="X11 Font library" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xtrans" +makedepends="freetype-dev libfontenc-dev util-macros xmlto xorgproto-dev" +subpackages="$pkgname-dev" +source="https://www.x.org/releases/individual/lib/libXfont-$pkgver.tar.bz2" +builddir="$srcdir/libXfont-$pkgver" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="864edbaff45c44bd92bc4b06275c73fdf584a9b88bc523a297d4c75c01ca253f438463e929af70d753ddecfa648bb0b9bcf0ec72267db9f2b1704f7afa906cb3 libXfont-1.5.4.tar.bz2" diff --git a/user/listres/APKBUILD b/user/listres/APKBUILD new file mode 100644 index 000000000..987002899 --- /dev/null +++ b/user/listres/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=listres +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Tool to list Xt resources" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxaw-dev libxmu-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/listres-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="925bceab6ff96fcf91f58ba2f858905d6e2eff7074ba29cfc02def7c19fb493545837884f1070dc004422451f749cd459000c01e8c9bb51a7cce7f7ab4067b8a listres-1.0.4.tar.bz2" diff --git a/user/lmdb/APKBUILD b/user/lmdb/APKBUILD index 149173dca..d59738f6e 100644 --- a/user/lmdb/APKBUILD +++ b/user/lmdb/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Olivier Mauras <olivier@mauras.ch> # Maintainer: pkgname=lmdb -pkgver=0.9.22 +pkgver=0.9.23 pkgrel=0 pkgdesc="Lightning Memory-Mapped Database" url="http://symas.com/mdb/" @@ -32,5 +32,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr } -sha512sums="49afca13b9683ed571c274380bb5e111236903b12d19bcb8781d6bbc00f711766b0d62de0b36536c85309cc9ff9e9d0aaa708e27bae9be6cfcaed8ba91e5545d LMDB_0.9.22.tar.gz +sha512sums="47466a96ce288d18d489acf1abf811aa973649848a4cac31f71e1f25ea781a055ebd6616d2d630214b2df2f146f12609c82d65be0196f49d6b46a6c96464e120 LMDB_0.9.23.tar.gz 151022cad94d2138146e3cd36622171f07fb03cc66d116ac9ce766c61a8b1aa65b521bfda88b27456204f53ecd430bdeddb4d7786956a12ed0cd53f8323ffd03 lmdb_make.patch" diff --git a/user/lohit-ttf/APKBUILD b/user/lohit-ttf/APKBUILD new file mode 100644 index 000000000..9b464c39e --- /dev/null +++ b/user/lohit-ttf/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=lohit-ttf +pkgver=20140220 +pkgrel=0 +pkgdesc="Indian typefaces from Red Hat" +url="https://pagure.io/lohit" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://releases.pagure.org/lohit/lohit-ttf-$pkgver.tar.gz" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="b622be55e16a8ccbad0d2fc6e546c072e0af1954a36095a00f31e09e6dd80e86e98a36f4a4a7b8adf21a3f380f816e6fe77ef2e61f15521abfd9f7f4b8c06cbc lohit-ttf-20140220.tar.gz" diff --git a/user/lskat/APKBUILD b/user/lskat/APKBUILD index 5e5ae4ab4..bc2c95c5c 100644 --- a/user/lskat/APKBUILD +++ b/user/lskat/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lskat -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Lieutenant Skat is an interactive two-player card game" url="https://games.kde.org/game.php?game=lskat" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a5c1407cb2b53ae3e8621c5f44da8e6868f7a1f1db1b62b9c904a657249bc01f5ebc8a550f66161c7b022a87317e8bd91e35b81560802cba8fcd1d6b16b7a6f6 lskat-18.08.3.tar.xz" +sha512sums="ab64d36fbbe7e4aa2cc35a6226a932b85da7fbe7cdbb544a47caafd29b8d6ba2ac512cd0444251cc8631d8c5021d9fef254c39830c72db6738ea304723437c63 lskat-18.12.2.tar.xz" diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD new file mode 100644 index 000000000..3a536a7bd --- /dev/null +++ b/user/luarocks/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=luarocks +pkgver=3.0.4 +pkgrel=0 +pkgdesc="Package manager for Lua software" +url="https://luarocks.org/" +arch="noarch" +options="!check" # No test suite +license="MIT" +depends="" +makedepends="lua5.3-dev" +source="https://luarocks.github.io/luarocks/releases/luarocks-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --lua-version=5.3 \ + --rocks-tree=/usr/share/lua/5.3 + make build +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="65a28f0dca4fc45a0ee413493d0e4287de9c495b27c0366d955a16d03adf94b36cb9dbeda00fb74045809eb5048b78ea5158257b5ddafa924dc8ff0f017e95f8 luarocks-3.0.4.tar.gz" diff --git a/user/luit/APKBUILD b/user/luit/APKBUILD new file mode 100644 index 000000000..09e135e12 --- /dev/null +++ b/user/luit/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=luit +pkgver=1.1.1 +pkgrel=0 +pkgdesc="Filter for UTF-8 X11 terminals" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libfontenc-dev libx11-dev util-macros" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e834e89fca9987f6d82701f53d3c450cc64b93a804b11465b4a7ec5cb3a5c4ef30115df57dec3cbdbafa46e4a4f1bb4759b723123e2ff2f6b1c12207015638e6 luit-1.1.1.tar.bz2" diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD index 3114ab033..8a769e1dd 100644 --- a/user/lximage-qt/APKBUILD +++ b/user/lximage-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lximage-qt -pkgver=0.7.0 +pkgver=0.14.0 pkgrel=0 pkgdesc="Image viewer and screenshot tool for LXQt" url="https://lxqt.org/" @@ -9,8 +9,8 @@ arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.5.0 libexif-dev - libfm-qt-dev>=0.12.0 qt5-qtx11extras-dev qt5-qttools-dev qt5-qtsvg-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 libexif-dev + libfm-qt-dev>=${pkgver%.*}.0 qt5-qtx11extras-dev qt5-qttools-dev qt5-qtsvg-dev kwindowsystem-dev" source="https://github.com/lxqt/lximage-qt/releases/download/$pkgver/lximage-qt-$pkgver.tar.xz" @@ -27,7 +27,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -42,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a31185562dec1aa720287ab3f9fb79b9bccfcf0f2069aa404bd469852edbe2507f8c24cf8af0cbe2ef7013e4dab8ca51c00ac7a348254f1bf20458decd3c82b4 lximage-qt-0.7.0.tar.xz" +sha512sums="fddf4656f9112e02bb208b7c327d8f1a40326c1b5c9bff1cbd65909e808652c81dcdf5d2b9cf9cffd03c9e82b4980b498337afcb8fb1ee32ca7a7814ef268a0d lximage-qt-0.14.0.tar.xz" diff --git a/user/lximage-qt/lximage-qt-0.5.1-const-iterator-fix.patch b/user/lximage-qt/lximage-qt-0.5.1-const-iterator-fix.patch deleted file mode 100644 index 0a6d20307..000000000 --- a/user/lximage-qt/lximage-qt-0.5.1-const-iterator-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 988a5f40479c23984853fe485a24d356a91343b8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= <luis.artur.pereira@gmail.com> -Date: Tue, 17 Jan 2017 17:39:53 +0000 -Subject: [PATCH] Use const iterators - -Avoid assignment of a non-const pointer to a const pointer and the -consequent container detach. ---- - src/preferencesdialog.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp -index 123345c..c35183b 100644 ---- a/src/preferencesdialog.cpp -+++ b/src/preferencesdialog.cpp -@@ -111,7 +111,7 @@ void PreferencesDialog::initIconThemes(Settings& settings) { - - iconThemes.remove("hicolor"); // remove hicolor, which is only a fallback - QHash<QString, QString>::const_iterator it; -- for(it = iconThemes.begin(); it != iconThemes.end(); ++it) { -+ for(it = iconThemes.constBegin(); it != iconThemes.constEnd(); ++it) { - ui.iconTheme->addItem(it.value(), it.key()); - } - ui.iconTheme->model()->sort(0); // sort the list of icon theme names diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD index 4ae9014dc..862d3e0fb 100644 --- a/user/lxqt-about/APKBUILD +++ b/user/lxqt-about/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-about -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Dialog window providing information about LXQt and the running system" url="https://lxqt.org" arch="all" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev - lxqt-build-tools>=0.5.0 liblxqt-dev>=0.12.0" + lxqt-build-tools>=0.6.0 liblxqt-dev>=${pkgver%.*}.0" source="https://github.com/lxqt/lxqt-about/releases/download/$pkgver/lxqt-about-$pkgver.tar.xz" build() { @@ -26,7 +26,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -36,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5ba1106a66115f791597b12173be5b8f340c275e21ee53acd77aa7f10c409ad9b0bb83e24479fba6ff4265e6261ba90dde98ce10331b00fc01e87196fa506214 lxqt-about-0.13.0.tar.xz" +sha512sums="a2dac75f34c91b24de0d6783cb8441caa81a4918a92901b29056fcc7aeb91a6f3209874ab278f801e5359b3894b5e359d7e743126187e7e0383d470680acb010 lxqt-about-0.14.0.tar.xz" diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD index 82d09ca6f..4403887b8 100644 --- a/user/lxqt-admin/APKBUILD +++ b/user/lxqt-admin/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-admin -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Administrative tools for LXQt" url="https://lxqt.org" arch="all" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="LGPL-2.1+" depends="lxqt-policykit" makedepends="cmake extra-cmake-modules qt5-qttools-dev kwindowsystem-dev - lxqt-build-tools>=0.5.0 liblxqt-dev polkit-qt-1-dev" + lxqt-build-tools>=0.6.0 liblxqt-dev>=${pkgver%.*}.0 polkit-qt-1-dev" source="https://github.com/lxqt/lxqt-admin/releases/download/$pkgver/lxqt-admin-$pkgver.tar.xz" build() { @@ -26,7 +26,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -36,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc84f2cffd28ea87833194b36654016d426c3b0e7a468468568f35153b208129d504200b31c17516298444882bc54ad7e3bc1cbef2b67459515eaac3dc77dea7 lxqt-admin-0.13.0.tar.xz" +sha512sums="d5fcf91d3af94294f586e11bd43da03a6834314099a1d258b11153a8b86c4a87908eaeb68e5cb0b2cfa111bd6f82681680ac8f82298bbf781ffc1dd6e15ae392 lxqt-admin-0.14.0.tar.xz" diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD index 066149647..1447fdee0 100644 --- a/user/lxqt-build-tools/APKBUILD +++ b/user/lxqt-build-tools/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-build-tools -pkgver=0.5.0 -pkgrel=1 +pkgver=0.6.0 +pkgrel=0 pkgdesc="Toolchain for building and packaging LXQt" url="https://lxqt.org" arch="noarch" @@ -35,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="199d8999d6b9738f1985a96ac3177f021802ab8896450c248bf6e545162a237ddb26949a09588925423a0609fc89d06f729b428030290b3259b8b8c505c71139 lxqt-build-tools-0.5.0.tar.gz" +sha512sums="701b2f239daeb72dd94e2d72920e85e161daeb35de24023d81bb271c3abf36916d83b4b47b046e400e865e71ee236cbfc0a7047f9b0a3529cd9b8363279fb88a lxqt-build-tools-0.6.0.tar.gz" diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD index 7837fffc6..607bb18f6 100644 --- a/user/lxqt-config/APKBUILD +++ b/user/lxqt-config/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-config -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Collection of tools for configuring LXQt and the underlying system" url="https://lxqt.org" arch="all" @@ -10,8 +10,9 @@ options="!check" # No test suite. license="LGPL-2.1+" depends="" makedepends="cmake extra-cmake-modules qt5-qtsvg-dev qt5-qttools-dev - liblxqt-dev>=0.12.0 lxqt-build-tools>=0.5.0 libxcursor-dev - kwindowsystem-dev libkscreen-dev" + liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=0.6.0 libxcursor-dev eudev-dev + kwindowsystem-dev libkscreen-dev xf86-input-libinput-dev libxi-dev" +subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-config/releases/download/$pkgver/lxqt-config-$pkgver.tar.xz" build() { @@ -26,8 +27,6 @@ build() { -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ - -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make -j1 } @@ -42,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a5102794c4cf18a18e633cbc7d0b89653abf2612bc61e506ec169f4898903092f5201a09a2610642c641a17b59a992a6d6f59366ec61d54763e8b911d5220ca9 lxqt-config-0.13.0.tar.xz" +sha512sums="6b2139a4fc33940f0821c335b3ff316065133eec867256586643fabeb7e96c61be70932d16f6ec4b440e99d058b31394ddc4013a059b492925135aa6eae20650 lxqt-config-0.14.0.tar.xz" diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD index 9fea365ab..1e527d23c 100644 --- a/user/lxqt-globalkeys/APKBUILD +++ b/user/lxqt-globalkeys/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-globalkeys -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Daemon and configuration utility for global shortcuts in 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.5.0 liblxqt-dev - qt5-qttools-dev kwindowsystem-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 + liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/lxqt-globalkeys/releases/download/$pkgver/lxqt-globalkeys-$pkgver.tar.xz" @@ -27,7 +27,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -42,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="5350e91a03fa6928ecefb935302fe87bfa38e6f61bea564222739f4f2896ffab85304d7c0afe6dbfc78912e944c25f32892f35bfb08a904395fda24b9d58b3ad lxqt-globalkeys-0.13.0.tar.xz" +sha512sums="2005e7f034e28eb295352825f95066163f2aac1f558066f765a6ab8692fd17b8750ac16f7ec3b25384410f0e41e0a6fe43d88f102d3e84dad44ae6f71eb62f87 lxqt-globalkeys-0.14.0.tar.xz" diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD index ffa4ae6bf..6c6e48df5 100644 --- a/user/lxqt-notificationd/APKBUILD +++ b/user/lxqt-notificationd/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-notificationd -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Daemon for notifications in LXQt" url="https://lxqt.org" arch="all" license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=0.12.0 - lxqt-build-tools>=0.5.0 kwindowsystem-dev" +makedepends="cmake extra-cmake-modules qt5-qttools-dev liblxqt-dev>=${pkgver%.*}.0 + lxqt-build-tools>=0.6.0 kwindowsystem-dev" source="https://github.com/lxqt/lxqt-notificationd/releases/download/$pkgver/lxqt-notificationd-$pkgver.tar.xz" build() { @@ -25,7 +25,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -40,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2bc75b840a666e013d914f08719680cf3af7430a6acfb5072facff8bdc964aeef1d5227c68b5a5c5d8a6d6c572632105e3f2f04c517d8e8669eb40b5a0cf0f4d lxqt-notificationd-0.13.0.tar.xz" +sha512sums="b91f0fc159f979582d1483a020c27403157697232e15ac677ff725297f33a89e2df5d63b90bc3711bcf9c8fe1ad58793518ab116f4a9c47f8102dfa256fa4747 lxqt-notificationd-0.14.0.tar.xz" diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD index 53895e9bb..88583c848 100644 --- a/user/lxqt-openssh-askpass/APKBUILD +++ b/user/lxqt-openssh-askpass/APKBUILD @@ -1,16 +1,17 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-openssh-askpass -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Graphical LXQt utility for inputting passwords for SSH agents" url="https://lxqt.org" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules qt5-qttools-dev lxqt-build-tools>=0.5.0 - liblxqt-dev>=0.12.0 kwindowsystem-dev" +makedepends="cmake extra-cmake-modules qt5-qttools-dev lxqt-build-tools>=0.6.0 + liblxqt-dev>=${pkgver%.*}.0 kwindowsystem-dev" +subpackages="$pkgname-doc" source="https://github.com/lxde/lxqt-openssh-askpass/releases/download/$pkgver/lxqt-openssh-askpass-$pkgver.tar.xz" build() { @@ -26,7 +27,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2ef92c8a75139d8827e38e0f406f9f9f52717b0918ff511baa376825cfb586f2821186692e1e63bd4c569c441ea4eff63a11f59b89a90f47738ece86a898e761 lxqt-openssh-askpass-0.13.0.tar.xz" +sha512sums="33cca606224fb4490261ae68134e5ae8a4561878b34f6f270bdb6c6b2727ecd8cd2aa3284599ac71eaa5a9fda0be491ed9ff224b65ecfe6af4a992a32740aca4 lxqt-openssh-askpass-0.14.0.tar.xz" diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD index d0108ab92..d8ded9345 100644 --- a/user/lxqt-panel/APKBUILD +++ b/user/lxqt-panel/APKBUILD @@ -1,18 +1,18 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-panel -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Panel for LXQt desktop" url="https://lxqt.org" arch="all" license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.5.0 kguiaddons-dev +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 kguiaddons-dev libdbusmenu-qt-dev kwindowsystem-dev solid-dev menu-cache-dev - lxmenu-data liblxqt-dev lxqt-globalkeys-dev alsa-lib-dev pulseaudio-dev - lm_sensors-dev libstatgrab-dev libsysstat-dev qt5-qttools-dev - libxkbcommon-dev libxcomposite-dev" + lxmenu-data liblxqt-dev>=${pkgver%.*}.0 alsa-lib-dev pulseaudio-dev + lxqt-globalkeys-dev>=${pkgver%.*}.0 lm_sensors-dev libstatgrab-dev + libsysstat-dev qt5-qttools-dev libxkbcommon-dev libxcomposite-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-panel/releases/download/$pkgver/lxqt-panel-$pkgver.tar.xz" @@ -29,7 +29,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -44,4 +43,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f9ea21a24aa8fc0898c756349256a9a84f4e8469743383ce4372f5ab3719170c84ec731d661f7b3355b7501f16fa862ef9d64b7b346e8abd4cbceb547fcb18e3 lxqt-panel-0.13.0.tar.xz" +sha512sums="771383c2bade7f5928d2a206b7a148afd7427a574e875c3129135c8cc4b08a77f8ab1ce469e1b1ee1902d984c17605b62f2f7aacac2ca415c9021b314d18dfe3 lxqt-panel-0.14.0.tar.xz" diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD index 402acef73..0d1b582a4 100644 --- a/user/lxqt-policykit/APKBUILD +++ b/user/lxqt-policykit/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-policykit -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="PolicyKit agent for 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>=0.12.0 - lxqt-build-tools>=0.5.0 qt5-qttools-dev kwindowsystem-dev - polkit-qt-1-dev" +makedepends="cmake extra-cmake-modules qt5-qttools-dev polkit-qt-1-dev + liblxqt-dev>=${pkgver%.*}.0 lxqt-build-tools>=0.6.0 qt5-qttools-dev + kwindowsystem-dev" +subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-policykit/releases/download/$pkgver/lxqt-policykit-$pkgver.tar.xz" build() { @@ -27,7 +28,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c02525ed60c3882b9fc431630a750937425f8ff296fa82112a2e88cb9d5b96767e2a8ff514daeee5d6dded96536cbb4520bc7bccb6c8fbe4e405168435f9f22e lxqt-policykit-0.13.0.tar.xz" +sha512sums="d5dc85a70db2b041f4667b17b1c20b7e30d36b435a64eaef0c49577da1a7d981becdb9f94f135901affe1b4d1c0ac8f8fc180f3054472b0b043c9b9382015b42 lxqt-policykit-0.14.0.tar.xz" diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD index 0e441e627..2fee9bdf2 100644 --- a/user/lxqt-powermanagement/APKBUILD +++ b/user/lxqt-powermanagement/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-powermanagement -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Power management utilities for LXQt" url="https://lxqt.org" arch="all" license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.5.0 liblxqt-dev - upower-dev kidletime-dev qt5-qtsvg-dev qt5-qttools-dev solid-dev - kwindowsystem-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 upower-dev + liblxqt-dev>=${pkgver%.*}.0 kidletime-dev qt5-qtsvg-dev qt5-qttools-dev + solid-dev kwindowsystem-dev" source="https://github.com/lxqt/lxqt-powermanagement/releases/download/$pkgver/lxqt-powermanagement-$pkgver.tar.xz" build() { @@ -26,7 +26,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -41,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="849bcd0739e30b0450d358e23edb9bf800e3804e0929d78d9d08c640355b6eb9351df458025fc381215734690ea902ec1896f5e070fd19ad006520148233d77d lxqt-powermanagement-0.13.0.tar.xz" +sha512sums="a2a93f69a1c87e98a200fc4a8c9ffdc990ea1545ff3494948bf40cc2e80fe9b3260e25ffdacf7b5925c3c76f85acd67c79936fe1c2bcd56eb2a91f95451ee240 lxqt-powermanagement-0.14.0.tar.xz" diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD index 3749214d5..ae0a30b03 100644 --- a/user/lxqt-qtplugin/APKBUILD +++ b/user/lxqt-qtplugin/APKBUILD @@ -1,15 +1,16 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-qtplugin -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Qt plugin for platform integration with LXQt" url="https://lxqt.org/" arch="all" license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.5.0 libfm-qt-dev - libdbusmenu-qt-dev liblxqt-dev qt5-qttools-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 qt5-qttools-dev + libfm-qt-dev>=${pkgver%.*}.0 liblxqt-dev>=${pkgver%.*}.0 + libdbusmenu-qt-dev" source="https://github.com/lxqt/lxqt-qtplugin/releases/download/$pkgver/lxqt-qtplugin-$pkgver.tar.xz" build() { @@ -25,7 +26,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="22f059accdca8216b80af8773eab462c779c489575aa7802e82bb95da4f22a9a0d5a1234b2da4cb39c5050a6e9ded3c2b977068cc37af356ecb09e364633c7d6 lxqt-qtplugin-0.13.0.tar.xz" +sha512sums="33188bc03ee48a9b6e3cc5823cdcb5c96dba0cda65da511fe603d952c5de24e292cb02208cf357b04718df90f98d53bf48eaf6793d70d043214e429f57ccf53c lxqt-qtplugin-0.14.0.tar.xz" diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD index 4073fa9f2..403ab02d5 100644 --- a/user/lxqt-runner/APKBUILD +++ b/user/lxqt-runner/APKBUILD @@ -1,16 +1,18 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-runner -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Qt-based application launcher for LXQt" url="https://lxqt.org" arch="all" license="LGPL-2.1+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.5.0 liblxqt-dev - muparser-dev kwindowsystem-dev menu-cache-dev lxqt-globalkeys-dev - qt5-qttools-dev qt5-qtsvg-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 + liblxqt-dev>=${pkgver%.*}.0 lxqt-globalkeys-dev>=${pkgver%.*}.0 + muparser-dev kwindowsystem-dev menu-cache-dev qt5-qttools-dev + qt5-qtsvg-dev" +subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-runner/releases/download/$pkgver/lxqt-runner-$pkgver.tar.xz" build() { @@ -26,7 +28,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -41,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fed007134f252f10d215266005a03354f70960cbe77ad37bb00db27e0054b0c508e5dd15a07630525b134c2ecb7db2e36f6304c9cbff60dcf4c3831dd31641c7 lxqt-runner-0.13.0.tar.xz" +sha512sums="862af180efbfa9be699bec16c6ab72520546922947e20465759bb1194ae3014459672ecd201a58e9e770828e2558b80a68b719afb9a71d7cb292beb614568970 lxqt-runner-0.14.0.tar.xz" diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD index 72cfb3e12..5811282c1 100644 --- a/user/lxqt-session/APKBUILD +++ b/user/lxqt-session/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-session -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Session management utilities for LXQt" url="https://lxqt.org" arch="all" license="LGPL-2.1+" depends="xdg-user-dirs" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.5.0 eudev-dev - liblxqt-dev>=0.12.0 qt5-qttools-dev kwindowsystem-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 eudev-dev + liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxde/lxqt-session/releases/download/$pkgver/lxqt-session-$pkgver.tar.xz" @@ -26,7 +26,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -43,4 +42,4 @@ package() { rm "$pkgdir"/usr/share/man/man1/start* } -sha512sums="3ab6161ee75340f823ec82d20ead9eacf7441fd675e2f8a295fc301187e027013c8a2a4e7ca1262795e9b07d3231dbab032363cadde3bf334865260142529316 lxqt-session-0.13.0.tar.xz" +sha512sums="583a6249734571624ecf51d23b4f7b01caa601e1e776f3acb8b8f4d884e714c1664b95fa18bb4c420fe7ad208e2ffac9d942fc2196945e3df0fd3cc2027f6138 lxqt-session-0.14.0.tar.xz" diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD index bae390411..23f12c7b1 100644 --- a/user/lxqt-sudo/APKBUILD +++ b/user/lxqt-sudo/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-sudo -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Graphical LXQt utility for sudo/su" url="https://lxqt.org" arch="all" options="!check" # No test suite. license="LGPL-2.1+" depends="sudo" -makedepends="cmake extra-cmake-modules qt5-qtbase-dev lxqt-build-tools>=0.5.0 - liblxqt-dev>=0.12.0 qt5-qttools-dev kwindowsystem-dev" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev lxqt-build-tools>=0.6.0 + liblxqt-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/lxqt-sudo/releases/download/$pkgver/lxqt-sudo-$pkgver.tar.xz" @@ -27,7 +27,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -42,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ea7d8ca093e736e3cf581605598cb9c8ed4e40bc39fb94a4b44334e7f58ae53c489ede0dcfc75de8daf58c115c1a91ae152f676276488df8a16ed53bbf56fc82 lxqt-sudo-0.13.0.tar.xz" +sha512sums="06e8749dc11f48d6d76805fc2d93b04194287cb4d95c4640c80ca186f948d6b6585df5bab7d8b0fb0f23f4b07ffd057048afddddb820a3961d37bc1ce9cd3694 lxqt-sudo-0.14.0.tar.xz" diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD index e327d4732..233511d95 100644 --- a/user/lxqt-themes/APKBUILD +++ b/user/lxqt-themes/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=lxqt-themes -pkgver=0.13.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Core themes for LXQt" url="https://lxqt.org" arch="noarch" options="!check" # No test suite. license="LGPL-2.1+" depends="" -makedepends="cmake lxqt-build-tools>=0.5.0" +makedepends="cmake lxqt-build-tools>=0.6.0" source="https://github.com/lxde/lxqt-themes/releases/download/$pkgver/lxqt-themes-$pkgver.tar.xz" build() { @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="d246719a04b9247e099a19f8ce1b3d27a2b8c4b57266043fe219daff796014f963b65f50b73a4115badf4901a7b2bdd145f0518647ced45a5857f5b859b14081 lxqt-themes-0.13.0.tar.xz" +sha512sums="622449df60f5f50d59ab308a7aaae35114e91bda48e112fb2abb2c394bfdfc5794d2bf0c6ce63689a29081a31bdde191e3c8cb7217f833d76a407f9970eb1fb2 lxqt-themes-0.14.0.tar.xz" diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD index 14d35db09..d19215e41 100644 --- a/user/lynx/APKBUILD +++ b/user/lynx/APKBUILD @@ -7,7 +7,7 @@ _relver=${pkgver/_p/rel.} _v=${_relver%rel.*} pkgrel=0 pkgdesc="Cross-platform text-based browser" -url="http://lynx.invisible-island.net/" +url="https://lynx.invisible-island.net/" arch="all" license="GPL-2.0-only" depends="gzip" diff --git a/user/mac-fdisk/APKBUILD b/user/mac-fdisk/APKBUILD index 471279968..1120b249b 100644 --- a/user/mac-fdisk/APKBUILD +++ b/user/mac-fdisk/APKBUILD @@ -6,7 +6,7 @@ _pkgver=0.1 pkgrel=2 pkgdesc="68K and PowerPC fixed disk partitioning utility" url="https://adelielinux.org/" -arch="all" +arch="all !aarch64" # Literally does not support this arch. license="GPL-2.0" options="!check" # No test suite. depends="" diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD index b44e365cb..05e3e2c59 100644 --- a/user/marble/APKBUILD +++ b/user/marble/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=marble -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Free, open-source map and virtual globe" url="https://marble.kde.org/" @@ -11,7 +11,7 @@ license="LGPL-2.1-only AND GPL-2.0-only" depends="shared-mime-info" depends_dev="qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtsvg-dev" makedepends="$depends_dev cmake extra-cmake-modules qt5-qttools-dev zlib-dev - qt5-qtwebkit-dev krunner-dev kcoreaddons-dev kwallet-dev knewstuff-dev + qt5-qtserialport-dev krunner-dev kcoreaddons-dev kwallet-dev knewstuff-dev kio-dev kparts-dev kcrash-dev ki18n-dev phonon-dev plasma-framework-dev qt5-qtpositioning-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c719f78bbae194760ee41ef8926e88edf727089857949ba40dfb51f1e87f640c3553e1a32e5c04757b705641c354009ce0e0fed3ed31d01eea2005686df0d5b9 marble-18.08.3.tar.xz" +sha512sums="74dba5cfc7c5b9995445817667148417fdd36994ddf105484e2d13f4a5dff7654f98d84680ff26c5057a60d0d9cbfbe7dbc3e7d3413e081fb67f3ced2783286c marble-18.12.2.tar.xz" diff --git a/user/mesa/APKBUILD b/user/mesa/APKBUILD index 418e9e361..c36074f8a 100644 --- a/user/mesa/APKBUILD +++ b/user/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mesa -pkgver=18.1.8 +pkgver=18.3.2 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="https://www.mesa3d.org" @@ -15,26 +15,21 @@ subpackages="$pkgname-dev $pkgname-dri-virtio:_dri $pkgname-glapi $pkgname-egl $pkgname-gl $pkgname-gles $pkgname-xatracker $pkgname-osmesa $pkgname-gbm - $pkgname-libwayland-egl:_wayland " _llvmver=6 -depends_dev="libdrm-dev dri2proto libxext-dev libxdamage-dev libxcb-dev glproto - dri3proto presentproto libxshmfence-dev" -makedepends="$depends_dev expat-dev xextproto libxt-dev makedepend py3-mako - flex bison llvm$_llvmver-dev eudev-dev libvdpau-dev python3 py-libxml2 - libxvmc-dev libxfixes-dev wayland-dev libelf-dev wayland-protocols - autoconf automake libtool libxxf86vm-dev libx11-dev zlib-dev" +depends_dev="libdrm-dev libxcb-dev libxdamage-dev libxext-dev libxshmfence-dev + xorgproto-dev" +makedepends="$depends_dev byacc eudev-dev expat-dev flex libelf-dev + libvdpau-dev libx11-dev libxfixes-dev libxrandr-dev libxt-dev + libxvmc-dev libxxf86vm-dev llvm$_llvmver-dev makedepend python3 + py3-libxml2 py3-mako zlib-dev" source="https://mesa.freedesktop.org/archive/mesa-$pkgver.tar.xz - glx_ro_text_segm.patch musl-fixes.patch musl-fix-includes.patch amdgpu-pthread-header.patch disk_cache-stack-overflow.patch drmdeps.patch - python3-compat.patch - intel.patch " -replaces="mesa-dricore" _dri_driverdir=/usr/lib/xorg/modules/dri _dri_drivers="r200,radeon,nouveau,swrast" @@ -73,22 +68,20 @@ build() { cd "$builddir" export CFLAGS="$CFLAGS -D_XOPEN_SOURCE=700" - PYTHON2=python3 ./configure \ + PYTHON=python3 ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ --sysconfdir=/etc \ --with-dri-driverdir=$_dri_driverdir \ --disable-asm \ - --disable-xvmc \ - --enable-glx-rts \ --with-gallium-drivers=${_gallium_drivers} \ --with-dri-drivers=${_dri_drivers} \ --with-vulkan-drivers=${_vulkan_drivers} \ --with-llvm-prefix=/usr/lib/llvm$_llvmver \ --enable-llvm-shared-libs \ --enable-llvm \ - --with-platforms=x11,drm,wayland \ + --with-platforms=x11,drm \ --enable-shared-glapi \ --enable-gbm \ --disable-glx-tls \ @@ -100,7 +93,6 @@ build() { --enable-gles1 \ --enable-gles2 \ --enable-egl \ - --enable-texture-float \ --enable-xa \ --enable-vdpau \ $_arch_opts @@ -238,19 +230,9 @@ _dri() { esac } -_wayland() { - pkgdesc="Mesa libwayland-egl library" - mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/libwayland-egl.so.* "$subpkgdir"/usr/lib/ \ - || return 1 -} - -sha512sums="ab89c6d27b765d3efdf61b24dc56d863ae590d83003d2eae4bfe25ecfbeda5bee0227f21d057523bb4eceeaf3d9955df48087ffb472c41b123c100e593056cb9 mesa-18.1.8.tar.xz -c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch +sha512sums="34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45 mesa-18.3.2.tar.xz 9f7a050f09571a2b17098d495b82e2e85b293fb7285e7d6d7c3c48cd4220a1bdcc61a7321ba78dd14860939ecabe7e89b32d6110f3728f793273e1e26b78a553 musl-fixes.patch c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e musl-fix-includes.patch 245d0d64d858dfadeeb544f31f7d0bb6ecb746a7fd5ec99755d679ae1a1eef4198d66473fb24d333eb6786bb8657012771e8285d67f165dc61a031df801947aa amdgpu-pthread-header.patch f40ff04ac73c090c74d1955de6013c5aa41fb77f28b2b82d89cfc1880306a9ca1dde4581592db19f0a0ec6d85032f1ed5d953103ab0d075f9f0b7e459a028c45 disk_cache-stack-overflow.patch -6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch -61ddf4f33f11b4fbaa334bec04d184236f01bc8cad4340cb74b66c92fc8c0c985d36507cf43b504d186dc108fc2e5ae348ed28ea8a680ba4dfdb74994fc440f7 python3-compat.patch -baa0039c65b760ac60d55a112cc3fe9c59759e6f6e31c9c0dc46cfc1dcca91726706d6fb3328e11c043ba1f84f01dd56d0208ee153b05174fde74252d3d7d95c intel.patch" +6800bc62aebfba22a2562c858c27391b47c5675020bd67f040da93ffe4d5d8ac828907a44c7cee6a4ebe63821b58c2515b4012f1f23473670b1de8670426a430 drmdeps.patch" diff --git a/user/mesa/glx_ro_text_segm.patch b/user/mesa/glx_ro_text_segm.patch deleted file mode 100644 index 8cad4876b..000000000 --- a/user/mesa/glx_ro_text_segm.patch +++ /dev/null @@ -1,28 +0,0 @@ -2011-02-09 Jeremy Huddleston <jeremyhu@freedesktop.org - - #240956 - * configure.ac add support to enable readonly test segment on x86 - ---- ./configure.ac.orig 2008-11-17 23:19:38.000000000 +0100 -+++ ./configure.ac 2008-11-17 23:20:17.000000000 +0100 -@@ -499,6 +499,20 @@ - enable_xcb=no - fi - -+ -+dnl readonly text segment on x86 hardened platforms -+AC_ARG_ENABLE([glx_rts], -+ [AS_HELP_STRING([--enable-glx-rts], -+ [on x86, use a readonly text segment for libGL @<:@default=disabled@:>@])], -+ [enable_glx_rts="$enableval"], -+ [enable_glx_rts=no]) -+if test "x$enable_glx_rts" = xyes; then -+ DEFINES="$DEFINES -DGLX_X86_READONLY_TEXT" -+else -+ enable_glx_rts=no -+fi -+ -+ - dnl - dnl libGL configuration per driver - dnl diff --git a/user/mesa/intel.patch b/user/mesa/intel.patch deleted file mode 100644 index 10871fc7c..000000000 --- a/user/mesa/intel.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- mesa-18.1.3/src/mesa/drivers/dri/i965/brw_bufmgr.h 2018-06-29 13:47:29.000000000 -0400 -+++ mesa-18.1.3/src/mesa/drivers/dri/i965/brw_bufmgr.h 2018-07-24 03:18:37.479847335 -0400 -@@ -37,6 +37,7 @@ - #include <stdbool.h> - #include <stdint.h> - #include <stdio.h> -+#include <time.h> - #include "util/u_atomic.h" - #include "util/list.h" - ---- mesa-18.1.3/src/intel/vulkan/anv_entrypoints_gen.py 2018-07-24 03:15:05.009848837 -0400 -+++ mesa-18.1.3/src/intel/vulkan/anv_entrypoints_gen.py 2018-07-24 03:12:21.739849990 -0400 -@@ -91,7 +91,7 @@ - % endfor - """, output_encoding='utf-8') - --TEMPLATE_C = Template(u"""\ -+TEMPLATE_C = Template("""\ - /* - * Copyright © 2015 Intel Corporation - * -@@ -145,7 +145,7 @@ - /* Hash table stats: - * size ${len(strmap.sorted_strings)} entries - * collisions entries: --% for i in xrange(10): -+% for i in range(10): - * ${i}${'+' if i == 9 else ' '} ${strmap.collisions[i]} - % endfor - */ -@@ -388,7 +388,7 @@ - - def bake(self): - self.sorted_strings = \ -- sorted(self.strings.values(), key=lambda x: x.string) -+ sorted(list(self.strings.values()), key=lambda x: x.string) - offset = 0 - for entry in self.sorted_strings: - entry.offset = offset -@@ -507,7 +507,7 @@ - assert e.core_version is None - e.extensions.append(ext) - -- return [e for e in entrypoints.itervalues() if e.enabled] -+ return [e for e in list(entrypoints.values()) if e.enabled] - - - def get_entrypoints_defines(doc): ---- mesa-18.1.3/src/intel/vulkan/anv_extensions.py 2018-06-29 13:47:29.000000000 -0400 -+++ mesa-18.1.3/src/intel/vulkan/anv_extensions.py 2018-07-24 03:07:13.599852168 -0400 -@@ -146,14 +146,32 @@ - patch = self.patch if self.patch is not None else 0 - return (self.major << 22) | (self.minor << 12) | patch - -- def __cmp__(self, other): -+ def __lt__(self, other): - # If only one of them has a patch version, "ignore" it by making - # other's patch version match self. - if (self.patch is None) != (other.patch is None): - other = copy.copy(other) - other.patch = self.patch - -- return self.__int_ver().__cmp__(other.__int_ver()) -+ return self.__int_ver() < other.__int_ver() -+ -+ def __gt__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() > other.__int_ver() -+ -+ def __eq__(self, other): -+ # If only one of them has a patch version, "ignore" it by making -+ # other's patch version match self. -+ if (self.patch is None) != (other.patch is None): -+ other = copy.copy(other) -+ other.patch = self.patch -+ -+ return self.__int_ver() == other.__int_ver() - - - MAX_API_VERSION = VkVersion('0.0.0') diff --git a/user/mesa/python3-compat.patch b/user/mesa/python3-compat.patch deleted file mode 100644 index 9dc213e9f..000000000 --- a/user/mesa/python3-compat.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- mesa-17.3.1/src/gallium/drivers/r600/egd_tables.py (original) -+++ mesa-17.3.1/src/gallium/drivers/r600/egd_tables.py (refactored) -@@ -60,7 +60,7 @@ - """ - fragments = [ - '"%s\\0" /* %s */' % ( -- te[0].encode('string_escape'), -+ te[0].encode('unicode-escape'), - ', '.join(str(idx) for idx in te[2]) - ) - for te in self.table -@@ -217,10 +217,10 @@ - strings = StringTable() - strings_offsets = IntTable("int") - -- print '/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */' -- print -- print CopyRight.strip() -- print ''' -+ print('/* This file is autogenerated by egd_tables.py from evergreend.h. Do not edit directly. */') -+ print() -+ print(CopyRight.strip()) -+ print(''' - #ifndef EG_TABLES_H - #define EG_TABLES_H - -@@ -242,20 +242,20 @@ - unsigned name_offset; - unsigned op; - }; --''' -- -- print 'static const struct eg_packet3 packet3_table[] = {' -+''') -+ -+ print('static const struct eg_packet3 packet3_table[] = {') - for pkt in packets: -- print '\t{%s, %s},' % (strings.add(pkt[5:]), pkt) -- print '};' -- print -- -- print 'static const struct eg_field egd_fields_table[] = {' -+ print('\t{%s, %s},' % (strings.add(pkt[5:]), pkt)) -+ print('};') -+ print() -+ -+ print('static const struct eg_field egd_fields_table[] = {') - - fields_idx = 0 - for reg in regs: - if len(reg.fields) and reg.own_fields: -- print '\t/* %s */' % (fields_idx) -+ print('\t/* %s */' % (fields_idx)) - - reg.fields_idx = fields_idx - -@@ -266,34 +266,34 @@ - while value[1] >= len(values_offsets): - values_offsets.append(-1) - values_offsets[value[1]] = strings.add(strip_prefix(value[0])) -- print '\t{%s, %s(~0u), %s, %s},' % ( -+ print('\t{%s, %s(~0u), %s, %s},' % ( - strings.add(field.name), field.s_name, -- len(values_offsets), strings_offsets.add(values_offsets)) -+ len(values_offsets), strings_offsets.add(values_offsets))) - else: -- print '\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name) -+ print('\t{%s, %s(~0u)},' % (strings.add(field.name), field.s_name)) - fields_idx += 1 - -- print '};' -- print -- -- print 'static const struct eg_reg egd_reg_table[] = {' -+ print('};') -+ print() -+ -+ print('static const struct eg_reg egd_reg_table[] = {') - for reg in regs: - if len(reg.fields): -- print '\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name, -- len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx) -+ print('\t{%s, %s, %s, %s},' % (strings.add(reg.name), reg.r_name, -+ len(reg.fields), reg.fields_idx if reg.own_fields else reg.fields_owner.fields_idx)) - else: -- print '\t{%s, %s},' % (strings.add(reg.name), reg.r_name) -- print '};' -- print -+ print('\t{%s, %s},' % (strings.add(reg.name), reg.r_name)) -+ print('};') -+ print() - - strings.emit(sys.stdout, "egd_strings") - -- print -+ print() - - strings_offsets.emit(sys.stdout, "egd_strings_offsets") - -- print -- print '#endif' -+ print() -+ print('#endif') - - - def main(): ---- mesa-18.1.3/m4/ax_check_python_mako_module.m4.old 2018-06-29 17:47:29.000000000 +0000 -+++ mesa-18.1.3/m4/ax_check_python_mako_module.m4 2018-07-09 01:55:22.740000000 +0000 -@@ -48,8 +48,8 @@ - except ImportError as err: - sys.exit(err) - else: -- ver_req = map(int, '$1'.split('.')) -- ver_act = map(int, mako.__version__.split('.')) -+ ver_req = list(map(int, '$1'.split('.'))) -+ ver_act = list(map(int, mako.__version__.split('.'))) - sys.exit(int(ver_req > ver_act)) - " | $PYTHON2 - - diff --git a/user/meson/APKBUILD b/user/meson/APKBUILD index 0aabeb17e..d649ab340 100644 --- a/user/meson/APKBUILD +++ b/user/meson/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: pkgname=meson -pkgver=0.48.2 +pkgver=0.49.2 pkgrel=0 pkgdesc="Fast, user-friendly build system" url="http://mesonbuild.com/" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="6d8a7f8089a56bb96c01e7ced4b8cb3ffc95c1d35e7940573dbd77fa563d42c19cf9e1477e0712ca7e504d469579d9c7ac2656a2bea63f46a8fcafd66d541193 meson-0.48.2.tar.gz" +sha512sums="d07a5dfd699f1e4b00af39c377ec186c91718d9595cb0ab506b4b40c0c63ddd14eccbe8afb446635272c431e2a78032888be0bc8f6064044da53e8c0b5f7be3f meson-0.49.2.tar.gz" diff --git a/user/minuet/APKBUILD b/user/minuet/APKBUILD index cf5342614..02e71de53 100644 --- a/user/minuet/APKBUILD +++ b/user/minuet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=minuet -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Music education software" url="https://minuet.kde.org/" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="95ae460db8d1d51926a3be0db12159b0256e3817232d94bcbb0400efb0c49fd43298dc83557166585ce29cdf6c46e24865aa104374dacc29ed2bcd1d52ef71e5 minuet-18.08.3.tar.xz" +sha512sums="29a9c540474e9d260e8ceb01bfc5440d689315c96dc52c507d82859f6d4962c56d0728822562b6bb5ab1904a15e7d95fa2cc77a672e55ca72395fec0ab16e2b9 minuet-18.12.2.tar.xz" diff --git a/user/mkcomposecache/APKBUILD b/user/mkcomposecache/APKBUILD new file mode 100644 index 000000000..dbd363bf0 --- /dev/null +++ b/user/mkcomposecache/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=mkcomposecache +pkgver=1.2 +pkgrel=0 +pkgdesc="Utility to manipulate X11 Compose key cache files" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libx11-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/mkcomposecache-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e81101dbf3324341a2aa6b12a6f1a67bf18484f69edc86e38f78f30b2e62d4d3a98d65dbd05540dfe437d739b5cdd330d1e381da87ec3fe4fe7c42fcef58aad7 mkcomposecache-1.2.tar.bz2" diff --git a/user/mkfontdir/APKBUILD b/user/mkfontdir/APKBUILD index ef3ed4edc..45629cd20 100644 --- a/user/mkfontdir/APKBUILD +++ b/user/mkfontdir/APKBUILD @@ -1,15 +1,16 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mkfontdir pkgver=1.0.7 -pkgrel=2 +pkgrel=3 pkgdesc="Font file index utility from X.Org" url="https://www.X.Org/" arch="noarch" license="X11 AND MIT" -depends="mkfontscale" +depends="encodings mkfontscale" makedepends="util-macros" subpackages="$pkgname-doc" -triggers="$pkgname.trigger=/usr/share/fonts/*" +triggers="$pkgname.trigger=/usr/share/fonts/* + $pkgname.trigger=/usr/share/fonts/X11/*" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" prepare() { diff --git a/user/mkfontdir/mkfontdir.trigger b/user/mkfontdir/mkfontdir.trigger index 4fce36a11..3024d71f1 100644 --- a/user/mkfontdir/mkfontdir.trigger +++ b/user/mkfontdir/mkfontdir.trigger @@ -1,6 +1,6 @@ #!/bin/sh for i in "$@"; do - mkfontdir "$i" + mkfontdir -e "/usr/share/fonts/X11/encodings" -e "/usr/share/fonts/X11/encodings/large" -- "$i" done diff --git a/user/mkfontscale/APKBUILD b/user/mkfontscale/APKBUILD index 812fd97af..c2d81ec73 100644 --- a/user/mkfontscale/APKBUILD +++ b/user/mkfontscale/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=mkfontscale pkgver=1.1.3 -pkgrel=0 +pkgrel=1 pkgdesc="Scalable font file creator for X.Org" url="https://www.X.Org/" arch="all" @@ -9,7 +9,8 @@ license="MIT" subpackages="$pkgname-doc" depends="" makedepends="freetype-dev libfontenc-dev util-macros xorgproto-dev zlib-dev" -triggers="$pkgname.trigger=/usr/share/fonts/*" +triggers="$pkgname.trigger=/usr/share/fonts/* + $pkgname.trigger=/usr/share/fonts/X11/*" source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2" build() { diff --git a/user/monoid/APKBUILD b/user/monoid/APKBUILD new file mode 100644 index 000000000..449d177e1 --- /dev/null +++ b/user/monoid/APKBUILD @@ -0,0 +1,22 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=monoid +pkgver=0.61 +pkgrel=0 +pkgdesc="Monospace typeface optimised for code" +url="https://larsenwork.com/monoid/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1 OR MIT" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://raw.githubusercontent.com/larsenwork/monoid/2db2d289f4e61010dd3f44e09918d9bb32fb96fd/Monoid-Small.zip" +builddir="$srcdir/" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ *.ttf +} + +sha512sums="2776bbc7febf17c10f87bbdd3e6e4fd7c24b93286009d1dcb0ca8058e1e1437c3179068ab608c3f69ae07c08950ececb4d0ad88e82ccba4a6bd2d8b63f71a9c8 Monoid-Small.zip" diff --git a/user/montecarlo/APKBUILD b/user/montecarlo/APKBUILD new file mode 100644 index 000000000..71e45e6dd --- /dev/null +++ b/user/montecarlo/APKBUILD @@ -0,0 +1,26 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=montecarlo +pkgver=0 +pkgrel=0 +pkgdesc="Monospace typeface designed for programmers" +url="http://www.bok.net/MonteCarlo/" +arch="noarch" +options="!check" # No test suite. +license="Public-Domain" +depends="mkfontdir mkfontscale" +makedepends="" +subpackages="" +source="http://www.bok.net/MonteCarlo/downloads/MonteCarlo-PCF.tgz" +builddir="$srcdir/MonteCarlo-PCF" + +package() { + cd "$builddir" + local _font + for _font in *.pcf; do + gzip -9 $_font + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/misc/ $_font.gz + done +} + +sha512sums="c4a69d66b6c19c63b2430fbd82fff5067e7ebe49ad0e4d19c93f566bf5644e8a6555742338a8517e964ed7c0dc05e5ceee28db443d23301ad016b7b42403f03e MonteCarlo-PCF.tgz" diff --git a/user/mpv/APKBUILD b/user/mpv/APKBUILD index a579ecc5a..33ca734d6 100644 --- a/user/mpv/APKBUILD +++ b/user/mpv/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=mpv pkgver=0.29.1 -pkgrel=0 +pkgrel=1 pkgdesc="An improved fork of mplayer" url="https://mpv.io" arch="all" diff --git a/user/musl-obstack/APKBUILD b/user/musl-obstack/APKBUILD new file mode 100644 index 000000000..a7466fc96 --- /dev/null +++ b/user/musl-obstack/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=musl-obstack +pkgver=1.1 +pkgrel=0 +pkgdesc="Standalone library to implement obstack functionality" +url=" " +arch="all" +license="GPL-2.0+" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="musl-obstack-$pkgver.tar.gz::https://github.com/pullmoll/musl-obstack/archive/v$pkgver.tar.gz" + +build() { + cd "$builddir" + ./bootstrap.sh + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e3a9956133d72a00663cf8d9720e62002142e113e7d67e2338a2bce1bdfac9eefd4290db8add15eabafdf01065f7fe9bb6754faa36b88df819c53d44fa140757 musl-obstack-1.1.tar.gz" diff --git a/user/nasm/APKBUILD b/user/nasm/APKBUILD index 2c6f00c52..81aa6a996 100644 --- a/user/nasm/APKBUILD +++ b/user/nasm/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=nasm -pkgver=2.14 +pkgver=2.14.02 pkgrel=0 pkgdesc="80x86 assembler designed for portability and modularity" url="https://www.nasm.us/" @@ -31,4 +31,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a87935b90a8eaa5adcad7efc058e429483d451c8acb8fd051f0dca760eb649839f40e45f91a551ecf89da4320a32299daa21f8ecb9384a18a5359ccb0e74894 nasm-2.14.tar.bz2" +sha512sums="71e3d44736493b1a56d4230bc2e5519e858aaadde5d89a692f1472fad6755084460e36b42852707f4c862eff75d3f2c232aedcc4e61e9d9ffcc8c9ca6498292b nasm-2.14.02.tar.bz2" diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD new file mode 100644 index 000000000..54fdea907 --- /dev/null +++ b/user/netsurf/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=netsurf +pkgver=3.8 +pkgrel=0 +pkgdesc="Modern, lightweight GTK-based browser" +url="http://www.netsurf-browser.org/" +arch="all" +options="!check" # No tests +license="MIT AND GPL-2.0-only WITH openssl-exception" +depends="" +makedepends="curl-dev zlib-dev bison flex libjpeg-turbo-dev libpng-dev + openssl-dev expat-dev gperf gtk+2.0-dev librsvg-dev + perl-html-parser" +source="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-all-$pkgver.tar.gz + Makefile.config" +builddir="$srcdir/netsurf-all-$pkgver" + +prepare() { + default_prepare + cp "$srcdir"/Makefile.config "$builddir"/netsurf +} + +build() { + cd "$builddir" + make PREFIX=/usr NETSURF_USE_VIDEO=YES +} + +package() { + cd "$builddir" + make PREFIX=/usr DESTDIR="$pkgdir" install +} + +sha512sums="cc040566b2ae4bda1fa15f75f246b2977f17b1f0adc747ddf86a9f8873bc25dce46cacce8e3d80146e72cc0227b1642c9da8b39a73ca2b5bb254334a25b8136a netsurf-all-3.8.tar.gz +cb5f7ca711c4a015a49acc25882b9b95e151d69e68a21d1df068f107b2372dc7493a25c0dfc1ef0cf42ceb16ba47ceb1002f6d37c2424512b183b508ee41357e Makefile.config" diff --git a/user/netsurf/Makefile.config b/user/netsurf/Makefile.config new file mode 100644 index 000000000..0e58d6e7d --- /dev/null +++ b/user/netsurf/Makefile.config @@ -0,0 +1 @@ +override NETSURF_USE_VIDEO := NO diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD new file mode 100644 index 000000000..5c2c06c70 --- /dev/null +++ b/user/nfs-utils/APKBUILD @@ -0,0 +1,80 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=nfs-utils +pkgver=2.3.3 +pkgrel=0 +pkgdesc="NFS file sharing client and server" +url="http://nfs.sourceforge.net/" +arch="all" +options="!check suid" # No functional test suite. +license="GPL-2.0-only" +depends="rpcbind" +makedepends="keyutils-dev krb5-dev libevent-dev libtirpc-dev lvm2-dev + rpcsvc-proto sqlite-dev util-linux-dev" +subpackages="$pkgname-doc $pkgname-openrc" +source="https://downloads.sourceforge.net/nfs/nfs-utils-$pkgver.tar.xz + nfs-utils-1.1.4-mtab-sym.patch + posixish.patch + undef-def.patch + + exports + nfs.confd nfs.initd nfsclient.confd nfsclient.initd nfsmount.confd + nfsmount.initd rpc.gssd.initd rpc.idmapd.initd rpc.pipefs.initd + rpc.statd.initd rpc.svcgssd.initd + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-ipv6 \ + --enable-nfsv4 \ + --enable-nfsv41 \ + --enable-gss \ + --enable-svcgss \ + --with-statedir=/var/lib/nfs + make +} + +check() { + cd "$builddir" + make check +} + +package() { + local _initd _confd + cd "$builddir" + make DESTDIR="$pkgdir" install + + install -D -m644 "$srcdir"/exports "$pkgdir"/etc/exports + + for _initd in nfs nfsclient nfsmount rpc.gssd rpc.idmapd rpc.pipefs \ + rpc.statd rpc.svcgssd; do + install -D -m755 "$srcdir"/$_initd.initd "$pkgdir"/etc/init.d/$_initd + done + for _confd in nfs nfsclient nfsmount; do + install -D -m644 "$srcdir"/$_confd.confd "$pkgdir"/etc/conf.d/$_confd + done +} + +sha512sums="5025ccd7699ac1a0fdbd8b18ed8b33ea89230158320d809ec51e73f831100db75dceaddde481d911eeca9059caa521d155c2d14d014d75f091f432aad92a9716 nfs-utils-2.3.3.tar.xz +1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998 nfs-utils-1.1.4-mtab-sym.patch +f0b87ff4229d96a46e3f0c17f87dcd3ce5c51651ee036d935c1481b421cd7e5b6a048a082b4f8115a969fe6e85cc871df7658bf5d80c480095b69f29fd6b085d posixish.patch +2e54efa2cac0522f549e8bed45147676d10b299b5060eda305da8767feb55d37627259196d89c295e8d5f4fbbb7c9e791a53dddd579187600f1717968049aa6a undef-def.patch +fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220 exports +bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535 nfs.confd +f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018 nfs.initd +f12e67728ac4e76357685e2fe38bd7f6fcd90064165758ffeca145e6962ac44d4ff9d8d57e18cc6925a6ada8e95ad8321e9fc355931a804dd455aae1e4850e92 nfsclient.confd +85078e2cd38b37a1e6fbaf0e40cf7690f403e71d9c8188d542d12fe56bfc02a49763c7bcc7742691754acc37928468c215db2795bebc29a5dfb052ba08f407bb nfsclient.initd +6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28 nfsmount.confd +89259b9f0878658d48792b5b2f42b43c966ed098dba1fecf9e07fb0de4aab37ad67655ea8dbcc2361ddab2b5013b2de35a03048a513aaeedf790e4b416a35a54 nfsmount.initd +d9d7eeebbe153d3c4784112ed6d50734b5619b3315bb1454f8163de2b78ed8f958029a0e1088de58e9b1b8069184aeab2c8f19af4b957b6be25e4f138960aeac rpc.gssd.initd +f3e88038cb040ffcbca76166f4322d37e39da00d144bc0a17aed4467ab10c6e626fcde6c407d0911d135bfab55622ad2e38ed93788b11459c5882ce60577fb45 rpc.idmapd.initd +3d3fa6e7ae01e27d27d88aba1e307c5293dd1cbc9d555737e03c4f1e17988518f4f1e7f7a38a7337f8e8961e8378cc4611769b04db7368460589a3b218ac6d6b rpc.pipefs.initd +7f6baea852fff91b88e15e432ba19f9da0a3e3510b6f550b553912cf3887ce176280367b62bcce2a044730a075e4c1f6d7df1a669556d42725dea6e6e8e967ac rpc.statd.initd +819cce4ae0a0f26bc74ce546e149b98420584240a594c9bb4a0a49413750320bde050866f3753c499425ea8d8df094211fb1f7e020ce281791e1933e1bc6a47f rpc.svcgssd.initd" diff --git a/user/nfs-utils/exports b/user/nfs-utils/exports new file mode 100644 index 000000000..5102ef27c --- /dev/null +++ b/user/nfs-utils/exports @@ -0,0 +1 @@ +# /etc/exports: NFS file systems being exported. See exports(5). diff --git a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch new file mode 100644 index 000000000..c9e60afc7 --- /dev/null +++ b/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch @@ -0,0 +1,39 @@ +ripped from Debian + +--- nfs-utils-1.1.4/utils/mount/fstab.c ++++ nfs-utils-1.1.4/utils/mount/fstab.c +@@ -57,7 +57,7 @@ mtab_does_not_exist(void) { + return var_mtab_does_not_exist; + } + +-static int ++int + mtab_is_a_symlink(void) { + get_mtab_info(); + return var_mtab_is_a_symlink; +--- nfs-utils-1.1.4/utils/mount/fstab.h ++++ nfs-utils-1.1.4/utils/mount/fstab.h +@@ -7,6 +7,7 @@ + #define _PATH_FSTAB "/etc/fstab" + #endif + ++int mtab_is_a_symlink(void); + int mtab_is_writable(void); + int mtab_does_not_exist(void); + void reset_mtab_info(void); +--- nfs-utils-1.1.4/utils/mount/mount.c ++++ nfs-utils-1.1.4/utils/mount/mount.c +@@ -230,6 +230,13 @@ create_mtab (void) { + int flags; + mntFILE *mfp; + ++ /* Avoid writing if the mtab is a symlink to /proc/mounts, since ++ that would create a file /proc/mounts in case the proc filesystem ++ is not mounted, and the fchmod below would also fail. */ ++ if (mtab_is_a_symlink()) { ++ return EX_SUCCESS; ++ } ++ + lock_mtab(); + + mfp = nfs_setmntent (MOUNTED, "a+"); diff --git a/user/nfs-utils/nfs-utils.conf b/user/nfs-utils/nfs-utils.conf new file mode 100644 index 000000000..b9b586c2a --- /dev/null +++ b/user/nfs-utils/nfs-utils.conf @@ -0,0 +1,3 @@ +d /var/lib/nfs/rpc_pipefs +d /var/lib/nfs/v4recovery +d /var/lib/nfs/v4root diff --git a/user/nfs-utils/nfs.confd b/user/nfs-utils/nfs.confd new file mode 100644 index 000000000..9dc14058c --- /dev/null +++ b/user/nfs-utils/nfs.confd @@ -0,0 +1,38 @@ +# /etc/conf.d/nfs + +# If you wish to set the port numbers for lockd, +# please see /etc/sysctl.conf + +# Optional services to include in default `/etc/init.d/nfs start` +# For NFSv4 users, you'll want to add "rpc.idmapd" here. +NFS_NEEDED_SERVICES="" + +# Options to pass to rpc.nfsd +OPTS_RPC_NFSD="8" + +# Options to pass to rpc.mountd +# ex. OPTS_RPC_MOUNTD="-p 32767" +OPTS_RPC_MOUNTD="" + +# Options to pass to rpc.statd +# ex. OPTS_RPC_STATD="-p 32765 -o 32766" +OPTS_RPC_STATD="" + +# Options to pass to rpc.idmapd +OPTS_RPC_IDMAPD="" + +# Options to pass to rpc.gssd +OPTS_RPC_GSSD="" + +# Options to pass to rpc.svcgssd +OPTS_RPC_SVCGSSD="" + +# Options to pass to rpc.rquotad (requires sys-fs/quota) +OPTS_RPC_RQUOTAD="" + +# Timeout (in seconds) for exportfs +EXPORTFS_TIMEOUT=30 + +# Options to set in the nfsd filesystem (/proc/fs/nfsd/). +# Format is <option>=<value>. Multiple options are allowed. +#OPTS_NFSD="nfsv4leasetime=30 max_block_size=4096" diff --git a/user/nfs-utils/nfs.initd b/user/nfs-utils/nfs.initd new file mode 100644 index 000000000..4b572fc2e --- /dev/null +++ b/user/nfs-utils/nfs.initd @@ -0,0 +1,162 @@ +#!/sbin/openrc-run +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" + +# This variable is used for controlling whether or not to run exportfs -ua; +# see stop() for more information +restarting=no + +# The binary locations +exportfs=/usr/sbin/exportfs + mountd=/usr/sbin/rpc.mountd + nfsd=/usr/sbin/rpc.nfsd +smnotify=/usr/sbin/sm-notify + +depend() { + local myneed="" + # XXX: no way to detect NFSv4 is desired and so need rpc.idmapd + myneed="${myneed} $( + awk '!/^[[:space:]]*#/ { + # clear the path to avoid spurious matches + $1 = ""; + if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) { + print "rpc.svcgssd" + exit 0 + } + }' /etc/exports /etc/exports.d/*.exports 2>/dev/null + )" + config /etc/exports /etc/exports.d/*.exports + need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES} + use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd + after quota +} + +mkdir_nfsdirs() { + local d + for d in v4recovery v4root ; do + d="/var/lib/nfs/${d}" + [ ! -d "${d}" ] && mkdir -p "${d}" + done +} + +waitfor_exportfs() { + local pid=$1 + ( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 ${pid} 2>/dev/null ) & + wait $1 +} + +mount_nfsd() { + if [ -e /proc/modules ] ; then + # Make sure nfs support is loaded in the kernel #64709 + if ! grep -qs nfsd /proc/filesystems ; then + modprobe -q nfsd + fi + # Restart idmapd if needed #220747 + if grep -qs nfsd /proc/modules ; then + killall -q -HUP rpc.idmapd + fi + fi + + # This is the new "kernel 2.6 way" to handle the exports file + if grep -qs nfsd /proc/filesystems ; then + if ! mountinfo -q /proc/fs/nfsd ; then + ebegin "Mounting nfsd filesystem in /proc" + mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfsd + eend $? + fi + + local o + for o in ${OPTS_NFSD} ; do + echo "${o#*=}" > "/proc/fs/nfsd/${o%%=*}" + done + fi +} + +start_it() { + ebegin "Starting NFS $1" + shift + "$@" + eend $? + ret=$((ret + $?)) +} +start() { + mount_nfsd + mkdir_nfsdirs + + # Exportfs likes to hang if networking isn't working. + # If that's the case, then try to kill it so the + # bootup process can continue. + if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then + ebegin "Exporting NFS directories" + ${exportfs} -r & + waitfor_exportfs $! + eend $? + fi + + local ret=0 + start_it mountd ${mountd} ${OPTS_RPC_MOUNTD} + start_it daemon ${nfsd} ${OPTS_RPC_NFSD} + [ -x "${smnotify}" ] && start_it smnotify ${smnotify} ${OPTS_SMNOTIFY} + return ${ret} +} + +stop() { + local ret=0 + + ebegin "Stopping NFS mountd" + start-stop-daemon --stop --exec ${mountd} + eend $? + ret=$((ret + $?)) + + # nfsd sets its process name to [nfsd] so don't look for $nfsd + ebegin "Stopping NFS daemon" + start-stop-daemon --stop --name nfsd --user root --signal 2 + eend $? + ret=$((ret + $?)) + # in case things don't work out ... #228127 + rpc.nfsd 0 + + # When restarting the NFS server, running "exportfs -ua" probably + # isn't what the user wants. Running it causes all entries listed + # in xtab to be removed from the kernel export tables, and the + # xtab file is cleared. This effectively shuts down all NFS + # activity, leaving all clients holding stale NFS filehandles, + # *even* when the NFS server has restarted. + # + # That's what you would want if you were shutting down the NFS + # server for good, or for a long period of time, but not when the + # NFS server will be running again in short order. In this case, + # then "exportfs -r" will reread the xtab, and all the current + # clients will be able to resume NFS activity, *without* needing + # to umount/(re)mount the filesystem. + if [ "${restarting}" = no -o "${RC_CMD}" = "restart" ] ; then + ebegin "Unexporting NFS directories" + # Exportfs likes to hang if networking isn't working. + # If that's the case, then try to kill it so the + # shutdown process can continue. + ${exportfs} -ua & + waitfor_exportfs $! + eend $? + fi + + return ${ret} +} + +reload() { + # Exportfs likes to hang if networking isn't working. + # If that's the case, then try to kill it so the + # bootup process can continue. + ebegin "Reloading /etc/exports" + ${exportfs} -r 1>&2 & + waitfor_exportfs $! + eend $? +} + +restart() { + # See long comment in stop() regarding "restarting" and exportfs -ua + restarting=yes + svc_stop + svc_start +} diff --git a/user/nfs-utils/nfsclient.confd b/user/nfs-utils/nfsclient.confd new file mode 100644 index 000000000..8a995571e --- /dev/null +++ b/user/nfs-utils/nfsclient.confd @@ -0,0 +1,18 @@ +# You need to decide which nfs protocol version you want to use. +# If you are unsure, leave these alone. +# +# If you are using only nfsv4, uncomment this line: +# +#rc_need="!rpc.statd" +# +# If you are using only nfsv3, uncomment this line: +# +#rc_need="!rpc.idmapd" +# +# You will need to set the dependencies in the nfsclient script to match +# the network configuration tools you are using. This should be done in +# this file by following the examples below, and not by changing the +# service script itself. See /etc/conf.d/netmount for more examples. +# +# This is a safe default. +rc_after="net" diff --git a/user/nfs-utils/nfsclient.initd b/user/nfs-utils/nfsclient.initd new file mode 100644 index 000000000..6724e913d --- /dev/null +++ b/user/nfs-utils/nfsclient.initd @@ -0,0 +1,33 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + local opts myneed="" + if [ -e /etc/fstab ] ; then + for opts in $(fstabinfo -o -t nfs,nfs4) ; do + case $opts in + *sec=krb*|*sec=spkm*) myneed="$myneed rpc.gssd" ;; + esac + done + fi + config /etc/fstab + need portmap rpc.statd rpc.idmapd ${myneed} + use ypbind dns +} + +start() { + if [ -x /usr/sbin/sm-notify ] ; then + ebegin "Starting NFS sm-notify" + /usr/sbin/sm-notify ${OPTS_SMNOTIFY} + eend $? + fi + + # Make sure nfs support is loaded in the kernel #64709 + if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then + modprobe -q nfs + fi + return 0 +} diff --git a/user/nfs-utils/nfsmount.confd b/user/nfs-utils/nfsmount.confd new file mode 100644 index 000000000..418353668 --- /dev/null +++ b/user/nfs-utils/nfsmount.confd @@ -0,0 +1,7 @@ +# You will need to set the dependencies in the nfsmount script to match +# the network configuration tools you are using. This should be done in +# this file by following the examples below, and not by changing the +# service script itself. See /etc/conf.d/netmount for more examples. +# +# This is a safe default. +rc_after="net" diff --git a/user/nfs-utils/nfsmount.initd b/user/nfs-utils/nfsmount.initd new file mode 100644 index 000000000..12c7d786a --- /dev/null +++ b/user/nfs-utils/nfsmount.initd @@ -0,0 +1,47 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + local myneed="" + if [ -e /etc/fstab ] ; then + myneed="${myneed} $( + awk '!/^[[:space:]]*#/ && ($3 == "nfs" || $3 == "nfs4") { + if ($3 == "nfs4") + idmapd = "rpc.idmapd" + if ($4 ~ /sec=(krb|spkm)/) + gssd = "rpc.gssd" + } + END { print idmapd " " gssd } + ' /etc/fstab + )" + fi + config /etc/fstab + need portmap rpc.statd ${myneed} + use ypbind dns rpc.idmapd rpc.gssd +} + +start() { + if [ -x /usr/sbin/sm-notify ] ; then + ebegin "Starting NFS sm-notify" + /usr/sbin/sm-notify ${OPTS_SMNOTIFY} + eend $? + fi + + # Make sure nfs support is loaded in the kernel #64709 + if [ -e /proc/modules ] && ! grep -qs 'nfs$' /proc/filesystems ; then + modprobe -q nfs + fi + + ebegin "Mounting NFS filesystems" + mount -a -t nfs,nfs4 + eend $? +} + +stop() { + ebegin "Unmounting NFS filesystems" + umount -a -t nfs,nfs4 + eend $? +} diff --git a/user/nfs-utils/posixish.patch b/user/nfs-utils/posixish.patch new file mode 100644 index 000000000..0f1a7cdee --- /dev/null +++ b/user/nfs-utils/posixish.patch @@ -0,0 +1,71 @@ +--- nfs-utils-2.3.1/configure.ac.orig 2018-05-21 11:05:01.939912918 -0700 ++++ nfs-utils-2.3.1/configure.ac 2018-05-21 11:05:10.531968707 -0700 +@@ -401,7 +401,7 @@ + fi + + dnl libdnsidmap specific checks +-AC_CHECK_LIB([resolv], [__res_querydomain], , AC_MSG_ERROR(res_querydomain needed)) ++AC_CHECK_LIB([resolv], [res_querydomain], , AC_MSG_ERROR(res_querydomain needed)) + + AC_ARG_ENABLE([ldap], + [AS_HELP_STRING([--disable-ldap],[Disable support for LDAP @<:default=detect@:>@])]) +--- nfs-utils-2.3.1/support/misc/file.c.orig 2018-05-21 18:15:37.572007979 +0000 ++++ nfs-utils-2.3.1/support/misc/file.c 2018-05-21 18:15:43.668047008 +0000 +@@ -27,6 +27,7 @@ + #include <dirent.h> + #include <stdlib.h> + #include <stdbool.h> ++#include <limits.h> /* PATH_MAX */ + + #include "xlog.h" + #include "misc.h" +--- nfs-utils-2.3.3/configure.old 2018-09-06 18:10:07.000000000 +0000 ++++ nfs-utils-2.3.3/configure 2019-01-10 16:01:32.110000000 +0000 +@@ -20302,9 +20302,9 @@ + fi + fi + +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_querydomain in -lresolv" >&5 +-$as_echo_n "checking for __res_querydomain in -lresolv... " >&6; } +-if ${ac_cv_lib_resolv___res_querydomain+:} false; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_querydomain in -lresolv" >&5 ++$as_echo_n "checking for res_querydomain in -lresolv... " >&6; } ++if ${ac_cv_lib_resolv_res_querydomain+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20318,27 +20318,27 @@ + #ifdef __cplusplus + extern "C" + #endif +-char __res_querydomain (); ++char res_querydomain (); + int + main () + { +-return __res_querydomain (); ++return res_querydomain (); + ; + return 0; + } + _ACEOF + if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_resolv___res_querydomain=yes ++ ac_cv_lib_resolv_res_querydomain=yes + else +- ac_cv_lib_resolv___res_querydomain=no ++ ac_cv_lib_resolv_res_querydomain=no + fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_querydomain" >&5 +-$as_echo "$ac_cv_lib_resolv___res_querydomain" >&6; } +-if test "x$ac_cv_lib_resolv___res_querydomain" = xyes; then : ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_querydomain" >&5 ++$as_echo "$ac_cv_lib_resolv_res_querydomain" >&6; } ++if test "x$ac_cv_lib_resolv_res_querydomain" = xyes; then : + cat >>confdefs.h <<_ACEOF + #define HAVE_LIBRESOLV 1 + _ACEOF diff --git a/user/nfs-utils/rpc.gssd.initd b/user/nfs-utils/rpc.gssd.initd new file mode 100644 index 000000000..445d44c44 --- /dev/null +++ b/user/nfs-utils/rpc.gssd.initd @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + use ypbind net + need portmap rpc.pipefs + after quota +} + +start() { + ebegin "Starting gssd" + start-stop-daemon --start --exec /usr/sbin/rpc.gssd -- ${OPTS_RPC_GSSD} + eend $? +} + +stop() { + ebegin "Stopping gssd" + start-stop-daemon --stop --exec /usr/sbin/rpc.gssd + eend $? +} diff --git a/user/nfs-utils/rpc.idmapd.initd b/user/nfs-utils/rpc.idmapd.initd new file mode 100644 index 000000000..61cfd4de2 --- /dev/null +++ b/user/nfs-utils/rpc.idmapd.initd @@ -0,0 +1,25 @@ +#!/sbin/openrc-run +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +rpc_bin=/usr/sbin/rpc.idmapd + +depend() { + use ypbind net + need portmap rpc.pipefs + after quota +} + +start() { + ebegin "Starting idmapd" + ${rpc_bin} ${OPTS_RPC_IDMAPD} + eend $? "make sure DNOTIFY support is enabled ..." +} + +stop() { + ebegin "Stopping idmapd" + start-stop-daemon --stop --exec ${rpc_bin} + eend $? +} diff --git a/user/nfs-utils/rpc.pipefs.initd b/user/nfs-utils/rpc.pipefs.initd new file mode 100644 index 000000000..f971a49b3 --- /dev/null +++ b/user/nfs-utils/rpc.pipefs.initd @@ -0,0 +1,32 @@ +#!/sbin/openrc-run +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +MNT="/var/lib/nfs/rpc_pipefs" + +mount_pipefs() { + local fstype=rpc_pipefs + + # if things are already mounted, nothing to do + mountinfo -q ${MNT} && return 0 + + # if rpc_pipefs is not available, try to load sunrpc for it #219566 + grep -qs ${fstype} /proc/filesystems || modprobe -q sunrpc + # if still not available, the `mount` will issue an error for the user + + # now just do it for kicks + mkdir -p ${MNT} + mount -t ${fstype} ${fstype} ${MNT} +} + +start() { + ebegin "Setting up RPC pipefs" + mount_pipefs + eend $? "make sure you have NFS/SUNRPC enabled in your kernel" +} + +stop() { + ebegin "Unmounting RPC pipefs" + umount ${MNT} + eend $? +} diff --git a/user/nfs-utils/rpc.statd.initd b/user/nfs-utils/rpc.statd.initd new file mode 100644 index 000000000..ea78b9aef --- /dev/null +++ b/user/nfs-utils/rpc.statd.initd @@ -0,0 +1,32 @@ +#!/sbin/openrc-run +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +rpc_bin=/sbin/rpc.statd +rpc_pid=/var/run/rpc.statd.pid + +depend() { + use ypbind net + need portmap + after quota +} + +start() { + # Don't start rpc.statd if already started by someone else ... + # Don't try and kill it if it's already dead ... + if killall -q -0 ${rpc_bin} ; then + return 0 + fi + + ebegin "Starting NFS statd" + start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD} + eend $? +} + +stop() { + ebegin "Stopping NFS statd" + start-stop-daemon --stop --exec ${rpc_bin} --pidfile /var/run/rpc.statd.pid + eend $? +} diff --git a/user/nfs-utils/rpc.svcgssd.initd b/user/nfs-utils/rpc.svcgssd.initd new file mode 100644 index 000000000..c714e3607 --- /dev/null +++ b/user/nfs-utils/rpc.svcgssd.initd @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs + +depend() { + use ypbind net + need portmap rpc.pipefs + after quota +} + +start() { + ebegin "Starting svcgssd" + start-stop-daemon --start --exec /usr/sbin/rpc.svcgssd -- ${OPTS_RPC_SVCGSSD} + eend $? +} + +stop() { + ebegin "Stopping svcgssd" + start-stop-daemon --stop --exec /usr/sbin/rpc.svcgssd + eend $? +} diff --git a/user/nfs-utils/undef-def.patch b/user/nfs-utils/undef-def.patch new file mode 100644 index 000000000..12bff6ddf --- /dev/null +++ b/user/nfs-utils/undef-def.patch @@ -0,0 +1,42 @@ +--- nfs-utils-2.3.3/support/nfs/svc_socket.c.old 2018-09-06 18:09:08.000000000 +0000 ++++ nfs-utils-2.3.3/support/nfs/svc_socket.c 2019-01-10 16:17:02.270000000 +0000 +@@ -46,7 +46,7 @@ + struct rpcent *rpcp; + struct servent servbuf, *servp = NULL; + int ret = 0; +-#if HAVE_GETRPCBYNUMBER_R ++#ifdef HAVE_GETRPCBYNUMBER_R + char rpcdata[1024]; + struct rpcent rpcbuf; + +--- nfs-utils-2.3.3/utils/mountd/cache.c.old 2018-09-06 18:09:08.000000000 +0000 ++++ nfs-utils-2.3.3/utils/mountd/cache.c 2019-01-10 16:26:22.750000000 +0000 +@@ -426,7 +426,7 @@ + if (count_slashes(p) != count_slashes(parent)) + return 0; + +-#if HAVE_NAME_TO_HANDLE_AT ++#ifdef HAVE_NAME_TO_HANDLE_AT + struct { + struct file_handle fh; + unsigned char handle[128]; +--- nfs-utils-2.3.3/utils/mount/network.c.old 2018-09-06 18:09:08.000000000 +0000 ++++ nfs-utils-2.3.3/utils/mount/network.c 2019-01-10 16:28:46.840000000 +0000 +@@ -39,7 +39,7 @@ + #include <sys/socket.h> + #include <sys/wait.h> + #include <sys/stat.h> +-#if defined(__GLIBC__) && (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24) ++#if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)) + /* Cannot safely include linux/in6.h in old glibc, so hardcode the needed values */ + # define IPV6_PREFER_SRC_PUBLIC 2 + # define IPV6_ADDR_PREFERENCES 72 +@@ -1062,7 +1062,7 @@ + if (caddr) { + /* Get the address of our end of this connection */ + socklen_t len = sizeof(*caddr); +- if (getsockname(sock, caddr, &len) != 0) ++ if (getsockname(sock, (struct sockaddr *)caddr, &len) != 0) + caddr->sin_family = 0; + } + diff --git a/user/nftables/APKBUILD b/user/nftables/APKBUILD new file mode 100644 index 000000000..3ef6d52aa --- /dev/null +++ b/user/nftables/APKBUILD @@ -0,0 +1,45 @@ +# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> +# Contributor: Jakub Jirutka <jakub@jirutka.cz> +# Contributor: Francesco Colista <fcolista@alpinelinux.org> +# Maintainer: multiplexd <multi@in-addr.xyz> +pkgname=nftables +pkgver=0.9.0 +pkgrel=0 +pkgdesc="Netfilter tables userspace tools" +url="https://netfilter.org/projects/nftables" +options="!check" # no test suite +arch="all" +license="GPL-2.0+ AND GPL-2.0" +makedepends="bison docbook2x flex gmp-dev libmnl-dev libnftnl-dev" +subpackages="$pkgname-doc $pkgname-openrc" +source="https://netfilter.org/projects/nftables/files/$pkgname-$pkgver.tar.bz2 + nftables.confd + nftables.initd" + +build() { + cd "$builddir" + + DB2MAN=docbook2x-man ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --without-cli + make +} + +package() { + cd "$builddir" + + make DESTDIR="$pkgdir" install + + install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname + install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname +} + +sha512sums="ba08fd78d79f7df14a7a7d753e8be33f22d892672ad906672d938c66a8fbb0824fd1d083c173132b7d81dd5e3cdd7771364ec714662876cb71eb4f7ad4eaa59c nftables-0.9.0.tar.bz2 +4eb1adf003dfcaad65c91af6ca88d91b7904c471aefae67e7d3c2f8e053e1ac196d3437a45d1fed5a855b876a0f1fc58a724e381d2acf1164d9120cadee73eef nftables.confd +58daafb012b7cd0248a7db6e10f6a667e683347aaea7eaa78cb88780272f334e00913cea3fd39a22a4a72acc27fabd101944b40916f4b534ddeb509bd0232017 nftables.initd" diff --git a/user/nftables/nftables.confd b/user/nftables/nftables.confd new file mode 100644 index 000000000..87fa8f2ea --- /dev/null +++ b/user/nftables/nftables.confd @@ -0,0 +1,24 @@ +# Configuration for /etc/init.d/nftables + +# Location of file with nftables rules to restore on service start, +# and save rules to on service stop when $save_on_stop is enabled. +#rules_file="/etc/firewall.nft" + +# Options to pass to nft on save. +#save_options="-n" + +# Save state on stopping nftables. +#save_on_stop="yes" + +# Enable IPv4/IPv6 forwarding with the rules? +# Note: If you want to enable forwarding only on selected interfaces, +# keep this disabled and enable forwarding using /etc/sysctl.conf. +#enable_forwarding="no" + +# If you need to log nftables messages as soon as nftables starts, +# AND your logger does NOT depend on the network, then you may wish +# to uncomment the next line. +# If your logger depends on the network, and you uncomment this line +# you will create an unresolvable circular dependency during startup. +# After commenting or uncommenting this line, you must run 'rc-update -u'. +#rc_use="logger" diff --git a/user/nftables/nftables.initd b/user/nftables/nftables.initd new file mode 100644 index 000000000..c763b395d --- /dev/null +++ b/user/nftables/nftables.initd @@ -0,0 +1,127 @@ +#!/sbin/openrc-run +# Copyright 2014 Nicholas Vinson +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_commands="list panic save" +extra_started_commands="reload" + +description="Manage nftable based firewall." +description_save="Save current nftables rulesets to disk." +description_list="Displays the current nftables ruleset." +description_panic="Immediately drop all packets on all interfaces." +description_reload="Clear current rulesets and load rulesets from the saved ruleset files." + +# Uppercase variables are there for backward compatibility. +: ${rules_file:=${NFTABLES_SAVE:="/etc/firewall.nft"}} +: ${save_options:=${SAVE_OPTIONS:="-n"}} +: ${save_on_stop:=${SAVE_ON_STOP:="yes"}} +: ${enable_forwarding:="no"} + +depend() { + need localmount + after sysctl + before net + provide firewall +} + +start_pre() { + checkkernel && checkconfig +} + +list() { + nft list ruleset +} + +panic() { + checkkernel || return 1 + + if service_started "$RC_SVCNAME"; then + rc-service "$RC_SVCNAME" stop + fi + + ebegin "Dropping all packets" + nft -f /dev/stdin <<-EOF + flush ruleset + table inet filter { + chain input { type filter hook input priority 0; policy drop; } + chain forward { type filter hook forward priority 0; policy drop; } + chain output { type filter hook output priority 0; policy drop; } + } + EOF + eend $? +} + +reload() { + start +} + +save() { + ebegin "Saving nftables state" + + checkpath -q -d "${rules_file%/*}" + checkpath -q -m 0600 -f "$rules_file" + + local tmp_save="$rules_file.tmp" + + echo 'flush ruleset' > "$tmp_save" + nft list ruleset >> "$tmp_save"; local retval=$? + + [ $retval -eq 0 ] && mv "$tmp_save" "$rules_file" + + return $retval +} + +start() { + ebegin "Loading nftables state and starting firewall" + + nft -f "$rules_file" + eend $? || return 1 + + if yesno "$enable_forwarding"; then + ebegin "Enabling forwarding" + forwarding 1 + eend $? || return 1 + fi +} + +stop() { + if yesno "$save_on_stop"; then + save || return 1 + fi + + if yesno "$enable_forwarding"; then + ebegin "Disabling forwarding" + forwarding 0 + eend $? + fi + + ebegin "Stopping firewall" + nft flush ruleset + eend $? +} + +checkconfig() { + if [ ! -f "$rules_file" ]; then + eerror "Not starting nftables. First create some rules then run:" + eerror " rc-service nftables save" + return 1 + fi + return 0 +} + +checkkernel() { + if ! nft list tables >/dev/null 2>&1; then + eerror "Your kernel lacks nftables support, please load" + eerror "appropriate modules and try again." + return 1 + fi + return 0 +} + +forwarding() { + /sbin/sysctl -qw \ + net.ipv4.ip_forward=$1 \ + net.ipv6.conf.default.forwarding=$1 \ + net.ipv6.conf.all.forwarding=$1 +} diff --git a/user/nghttp2/APKBUILD b/user/nghttp2/APKBUILD index 41c43ab9b..da23381f8 100644 --- a/user/nghttp2/APKBUILD +++ b/user/nghttp2/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: pkgname=nghttp2 -pkgver=1.35.1 +pkgver=1.36.0 pkgrel=0 pkgdesc="Experimental HTTP/2 client, server and proxy" url="https://nghttp2.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fcd3f79f913afbeee1c75003bb39df918e6122bbf728b3ad4192d5849d8fb96705e04f5505465d63f25a565b2f1da6abd8fabdebb6e3347500f7abd31980861d nghttp2-1.35.1.tar.xz" +sha512sums="4e0d5c5cdb4f1b7e5f12790850237f36649af4aa9596033392725972e4e0e5a33bb78bd1aa0735e35e489b523b7e9a236a7b5847dfca69bd7583fcab36c13c76 nghttp2-1.36.0.tar.xz" diff --git a/user/ninja/APKBUILD b/user/ninja/APKBUILD index 005f7114a..e0638a176 100644 --- a/user/ninja/APKBUILD +++ b/user/ninja/APKBUILD @@ -1,15 +1,17 @@ # Contributor: k0r10n <k0r10n.dev@gmail.com> # Maintainer: pkgname=ninja -pkgver=1.8.2 -pkgrel=1 +pkgver=1.9.0 +pkgrel=0 pkgdesc="Small build system with a focus on speed" url="https://ninja-build.org/" arch="all" license="Apache-2.0" makedepends="asciidoctor gtest python3 re2c" subpackages="$pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/martine/ninja/archive/v$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/martine/ninja/archive/v$pkgver.tar.gz + posix-fix.patch::https://github.com/ninja-build/ninja/pull/1513/commits/567815df38a2ff54ad7478a90bd75c91e434236a.patch + " build() { cd "$builddir" @@ -36,4 +38,5 @@ package() { "$pkgdir/usr/share/bash-completion/completions/ninja" } -sha512sums="1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2 ninja-1.8.2.tar.gz" +sha512sums="a8b5ad00b60bddbdb8439a6092c91a65d093f9bcd6241f69088eb35bea2847efe673c3107a130dc754c747c7712b839d8f88e88d8389520cf7143668ee053feb ninja-1.9.0.tar.gz +78b29a57ec3c4feedf2bcfe9370b30cecd5302f29e8e14c6a3bc01becb555be6330aafba12f9225625af0644ea1f534feba8396d32bb944253a9daa5dd0e98d8 posix-fix.patch" diff --git a/user/nmap/APKBUILD b/user/nmap/APKBUILD new file mode 100644 index 000000000..9be34874f --- /dev/null +++ b/user/nmap/APKBUILD @@ -0,0 +1,87 @@ +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=nmap +pkgver=7.70 +pkgrel=0 +pkgdesc="A network exploration tool and security/port scanner" +url="http://nmap.org" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="linux-headers openssl-dev libpcap-dev pcre-dev zlib-dev libssh2-dev lua5.3-dev" +options="!checkroot" +subpackages=" + $pkgname-doc + $pkgname-scripts::noarch + $pkgname-nselibs::noarch + $pkgname-nping + $pkgname-ncat" +source="https://nmap.org/dist/$pkgname-$pkgver.tar.bz2" + +prepare() { + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + # zenmap and ndiff require python 2 + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --without-zenmap \ + --without-ndiff \ + --with-openssl=yes \ + --with-libpcap=yes \ + --with-libpcre=yes \ + --with-libz=yes \ + --with-libssh2=yes \ + --with-liblua=/usr/lua5.3 + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE +} + +scripts() { + depends="$pkgname-nselibs" + pkgdesc="$pkgdesc (scripts)" + + mkdir -p "$subpkgdir"/usr/share/nmap/ + mv "$pkgdir"/usr/share/nmap/scripts \ + "$subpkgdir"/usr/share/nmap/ +} + +nselibs() { + pkgdesc="$pkgdesc (nselibs)" + + mkdir -p "$subpkgdir"/usr/share/nmap/ + mv "$pkgdir"/usr/share/nmap/nse_main.lua \ + "$pkgdir"/usr/share/nmap/nselib \ + "$subpkgdir"/usr/share/nmap/ +} + +ncat() { + pkgdesc="$pkgdesc (ncat tool)" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/ncat "$subpkgdir"/usr/bin +} + +nping() { + pkgdesc="$pkgdesc (nping tool)" + mkdir -p "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/bin/nping "$subpkgdir"/usr/bin +} + +sha512sums="084c148b022ff6550e269d976d0077f7932a10e2ef218236fe13aa3a70b4eb6506df03329868fc68cb3ce78e4360b200f5a7a491d3145028fed679ef1c9ecae5 nmap-7.70.tar.bz2" diff --git a/user/nml/APKBUILD b/user/nml/APKBUILD new file mode 100644 index 000000000..6b7f9facb --- /dev/null +++ b/user/nml/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=nml +pkgver=0.4.5 +pkgrel=0 +pkgdesc="NewGRF Meta Language utilities for OpenTTD mods" +url="https://newgrf-specs.tt-wiki.net/wiki/NML:Main" +arch="all" +license="GPL-2.0+" +depends="python3 py3-pillow py3-ply" +makedepends="python3-dev" +subpackages="" +source="http://bundles.openttdcoop.org/nml/releases/$pkgver/nml-$pkgver.tar.gz" + +build() { + cd "$builddir" + python3 setup.py build +} + +check() { + cd "$builddir" + make -C regression +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="64b2f46a1c2e37fce8f51231094e30334f368b0db39c6a3977a144a798d8034d1abbe7c14af3921eb81f4b7caa193e7e53ccb9e27acd113e0407926b109ca952 nml-0.4.5.tar.gz" diff --git a/user/nsd/APKBUILD b/user/nsd/APKBUILD new file mode 100644 index 000000000..388c902a1 --- /dev/null +++ b/user/nsd/APKBUILD @@ -0,0 +1,55 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +pkgname=nsd +pkgver=4.1.26 +pkgrel=0 +pkgdesc="An authoritative only name server" +url="https://www.nlnetlabs.nl/projects/nsd/about/" +arch="all" +options="!check" # No test suite +license="BSD-3-Clause" +depends="" +makedepends="libevent-dev openssl-dev" +subpackages="$pkgname-doc $pkgname-openrc" +install="$pkgname.pre-install" +pkgusers="nsd" +pkggroups="nsd" +source="https://nlnetlabs.nl/downloads/$pkgname/$pkgname-$pkgver.tar.gz + nsd.confd + nsd.initd" + +build() { + cd "$builddir" + + # dnstap has yet unpackaged dependencies + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --with-pidfile=/run/nsd.pid \ + --disable-dnstap \ + --enable-bind8-stats \ + --enable-ratelimit \ + --enable-ratelimit-default-is-off \ + --enable-recvmmsg \ + --with-ssl=/usr \ + --with-libevent=/usr + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +openrc() { + default_openrc + install -Dm755 "$srcdir/nsd.initd" "$subpkgdir/etc/init.d/nsd" + install -Dm644 "$srcdir/nsd.confd" "$subpkgdir/etc/conf.d/nsd" +} + +sha512sums="49c07ad79e4e056bd519dad157a44d5cc55cd9a28723fd910159dc761d4ba56ef86cb7bf289dc5d1b363a49b999232bb7ec1afa737ca5c2659c4c9893e93494b nsd-4.1.26.tar.gz +f0ef1d3427e92650239d9d91402810c045fc9223e3f42ce86986422bf2039a0bcc02dffdfe1153d54de5c76c8f2bdc3e34fe341c65b41f2d333b02c00b5b0eae nsd.confd +139e52dec98792173f06d298574db0d0e6966a06af8a0a3069487beb01fd570c09d22322569b54bacdc43232dbfb99a8c497d4417d2bbfee88bcdd9d1b4d22f7 nsd.initd" diff --git a/user/nsd/nsd.confd b/user/nsd/nsd.confd new file mode 100644 index 000000000..403de4fe8 --- /dev/null +++ b/user/nsd/nsd.confd @@ -0,0 +1,5 @@ +# +# Specify daemon options here. +# + +nsd_opts="" diff --git a/user/nsd/nsd.initd b/user/nsd/nsd.initd new file mode 100644 index 000000000..981e04ac7 --- /dev/null +++ b/user/nsd/nsd.initd @@ -0,0 +1,15 @@ +#!/sbin/openrc-run + +name="nsd" +command="/usr/sbin/nsd" +command_args="${nsd_opts}" +pidfile="/run/nsd.pid" +extra_started_commands="reload" + +depend() { + use logger net +} + +reload() { + start-stop-daemon --signal HUP --pidfile "${pidfile}" +} diff --git a/user/nsd/nsd.pre-install b/user/nsd/nsd.pre-install new file mode 100755 index 000000000..b8a8bf698 --- /dev/null +++ b/user/nsd/nsd.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +groupadd -r nsd 2>/dev/null +useradd -M -N -g nsd -r -s /sbin/nologin -d /etc/nsd nsd 2>/dev/null +exit 0 diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD index 9fbbd1741..3c7a22702 100644 --- a/user/obconf-qt/APKBUILD +++ b/user/obconf-qt/APKBUILD @@ -1,15 +1,15 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=obconf-qt -pkgver=0.13.0 +pkgver=0.14.0 pkgrel=0 pkgdesc="Qt5-based Openbox configuration tool" url="https://lxqt.org/" arch="all" license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools openbox-dev liblxqt-dev - qt5-qttools-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 openbox-dev + liblxqt-dev qt5-qttools-dev" source="https://github.com/lxqt/obconf-qt/releases/download/$pkgver/obconf-qt-$pkgver.tar.xz" build() { @@ -23,7 +23,6 @@ build() { -DCMAKE_INSTALL_LIBDIR=lib \ -DBUILD_SHARED_LIBS=True \ -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ - -DPULL_TRANSLATIONS=False \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ ${CMAKE_CROSSOPTS} .. @@ -40,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="537c10e286311d39f3e69c2940f4267d7dd2e55888e1e50d6aeb3cad8f694fec7792ca30e258a69cfe0c5361acecd4232605e47e71e27fa53b25f4bb65a0d703 obconf-qt-0.13.0.tar.xz" +sha512sums="44cbea3ba0372bb06c8d3be2f8646432df01bc49081b3ffa6f6dc2a0dedb6402ba5089299167f41fbc4d719876ce872113af4bbb79439c9e2dc454225e2bb530 obconf-qt-0.14.0.tar.xz" diff --git a/user/oclock/APKBUILD b/user/oclock/APKBUILD new file mode 100644 index 000000000..d75964c02 --- /dev/null +++ b/user/oclock/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=oclock +pkgver=1.0.4 +pkgrel=0 +pkgdesc="The original round X11 clock applet" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxext-dev libxkbfile-dev libxmu-dev libxt-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/oclock-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="6e0d36a84572a153226b2929f2253cb7adc3c9e5e3af168aeaf8c487ade2e43517b271a8e9cdb2a2c4a67ca56ed0b99c194ca63a4a822b68bfc72ca6518335e7 oclock-1.0.4.tar.bz2" diff --git a/user/ode/APKBUILD b/user/ode/APKBUILD index f21ef2b42..7a55d53cb 100644 --- a/user/ode/APKBUILD +++ b/user/ode/APKBUILD @@ -4,7 +4,7 @@ pkgname=ode pkgver=0.14 pkgrel=0 pkgdesc="High performance library for simulating rigid body dynamics" -url="https://www.ode-wiki.org/wiki/index.php?title=Main_Page" +url="https://ode.org/" arch="all" options="!check" # Fails 48/52 tests license="LGPL-2.1+ OR BSD-3-Clause" diff --git a/user/okular/APKBUILD b/user/okular/APKBUILD index 63f52d7dd..c7d9f41d8 100644 --- a/user/okular/APKBUILD +++ b/user/okular/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=okular -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Universal document reader developed by KDE" url="https://okular.kde.org/" @@ -13,7 +13,8 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdoctools-dev kiconthemes-dev kio-dev kjs-dev kparts-dev kwallet-dev kwindowsystem-dev khtml-dev threadweaver-dev kactivities-dev poppler-qt5-dev tiff-dev qca-dev - libjpeg-turbo-dev kpty-dev kirigami2-dev" + libjpeg-turbo-dev kpty-dev kirigami2-dev djvulibre-dev libkexiv2-dev + libspectre-dev ebook-tools-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/okular-$pkgver.tar.xz" @@ -44,4 +45,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a03775c10d56d8d2740a82d9e44e3fc59259408dde855cb8d5a1ad824502e78a442adfa2c795ea0ffdcc14bd3bef52e1a14da2967b854107027221bf8e32aec2 okular-18.08.3.tar.xz" +sha512sums="abe8c86470b2372fdbc43fce395f70d543392bb3f2c27a36953acf1132fb1d03eb7d8636999946f27854cc9ce1738be93b718c786e11712c35ec1848637defe9 okular-18.12.2.tar.xz" diff --git a/user/openal-soft/APKBUILD b/user/openal-soft/APKBUILD index db823c6de..d5d32afe3 100644 --- a/user/openal-soft/APKBUILD +++ b/user/openal-soft/APKBUILD @@ -1,17 +1,17 @@ # Contributor: William Pitcock <nenolod@dereferenced.org> # Maintainer: pkgname=openal-soft -pkgver=1.18.2 -pkgrel=1 +pkgver=1.19.1 +pkgrel=0 pkgdesc="Software implementation of OpenAL API" -url="http://kcat.strangesoft.net/openal.html" +url="https://kcat.strangesoft.net/openal.html" arch="all" license="LGPL-2.0+" depends="" depends_dev="alsa-lib-dev" makedepends="$depends_dev cmake linux-headers pulseaudio-dev" subpackages="$pkgname-dev" -source="http://kcat.strangesoft.net/openal-releases/${pkgname}-${pkgver}.tar.bz2" +source="https://kcat.strangesoft.net/openal-releases/${pkgname}-${pkgver}.tar.bz2" prepare() { default_prepare @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d openal-soft-1.18.2.tar.bz2" +sha512sums="356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4 openal-soft-1.19.1.tar.bz2" diff --git a/user/opengfx/APKBUILD b/user/opengfx/APKBUILD new file mode 100644 index 000000000..b0ab22c55 --- /dev/null +++ b/user/opengfx/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=opengfx +pkgver=0.5.4 +pkgrel=0 +pkgdesc="Graphics files for OpenTTD" +url="https://www.openttd.org/en/" +arch="noarch" +options="!check" # Requires GIMP +license="GPL-2.0-only" +depends="" +makedepends="grfcodec nml" +subpackages="" +source="http://bundles.openttdcoop.org/opengfx/releases/$pkgver/$pkgname-$pkgver-source.tar.xz + Makefile.patch + " +builddir="$srcdir/$pkgname-$pkgver-source" + +build() { + cd "$builddir" + make GIMP="" _V="" bundle_tar +} + +package() { + cd "$builddir" + local _file + for _file in *.grf opengfx.obg; do + install -D -m644 -g games $_file \ + "$pkgdir"/usr/share/games/openttd/data/$_file + done +} + +sha512sums="42f8438c747b42a77cf9d86c5da60ce3ce84ed347d714c345f3871806f9e35f2ed4729b445e0ee319f3e2edd53458dfbaad5ca42e389c3a2e800bce19223cdb1 opengfx-0.5.4-source.tar.xz +f2cd513b6b244fcdd522e488c3becd27164f622f0bc723bd1f704ce1e76419ac628425cf3fc437beb50f851735923e85eae8a3f70e828f58edff4d632784bbf9 Makefile.patch" diff --git a/user/opengfx/Makefile.patch b/user/opengfx/Makefile.patch new file mode 100644 index 000000000..169df9668 --- /dev/null +++ b/user/opengfx/Makefile.patch @@ -0,0 +1,31 @@ +--- opengfx-0.5.3-source/Makefile ++++ opengfx-0.5.3-source/Makefile +@@ -99,8 +99,8 @@ + AWK ?= awk + GREP ?= grep + PYTHON ?= python +-UNIX2DOS ?= $(shell which unix2dos) +-UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null && echo "-q" || echo "") ++UNIX2DOS ?= $(shell which unix2dos 2>/dev/null) ++UNIX2DOS_FLAGS ?= $(shell [ -n $(UNIX2DOS) ] && $(UNIX2DOS) -q --version 2>/dev/null >&2 && echo "-q" || echo "") + + # Graphics processing + GIMP ?= gimp +@@ -196,7 +196,7 @@ + endif + + # Days of commit since 2000-1-1 00-00 +-REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print (date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days") ++REPO_DAYS_SINCE_2000 ?= $(shell $(PYTHON) -c "from datetime import date; print ((date(`echo "$(REPO_DATE)" | sed s/-/,/g | sed s/,0/,/g`)-date(2000,1,1)).days)") + + # Filename addition, if we're not building the default branch + REPO_BRANCH_STRING ?= $(shell if [ "$(REPO_BRANCH)" = "$(DEFAULT_BRANCH_NAME)" ]; then echo ""; else echo "-$(REPO_BRANCH)"; fi) +@@ -719,7 +719,7 @@ + $(_E) + endif + $(_E) "Release:" +- $(_E) "bananas: Upload bundle to BaNaNaS ++ $(_E) "bananas: Upload bundle to BaNaNaS" + $(_E) + $(_E) "Valid command line variables are:" + $(_E) "Helper programmes:" diff --git a/user/openmsx/APKBUILD b/user/openmsx/APKBUILD new file mode 100644 index 000000000..5e29f657e --- /dev/null +++ b/user/openmsx/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=openmsx +pkgver=0.3.1 +pkgrel=0 +pkgdesc="Music files for OpenTTD" +url="https://www.openttd.org/en/" +arch="noarch" +options="!check" # No way to test MIDIs +license="GPL-2.0-only" +depends="" +makedepends="python3" +subpackages="" +source="https://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-$pkgver-source.tar.gz + python3.patch + " +builddir="$srcdir/$pkgname-$pkgver-source" + +build() { + cd "$builddir" + make _V="" bundle +} + +package() { + cd "$builddir"/$pkgname-$pkgver + local _file + for _file in *.mid openmsx.obm; do + install -D -m644 -g games $_file \ + "$pkgdir"/usr/share/games/openttd/gm/$_file + done +} + +sha512sums="e455f99f32d1daa77157def4f109dd1456169ae2b527290035b6a52f591c13fb7464fd221e00eb46bf03f51e8d0101de08a9e47cebe2430ad05a840ab235973e openmsx-0.3.1-source.tar.gz +b6690158831cb3da9e0e65a523529ee0bb694a4a8b23c89f615b2481601a71fd84caecf29430054e69afa3ffcb53cf8dd5826358d7ef89429c661dd4d47bbb74 python3.patch" diff --git a/user/openmsx/python3.patch b/user/openmsx/python3.patch new file mode 100644 index 000000000..191aacfd6 --- /dev/null +++ b/user/openmsx/python3.patch @@ -0,0 +1,265 @@ +--- openmsx-0.3.1-source/scripts/authorlist.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/authorlist.py 2019-01-12 18:12:26.010000000 +0000 +@@ -10,7 +10,6 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + + while 1: +@@ -18,10 +17,10 @@ + if data != '': + # do some processing of the contents of + # the data variable +- separate = string.split(data,";") +- print '%-30s %s' % (separate[1]+":", separate[2]) ++ separate = data.split(";") ++ print('%-30s %s' % (separate[1]+":", separate[2])) + # end of data processing command group +- # sys.stdout.write(res) ++ # sys.stdout.write(res) + else: + sys.stdout.flush() + break +--- openmsx-0.3.1-source/scripts/md5list.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/md5list.py 2019-01-12 18:16:21.260000000 +0000 +@@ -10,7 +10,6 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + import subprocess + import os +@@ -18,25 +17,25 @@ + while 1: + data = sys.stdin.readline() + if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- systemtype = (os.uname())[0] +- if systemtype == 'Linux': +- md5call = ["md5sum"] +- elif systemtype == 'Darwin': +- md5call = ["md5", "-r"] +- else: +- md5call = ["md5sum"] +- md5call = md5call + ["src/"+string.strip(separate[1])] +- md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0] +- md5sum = string.split(md5sum) +- res = "%-32s = %s\n" % (separate[1], md5sum[0]) ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(";") ++ if len(separate) != 4: ++ continue ++ systemtype = (os.uname())[0] ++ if systemtype == 'Linux': ++ md5call = ["md5sum"] ++ elif systemtype == 'Darwin': ++ md5call = ["md5", "-r"] ++ else: ++ md5call = ["md5sum"] ++ md5call = md5call + ["src/"+separate[1].strip()] ++ md5sum = subprocess.Popen(md5call, stdout=subprocess.PIPE).communicate()[0] ++ md5sum = md5sum.split() ++ res = "%-32s = %s\n" % (separate[1], md5sum[0].decode('utf-8')) + sys.stdout.write(res) + else: + sys.stdout.flush() +--- openmsx-0.3.1-source/scripts/midifiles.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/midifiles.py 2019-01-12 18:09:21.660000000 +0000 +@@ -10,23 +10,22 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + + res = "" + while 1: + data = sys.stdin.readline() + if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- res = res + " src/" + string.strip(separate[1]) ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(";") ++ if len(separate) != 4: ++ continue ++ res = res + " src/" + separate[1].strip() + else: +- sys.stdout.write(res) ++ sys.stdout.write(res) + sys.stdout.flush() + break +--- openmsx-0.3.1-source/scripts/namelist.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/namelist.py 2019-01-12 18:24:41.820000000 +0000 +@@ -10,27 +10,26 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + + while 1: + data = sys.stdin.readline() + if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- res = "%-32s = %s\n" % (separate[1], string.strip(separate[3])) ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(";") ++ if len(separate) != 4: ++ continue ++ res = "%-32s = %s\n" % (separate[1], separate[3].strip()) + sys.stdout.write(res) + else: + sys.stdout.flush() + break + + def authorlist(mystr): +- separate = string.split() +- for str in separate: +- print string.strip(str) +\ No newline at end of file ++ separate = mystr.split() ++ for str in separate: ++ print(str.strip()) +--- openmsx-0.3.1-source/scripts/playlist.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/playlist.py 2019-01-12 18:24:46.440000000 +0000 +@@ -10,31 +10,30 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + + while 1: + data = sys.stdin.readline() + if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- res = "" +- # leave out all lines which don't have the proper number of elements +- if len(separate) >= 1: +- res = string.strip(separate[0]) + " = " +- if len(separate) == 4: +- res = res + separate[1] +- res = res + "\n" ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(";") ++ res = "" ++ # leave out all lines which don't have the proper number of elements ++ if len(separate) >= 1: ++ res = separate[0].strip() + " = " ++ if len(separate) == 4: ++ res = res + separate[1] ++ res = res + "\n" + sys.stdout.write(res) + else: + sys.stdout.flush() + break + + def authorlist(mystr): +- separate = string.split() +- for str in separate: +- print string.strip(str) +\ No newline at end of file ++ separate = mystr.split() ++ for str in separate: ++ print(str.strip()) +--- openmsx-0.3.1-source/scripts/sanitize_list.py.old 2010-08-09 22:34:42.000000000 +0000 ++++ openmsx-0.3.1-source/scripts/sanitize_list.py 2019-01-12 18:25:21.200000000 +0000 +@@ -10,34 +10,33 @@ + # <http://www.gnu.org/licenses/>. + # + +-import string + import sys + + while 1: + data = sys.stdin.readline() + if data != '': +- # leave out all comment lines (lines starting with '#') +- comment_pos = string.find(data,'#') +- if comment_pos == 0: +- continue +- # separate the single entries by ';' +- separate = string.split(data,";") +- if len(separate) != 4: +- continue +- res = "" +- for str in separate: +- if res != '': +- res = res + ";" + string.strip(str) +- else: +- res = string.strip(str) ++ # leave out all comment lines (lines starting with '#') ++ comment_pos = data.find('#') ++ if comment_pos == 0: ++ continue ++ # separate the single entries by ';' ++ separate = data.split(";") ++ if len(separate) != 4: ++ continue ++ res = "" ++ for str in separate: ++ if res != '': ++ res = res + ";" + str.strip() ++ else: ++ res = str.strip() + # end of data processing command group +- res = res + "\n" ++ res = res + "\n" + sys.stdout.write(res) + else: + sys.stdout.flush() + break + + def authorlist(mystr): +- separate = string.split() +- for str in separate: +- print string.strip(str) +\ No newline at end of file ++ separate = mystr.split() ++ for str in separate: ++ print(str.strip()) diff --git a/user/opensfx/APKBUILD b/user/opensfx/APKBUILD new file mode 100644 index 000000000..00093833d --- /dev/null +++ b/user/opensfx/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=opensfx +pkgver=0.2.3 +pkgrel=0 +pkgdesc="Sound files for OpenTTD" +url="https://www.openttd.org/en/" +arch="noarch" +license="CC-Sampling-Plus-1.0" +depends="" +makedepends="catcodec" +subpackages="" +source="https://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-$pkgver-source.tar.gz" +builddir="$srcdir/$pkgname-$pkgver-source" + +build() { + cd "$builddir" + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + install -D -m644 -g games opensfx.cat \ + "$pkgdir"/usr/share/games/openttd/data/opensfx.cat + install -D -m644 -g games opensfx.obs \ + "$pkgdir"/usr/share/games/openttd/data/opensfx.obs +} + +sha512sums="7575c8febcbcabe8f9042a1a197ba76b9020e335663bf70b0aaebafe4b0758f82ff7acc624b1dfdc12d38e346f139454b78ea29e18a8bb8bd2afd3d6a209669c opensfx-0.2.3-source.tar.gz" diff --git a/user/openttd/APKBUILD b/user/openttd/APKBUILD new file mode 100644 index 000000000..63df0988e --- /dev/null +++ b/user/openttd/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=openttd +pkgver=1.8.0 +pkgrel=0 +pkgdesc="Simulation game based on Transport Tycoon Deluxe" +url="https://www.openttd.org/en/" +arch="all" +options="!check" # Test files not shipped in release package. +license="GPL-2.0-only" +depends="opengfx openmsx opensfx" +makedepends="fontconfig-dev freetype-dev icu-dev libpng-dev libxdg-basedir-dev + lzo-dev sdl-dev xz-dev zlib-dev" +subpackages="$pkgname-doc" +source="https://binaries.openttd.org/releases/1.8.0/openttd-$pkgver-source.tar.xz + icu61.patch + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --install-dir="$pkgdir" \ + --disable-strip + make +} + +package() { + cd "$builddir" + make install +} + +sha512sums="a2d61b3c94a550c8f3a581127df8c3459b1ddff5ba924942c468cbc70e88e0bf4405cecb68a91243b544ead64f215aa8d489a07b38dce507ae7d59e8ec155d7a openttd-1.8.0-source.tar.xz +db470433bcc68688b1a4cf71a514879c139300a778feb3f832bff0400b578d4b7720df6e259a86013334a661fce56c66d74aaf709d0027cf9638f006bebca10e icu61.patch" diff --git a/user/openttd/icu61.patch b/user/openttd/icu61.patch new file mode 100644 index 000000000..e4143d82f --- /dev/null +++ b/user/openttd/icu61.patch @@ -0,0 +1,45 @@ +From 19076c24c1f3baf2a22d1fa832d5688216cf54a3 Mon Sep 17 00:00:00 2001 +From: Charles Pigott <charlespigott@googlemail.com> +Date: Sun, 8 Apr 2018 01:06:18 +0100 +Subject: [PATCH] Fix #6690: Compilation with ICU 61 + +--- + src/language.h | 2 +- + src/strings.cpp | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/language.h b/src/language.h +index d33ba81892..ec241dbd8c 100644 +--- a/src/language.h ++++ b/src/language.h +@@ -105,7 +105,7 @@ extern LanguageList _languages; + extern const LanguageMetadata *_current_language; + + #ifdef WITH_ICU_SORT +-extern Collator *_current_collator; ++extern icu::Collator *_current_collator; + #endif /* WITH_ICU_SORT */ + + bool ReadLanguagePack(const LanguageMetadata *lang); +diff --git a/src/strings.cpp b/src/strings.cpp +index 1c539d9343..fd7420259a 100644 +--- a/src/strings.cpp ++++ b/src/strings.cpp +@@ -52,7 +52,7 @@ const LanguageMetadata *_current_language = NULL; ///< The currently loaded lang + TextDirection _current_text_dir; ///< Text direction of the currently selected language. + + #ifdef WITH_ICU_SORT +-Collator *_current_collator = NULL; ///< Collator for the language currently in use. ++icu::Collator *_current_collator = NULL; ///< Collator for the language currently in use. + #endif /* WITH_ICU_SORT */ + + static uint64 _global_string_params_data[20]; ///< Global array of string parameters. To access, use #SetDParam. +@@ -1795,7 +1795,7 @@ bool ReadLanguagePack(const LanguageMetadata *lang) + + /* Create a collator instance for our current locale. */ + UErrorCode status = U_ZERO_ERROR; +- _current_collator = Collator::createInstance(Locale(_current_language->isocode), status); ++ _current_collator = icu::Collator::createInstance(icu::Locale(_current_language->isocode), status); + /* Sort number substrings by their numerical value. */ + if (_current_collator != NULL) _current_collator->setAttribute(UCOL_NUMERIC_COLLATION, UCOL_ON, status); + /* Avoid using the collator if it is not correctly set. */ diff --git a/user/optipng/APKBUILD b/user/optipng/APKBUILD new file mode 100644 index 000000000..fcdef5b01 --- /dev/null +++ b/user/optipng/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=optipng +pkgver=0.7.7 +pkgrel=0 +pkgdesc="Advanced PNG optimiser" +url="http://optipng.sourceforge.net/" +arch="all" +license="zlib" +depends="" +makedepends="libpng-dev zlib-dev" +subpackages="$pkgname-doc" +source="https://downloads.sourceforge.net/optipng/optipng-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + -prefix=/usr \ + -mandir=/usr/share/man \ + -with-system-libs + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="c33b7650143ab39944d2c066e07e10273c37024c5bfe7c00475bfb513af96afa081ff388164845d426d3bce624c0282dee574fa150e963f18d3683d821030280 optipng-0.7.7.tar.gz" diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD new file mode 100644 index 000000000..588a20ec9 --- /dev/null +++ b/user/otf-exo/APKBUILD @@ -0,0 +1,24 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=otf-exo +pkgver=2 +pkgrel=0 +pkgdesc="Sans serif font with a geometric design" +url="http://ndiscovered.com/" +arch="noarch" +options="!check" # No tests +license="OFL-1.1" +depends="fontconfig" +makedepends="" +source="http://ndiscovered.com/archives/exo-$pkgver.zip" +builddir="$srcdir" + +package() { + cd "$builddir" + mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + for i in *.otf; do + install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + done +} + +sha512sums="b6d7c749f555b0ab9cfa759b631c7c6d88d31d207fd404ec0d06942cb4b6f53c17ada4dce08aede61f16213ace73dae0a176f71a808be0a5cf5e2166060276e6 exo-2.zip" diff --git a/user/otf-office-code-pro/APKBUILD b/user/otf-office-code-pro/APKBUILD new file mode 100644 index 000000000..6628a1d77 --- /dev/null +++ b/user/otf-office-code-pro/APKBUILD @@ -0,0 +1,29 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=otf-office-code-pro +pkgver=1.004 +pkgrel=0 +pkgdesc="Monospaced font family for programming and console users" +url="https://github.com/nathco/Office-Code-Pro" +arch="noarch" +options="!check" # No tests +license="OFL-1.1" +depends="fontconfig" +makedepends="" +source="https://github.com/nathco/Office-Code-Pro/archive/1.004.zip" +builddir="$srcdir/Office-Code-Pro-$pkgver" + +package() { + mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + cd "$builddir/Fonts/Office Code Pro/OTF" + for i in *.otf; do + install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + done + mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}-d + cd "$builddir/Fonts/Office Code Pro D/OTF" + for i in *.otf; do + install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-}-d + done +} + +sha512sums="ad19b5d6c9d5b8a1bd68a943f9a0c7d8b6dd39f0a7ba5b2e0dfc72afc66a3be994e56c683666c232f3fe1246d368f08281219091be68bdf04643408e35a7e1d6 1.004.zip" diff --git a/user/otf-proggy-vector/APKBUILD b/user/otf-proggy-vector/APKBUILD new file mode 100644 index 000000000..598f710e8 --- /dev/null +++ b/user/otf-proggy-vector/APKBUILD @@ -0,0 +1,24 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=otf-proggy-vector +pkgver=1.1.5 +pkgrel=0 +pkgdesc="Monospaced font family for programming" +url="https://github.com/bluescan/proggyfonts" +arch="noarch" +options="!check" # No tests +license="MIT AND Custom" +depends="fontconfig" +makedepends="" +source="https://github.com/bluescan/proggyfonts/archive/v$pkgver.zip" +builddir="$srcdir/proggyfonts-$pkgver" + +package() { + cd "$builddir"/ProggyVector + mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + for i in *.otf; do + install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + done +} + +sha512sums="24a1506eeaa5c7707a177636d02bca4907e4015e48a94ef981b6489fe49c5b83d89ff21607e33ab1d982321ec66436f006f8b712fdbc6171b6070818b4b54155 v1.1.5.zip" diff --git a/user/otf-source-code-pro/APKBUILD b/user/otf-source-code-pro/APKBUILD new file mode 100644 index 000000000..442611e3f --- /dev/null +++ b/user/otf-source-code-pro/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=otf-source-code-pro +pkgver=2.030 +_pkgver=1.050 +pkgrel=0 +pkgdesc="Monospaced font family for user interfaces and programming" +url="https://adobe-fonts.github.io/source-code-pro/" +arch="noarch" +options="!check" # No tests +license="OFL-1.1" +depends="fontconfig" +makedepends="" +source="https://github.com/adobe-fonts/source-code-pro/archive/${pkgver}R-ro/${_pkgver}R-it.zip" +builddir="$srcdir/source-code-pro-${pkgver}R-ro-${_pkgver}R-it" + +package() { + cd "$builddir"/OTF + mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + for i in *.otf; do + install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + done +} + +sha512sums="b31d4a33482e7817adbe73919fdeeb0e3c0e4564e6dc1b86e7328ca405c5bb1b36338b665b124848ada2e94917b8ce36ee8cc03dd632648b44d1421486c27d02 1.050R-it.zip" diff --git a/user/otf-source-sans-pro/APKBUILD b/user/otf-source-sans-pro/APKBUILD new file mode 100644 index 000000000..497de47fa --- /dev/null +++ b/user/otf-source-sans-pro/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=otf-source-sans-pro +pkgver=2.045 +_pkgver=1.095 +pkgrel=0 +pkgdesc="Sans serif font family for user interfaces" +url="https://adobe-fonts.github.io/source-sans-pro" +arch="noarch" +options="!check" # No tests +license="OFL-1.1" +depends="fontconfig" +makedepends="" +source="https://github.com/adobe-fonts/source-sans-pro/releases/download/2.045R-ro%2F1.095R-it/source-sans-pro-${pkgver}R-ro-${_pkgver}R-it.zip" +builddir="$srcdir/source-sans-pro-${pkgver}R-ro-${_pkgver}R-it" + +package() { + cd "$builddir"/OTF + mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + for i in *.otf; do + install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + done +} + +sha512sums="51b4936460b8882134a362af0c6e2200dc929fa94150346628a8fe3b0ecb5b7f97380ba4b8a339b06e0c5d6d92d4454e95b72eccf12195046475d7aed68cf6fc source-sans-pro-2.045R-ro-1.095R-it.zip" diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD new file mode 100644 index 000000000..529c4fd71 --- /dev/null +++ b/user/otf-source-serif-pro/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=otf-source-serif-pro +pkgver=2.010 +_pkgver=1.010 +pkgrel=0 +pkgdesc="Serif font family for typesetting" +url="https://adobe-fonts.github.io/source-serif-pro/" +arch="noarch" +options="!check" # No tests +license="OFL-1.1" +depends="fontconfig" +makedepends="" +source="https://github.com/adobe-fonts/source-serif-pro/releases/download/${pkgver}R-ro%2F${_pkgver}R-it/source-serif-pro-${pkgver}R-ro-${_pkgver}R-it.zip" +builddir="$srcdir/source-serif-pro-${pkgver}R-ro-${_pkgver}R-it" + +package() { + cd "$builddir"/OTF + mkdir -p "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + for i in *.otf; do + install -Dm644 "$i" "$pkgdir"/usr/share/X11/OTF/${pkgname#*-} + done +} + +sha512sums="464fe11a928a8d574912a87d6df66c57a0fba554bb39ff8ae7faf607440f2805f8022f40870ed408284e3676cc164ce114a483ba4259e23b4d06efeee4c0fc3f source-serif-pro-2.010R-ro-1.010R-it.zip" diff --git a/user/oxygen-fonts/APKBUILD b/user/oxygen-fonts/APKBUILD new file mode 100644 index 000000000..2def092ef --- /dev/null +++ b/user/oxygen-fonts/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=oxygen-fonts +pkgver=5.3.95 +pkgrel=0 +pkgdesc="Fonts for the KDE Oxygen style" +url="https://www.KDE.org/" +arch="noarch" +license="OFL-1.1" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev fontforge-dev" +subpackages="" +source="https://download.kde.org/unstable/plasma/$pkgver/oxygen-fonts-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="97e7cd7900f9628fdce1b41bb3a74373c4fa27a1f7f6269b47cd4ebda3aec0f40bb5540cbd7c50b94f91aae2d7963be1e942fb8b5d01c1ba445eaf1f143e149d oxygen-fonts-5.3.95.tar.xz" diff --git a/user/oxygen-icons5/APKBUILD b/user/oxygen-icons5/APKBUILD index cd5ab2986..6c44d063b 100644 --- a/user/oxygen-icons5/APKBUILD +++ b/user/oxygen-icons5/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=oxygen-icons5 -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="The KDE Oxygen icon set" url="https://www.kde.org/" @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="4552966bdd4ffa078c3b06fa6c39caa685fddb57e9f3af50a1ca7ebe8e2778bf0068deedf7aeae7e40eeaf8d34fd3fbc630f8a62c001e5b50dea2eee1b344029 oxygen-icons5-5.52.0.tar.xz" +sha512sums="5ae34015aebff31cab3192905c388ac5a75c67e7b24ba3bb12075edf6f6cb013f9ace837ea8dd4ef7c5174e27ea1b84e418b34eb983648943c4063dd076d6ccb oxygen-icons5-5.54.0.tar.xz" diff --git a/user/p11-kit/APKBUILD b/user/p11-kit/APKBUILD index f9e45cfd8..ee6c68cb9 100644 --- a/user/p11-kit/APKBUILD +++ b/user/p11-kit/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Fabian Affolter <fabian@affolter-engineering.ch> # Maintainer: pkgname=p11-kit -pkgver=0.23.14 +pkgver=0.23.15 pkgrel=0 pkgdesc="Library for loading and sharing PKCS#11 modules" url="https://p11-glue.github.io/p11-glue/p11-kit.html" @@ -46,4 +46,4 @@ trust() { "$subpkgdir"/usr/lib/pkcs11/ } -sha512sums="fc7e7e0745d7f8e5d783a1f38bad9bbe65b56d54897b6ba2c3118a0d912451c2d48dd113a875e7f7bfcff8fbd6b4905472fcd120630661c12029a16d2b13add4 p11-kit-0.23.14.tar.gz" +sha512sums="d703eec12626b79551ce337521f7ea7b1a0b64c211d7a93d831dd28ec1de77c7b58358c1588bf82d70f047c01ad9433fa8a286d1a25ae3f6b0ee6016b8c42950 p11-kit-0.23.15.tar.gz" diff --git a/user/palapeli/APKBUILD b/user/palapeli/APKBUILD index ccd1c1fb3..2bbf85b94 100644 --- a/user/palapeli/APKBUILD +++ b/user/palapeli/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=palapeli -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Jigsaw puzzle game by KDE" url="https://www.kde.org/applications/games/palapeli/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fb512f842064755dfb250afc29aa3b7672f350c83c1eeaa9ef0f7d920d87b1f80efd7436b0ea6ff447c307709648009f491e5c403e4228080b8518144b7a23b8 palapeli-18.08.3.tar.xz" +sha512sums="1d9f1d05c7bf3a42941f47f87893f626e6624b73c57bb827a76533972fba38a5998fd7b7f3805549d998ae342908221e135c2a7005fd60add1837252be02e70a palapeli-18.12.2.tar.xz" diff --git a/user/pangomm/APKBUILD b/user/pangomm/APKBUILD new file mode 100644 index 000000000..5b2ddd058 --- /dev/null +++ b/user/pangomm/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=pangomm +pkgver=2.42.0 +pkgrel=0 +pkgdesc="C++ interfaces for Pango" +url="https://gnome.org" +arch="all" +license="LGPL-2.1+" +depends="" +makedepends="glibmm-dev cairomm-dev pango-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2cebf76150414cde96b911eae947a6e1a073352927f01a44ddc276711151dffe0b9d8c54c3df16289d9002f982fa3e3386ddfe002be902f3086b44fff95fdb59 pangomm-2.42.0.tar.xz" diff --git a/user/partitionmanager/APKBUILD b/user/partitionmanager/APKBUILD new file mode 100644 index 000000000..33c6e3bdf --- /dev/null +++ b/user/partitionmanager/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=partitionmanager +pkgver=3.3.1 +pkgrel=0 +pkgdesc="Qt-based partition manager" +url="https://www.kde.org/applications/system/kdepartitionmanager" +arch="all" +license="GPL-3.0+" +depends="" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kconfig-dev + kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdoctools-dev ki18n-dev + kiconthemes-dev kio-dev kjobwidgets-dev kservice-dev kwidgetsaddons-dev + kxmlgui-dev kpmcore-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="https://download.kde.org/stable/partitionmanager/$pkgver/src/partitionmanager-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="9189004c27a118510ddf7f148d2a245a7e17d0d0c038ea7486fc50638f2897f947ef2a2a92f0196c277b14e8dafb2f1e2f20978cce5927c04299232ecf8260b0 partitionmanager-3.3.1.tar.xz" diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD index a86a32890..4f1851da7 100644 --- a/user/pavucontrol-qt/APKBUILD +++ b/user/pavucontrol-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=pavucontrol-qt -pkgver=0.4.0 +pkgver=0.14.0 pkgrel=0 pkgdesc="Qt port of pavucontrol, a PulseAudio mixer" url="https://lxqt.org/" @@ -10,7 +10,7 @@ options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake pulseaudio-dev qt5-qtbase-dev liblxqt-dev qt5-qttools-dev - lxqt-build-tools>=0.5.0" + lxqt-build-tools>=0.6.0" source="https://github.com/lxqt/pavucontrol-qt/releases/download/$pkgver/pavucontrol-qt-$pkgver.tar.xz" build() { @@ -26,7 +26,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -36,4 +35,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="62e0c909c98acc4605556ba63981e4599d37b592b99ee16301dc0ba154f3066708a31562e158c042b3530c11603cc43de930080770f027bb998cbb6f79f0f3fb pavucontrol-qt-0.4.0.tar.xz" +sha512sums="5ef934130255c49f5bbab3d725c938db2993379d97c299f01659aac4ead7930365120694e45cc761550573028a13a14132e0a73e96385e624ae8406c0de25d07 pavucontrol-qt-0.14.0.tar.xz" diff --git a/user/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD new file mode 100644 index 000000000..113806f22 --- /dev/null +++ b/user/pavucontrol/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=pavucontrol +pkgver=3.0 +pkgrel=0 +pkgdesc="GTK-based utility for PulseAudio" +url="https://freedesktop.org/software/pulseaudio/pavucontrol/" +arch="all" +license="GPL-2.0+" +depends="" +makedepends="gtkmm+3.0-dev intltool libcanberra-dev lynx pulseaudio-dev" +subpackages="$pkgname-doc $pkgname-lang" +langdir="/usr/lib/locale" +source="http://freedesktop.org/software/pulseaudio/pavucontrol/pavucontrol-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3562fc50e5f60c6b6280c2d524e13cf44114bf481e5ec98b8714c7c2f162d0332179ebcf4c5a78d86f511de857bdc3aa7415e1548e0c10d4582b5958c4cacae9 pavucontrol-3.0.tar.xz" diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD index bdca6d425..c357e0410 100644 --- a/user/pcmanfm-qt/APKBUILD +++ b/user/pcmanfm-qt/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=pcmanfm-qt -pkgver=0.13.0 +pkgver=0.14.0 pkgrel=0 pkgdesc="File manager and desktop icon manager for LXQt" url="https://lxqt.org/" @@ -9,9 +9,9 @@ arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" -makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.5.0 liblxqt-dev - libfm-qt-dev>=0.13.0 qt5-qtx11extras-dev qt5-qttools-dev - kwindowsystem-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 + liblxqt-dev>=${pkgver%.*}.0 libfm-qt-dev>=${pkgver%.*}.0 + qt5-qtx11extras-dev qt5-qttools-dev kwindowsystem-dev" subpackages="$pkgname-doc" source="https://github.com/lxqt/pcmanfm-qt/releases/download/$pkgver/pcmanfm-qt-$pkgver.tar.xz" @@ -28,7 +28,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -43,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="7b0d4ca5274e369e3af3c4b332a95ae78af54142aee39aae36832e85ca27d1f2f7509f00dc29d18a1e5a2558c8a82acd6569d2433acf13b2f95174c47779c089 pcmanfm-qt-0.13.0.tar.xz" +sha512sums="244ca30c4f107a797aad77686bcbefc717a2a119ca657d12fd9263a1c552382fac671a8a0156712cb5e49d1f7afceb588d2d4b49882220aa5292db4fda826525 pcmanfm-qt-0.14.0.tar.xz" diff --git a/user/pcmanfm-qt/pcmanfm-qt-0.11.3-const-iterator-fixes.patch b/user/pcmanfm-qt/pcmanfm-qt-0.11.3-const-iterator-fixes.patch deleted file mode 100644 index b52ce1a9f..000000000 --- a/user/pcmanfm-qt/pcmanfm-qt-0.11.3-const-iterator-fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -Nurd pcmanfm-qt-0.11.3/pcmanfm/mainwindow.cpp pcmanfm-qt-0.11.3.new/pcmanfm/mainwindow.cpp ---- pcmanfm-qt-0.11.3/pcmanfm/mainwindow.cpp 2017-01-14 02:13:45.000000000 +0000 -+++ pcmanfm-qt-0.11.3.new/pcmanfm/mainwindow.cpp 2017-10-12 20:44:25.731044585 +0000 -@@ -970,8 +970,8 @@ - void MainWindow::onBookmarksChanged(FmBookmarks* bookmarks, MainWindow* pThis) { - // delete existing items - QList<QAction*> actions = pThis->ui.menu_Bookmarks->actions(); -- QList<QAction*>::const_iterator it = actions.begin(); -- QList<QAction*>::const_iterator last_it = actions.end() - 2; -+ QList<QAction*>::const_iterator it = actions.constBegin(); -+ QList<QAction*>::const_iterator last_it = actions.constEnd() - 2; - - while(it != last_it) { - QAction* action = *it; -diff -Nurd pcmanfm-qt-0.11.3/pcmanfm/preferencesdialog.cpp pcmanfm-qt-0.11.3.new/pcmanfm/preferencesdialog.cpp ---- pcmanfm-qt-0.11.3/pcmanfm/preferencesdialog.cpp 2017-01-14 02:13:45.000000000 +0000 -+++ pcmanfm-qt-0.11.3.new/pcmanfm/preferencesdialog.cpp 2017-10-12 20:45:17.324377059 +0000 -@@ -90,7 +90,7 @@ - - iconThemes.remove("hicolor"); // remove hicolor, which is only a fallback - QHash<QString, QString>::const_iterator it; -- for(it = iconThemes.begin(); it != iconThemes.end(); ++it) { -+ for(it = iconThemes.constBegin(); it != iconThemes.constEnd(); ++it) { - ui.iconTheme->addItem(it.value(), it.key()); - } - ui.iconTheme->model()->sort(0); // sort the list of icon theme names diff --git a/user/pcmanfm/APKBUILD b/user/pcmanfm/APKBUILD new file mode 100644 index 000000000..8ecf6ba0a --- /dev/null +++ b/user/pcmanfm/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=pcmanfm +pkgver=1.3.1 +pkgrel=0 +pkgdesc="GTK-based file manager" +url="https://sourceforge.net/projects/pcmanfm/" +arch="all" +license="GPL-2.0+" +makedepends="intltool gtk+2.0-dev libfm-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +source="https://downloads.sourceforge.net/pcmanfm/pcmanfm-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="68fbc55b3ffd9da17c861d2cc41590a455ec2c0eb590ba4862f8a0ae01caac34a58645d847d318553ff588df20d355bbcbf1138a792cb45922eb04b047f681c4 pcmanfm-1.3.1.tar.xz" diff --git a/user/perl-class-xsaccessor/APKBUILD b/user/perl-class-xsaccessor/APKBUILD index 6ef87555a..6a4a92ae5 100644 --- a/user/perl-class-xsaccessor/APKBUILD +++ b/user/perl-class-xsaccessor/APKBUILD @@ -1,5 +1,5 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-class-xsaccessor pkgver=1.19 pkgrel=0 diff --git a/user/perl-code-tidyall/APKBUILD b/user/perl-code-tidyall/APKBUILD index ed36959e5..9cea4c7cc 100644 --- a/user/perl-code-tidyall/APKBUILD +++ b/user/perl-code-tidyall/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-code-tidyall -pkgver=0.71 +pkgver=0.73 pkgrel=0 pkgdesc="Your all-in-one Perl code tidier and validator" url="https://metacpan.org/release/Code-TidyAll" @@ -37,4 +37,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="b8d29eaceedf95ce8dc92142a861a7f552443dd713cbfe4a273bcbaa7222ec48646bde434e81cc209adde07d5a2f6e2d6b408e7427dfc574df0af884c8a61f92 Code-TidyAll-0.71.tar.gz" +sha512sums="303635520a7463bf7d5e9c055d08ec50ed3218068f1b33e8113feeeb788b8a373fc4afdc2e2ec00c05be39f9cc76156271b765449c8b3c9bd1a1412e9deb92d8 Code-TidyAll-0.73.tar.gz" diff --git a/user/perl-data-dump/APKBUILD b/user/perl-data-dump/APKBUILD index 26deca4d9..5ff3228e7 100644 --- a/user/perl-data-dump/APKBUILD +++ b/user/perl-data-dump/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> -# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-data-dump pkgver=1.23 pkgrel=0 diff --git a/user/perl-datetime-timezone/APKBUILD b/user/perl-datetime-timezone/APKBUILD index e3584ede8..9a1b35e06 100644 --- a/user/perl-datetime-timezone/APKBUILD +++ b/user/perl-datetime-timezone/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-datetime-timezone _pkgname=DateTime-TimeZone -pkgver=2.21 +pkgver=2.23 pkgrel=0 pkgdesc="Time zone object class and factory for Perl" url="https://metacpan.org/release/DateTime-TimeZone" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="78d760bc0fab6781fd0f54f2394360b3ec82c5f39deb5a5ac287c649175e726ea1f7fe37a5528c58664bc316a2e0cf35062d77f5ef5a518f3ec8f010b6361de4 DateTime-TimeZone-2.21.tar.gz" +sha512sums="e2edfde606bea8595df6f6cec9239fe6fe637d2c3ca2eb319da835c71061dab52ae8da0eb67da3d572b371f2e0820a35d681d9876e0c4dc8003e7504bdd41d06 DateTime-TimeZone-2.23.tar.gz" diff --git a/user/perl-email-address/APKBUILD b/user/perl-email-address/APKBUILD index e5ef3bdd1..a0b6b5380 100644 --- a/user/perl-email-address/APKBUILD +++ b/user/perl-email-address/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-email-address _pkgname=Email-Address -pkgver=1.909 +pkgver=1.912 pkgrel=0 pkgdesc="Deprecated RFC 2822 address parsing library for Perl" url="https://metacpan.org/release/Email-Address" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d692c00402c329cbff0bd8ddfb8b406e2b8857586f6a5e6fb4092c4f92a7ef70c6d766b83818e73b8278cf84f6c16a75508b01ffd7f101bc11809845e778e5e5 Email-Address-1.909.tar.gz" +sha512sums="fd8a8c09829f725609aa84c79ad89d1e44cbfb70cc44cae6a9f31174589404f56cf60ab3a4186137f7ff9838a3fe34a95a7c584e0eec2e5d1d79c919610f6e1a Email-Address-1.912.tar.gz" diff --git a/user/perl-exception-class/APKBUILD b/user/perl-exception-class/APKBUILD index 4ff03bda6..a130d6ed1 100644 --- a/user/perl-exception-class/APKBUILD +++ b/user/perl-exception-class/APKBUILD @@ -1,5 +1,5 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-exception-class pkgver=1.44 pkgrel=0 diff --git a/user/perl-extutils-depends/APKBUILD b/user/perl-extutils-depends/APKBUILD index 3947f7667..2d62635f2 100644 --- a/user/perl-extutils-depends/APKBUILD +++ b/user/perl-extutils-depends/APKBUILD @@ -4,7 +4,7 @@ pkgname=perl-extutils-depends pkgver=0.405 pkgrel=0 pkgdesc="Easily build XS extensions that depend on XS extensions" -url="https://metacpan.org/release/ExtUtils::Depends" +url="https://metacpan.org/release/ExtUtils-Depends" arch="noarch" license="Artistic-1.0-Perl AND GPL-2.0" depends="perl" @@ -12,7 +12,6 @@ makedepends="perl-dev" install="" subpackages="$pkgname-doc" source="https://cpan.metacpan.org/authors/id/X/XA/XAOC/ExtUtils-Depends-$pkgver.tar.gz" -sha512sums="b9983ad763ff0cb81c899bc24f3152f13c69e608304b6e4446bd07b9b13d039650f3f87544c0bdd29c67246ea2973f04a1ce0fccbffb566fe89fdbe0bb03f11b ExtUtils-Depends-0.405.tar.gz" builddir="$srcdir/ExtUtils-Depends-$pkgver" build() { @@ -32,3 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } +sha512sums="b9983ad763ff0cb81c899bc24f3152f13c69e608304b6e4446bd07b9b13d039650f3f87544c0bdd29c67246ea2973f04a1ce0fccbffb566fe89fdbe0bb03f11b ExtUtils-Depends-0.405.tar.gz" diff --git a/user/perl-file-find-object/APKBUILD b/user/perl-file-find-object/APKBUILD index b35c550d5..b404a5cac 100644 --- a/user/perl-file-find-object/APKBUILD +++ b/user/perl-file-find-object/APKBUILD @@ -1,5 +1,5 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-file-find-object pkgver=0.3.2 pkgrel=0 diff --git a/user/perl-file-slurp/APKBUILD b/user/perl-file-slurp/APKBUILD index b4a84c3ee..5a0a67246 100644 --- a/user/perl-file-slurp/APKBUILD +++ b/user/perl-file-slurp/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-file-slurp -pkgver=9999.25 +pkgver=9999.26 pkgrel=0 pkgdesc="Simple and efficient file manipulation in Perl" url="https://metacpan.org/release/File-Slurp" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="cea59f2aecfe314540c1022c44ce85d5d53a3c69273b71a727acbfacbd09a9e45ef435c61b28d8d883a758e29c296ca98167dceed74bbf3a278fe5fa7019ce8a File-Slurp-9999.25.tar.gz" +sha512sums="dbe49038400df7dc32ee97cd8bcd037b1f11dc6d1230a7db1e33651971716c0c5ab65dbcdf93399b42b5a1e61ffd5ade45b8e4abc7000bad619249231cb79e08 File-Slurp-9999.26.tar.gz" diff --git a/user/perl-file-which/APKBUILD b/user/perl-file-which/APKBUILD index fddd35ce9..3bea85095 100644 --- a/user/perl-file-which/APKBUILD +++ b/user/perl-file-which/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-file-which -pkgver=1.22 +pkgver=1.23 pkgrel=0 pkgdesc="Perl implementation of the which(1) utility as an API" url="https://metacpan.org/release/File-Which" @@ -30,4 +30,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="9efd8cc6d08e82a429ab3b0ec5193cb894432311338dc4cdcb73b4536a40bf4829c414e75e5dcb0d03b9190511b232f1d27e441657afa7299b0a5b882877f2d1 File-Which-1.22.tar.gz" +sha512sums="73c48642f448abdab2a3cf39409db50bb311cbd7ea352f5dc70f6e97296d9b09ab7e1738482864aa7f7e300a8f74b19b7ca9949fe3102f61e08fe08c9be2a4ac File-Which-1.23.tar.gz" diff --git a/user/perl-games-solitaire-verify/APKBUILD b/user/perl-games-solitaire-verify/APKBUILD index bcf5b7a45..8854921a3 100644 --- a/user/perl-games-solitaire-verify/APKBUILD +++ b/user/perl-games-solitaire-verify/APKBUILD @@ -1,5 +1,5 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-games-solitaire-verify pkgver=0.1900 pkgrel=0 diff --git a/user/perl-gd/APKBUILD b/user/perl-gd/APKBUILD index bde0ece21..7f3867c54 100644 --- a/user/perl-gd/APKBUILD +++ b/user/perl-gd/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-gd _pkgreal=GD -pkgver=2.69 +pkgver=2.71 pkgrel=0 pkgdesc="Perl module for GD graphics library" url="https://metacpan.org/release/GD" @@ -44,4 +44,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="9df5bc704c7723c032874f2c715c8abac9102826278c7502ec8396568176abb11f95a4fcc91f1d5fac7c92685481f3d759b760c3dfadf86564d110128e41c677 GD-2.69.tar.gz" +sha512sums="3a1555f07e6ab36a7218f24853f4168914be45e8c19ab0fe971ab044725dc0d7efeca75be2e4408406e69601f07e047fd3ea157acc9b9d339c9917a1c3e1f74d GD-2.71.tar.gz" diff --git a/user/perl-inline/APKBUILD b/user/perl-inline/APKBUILD index 032805c28..0c2dcd8d7 100644 --- a/user/perl-inline/APKBUILD +++ b/user/perl-inline/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-inline -pkgver=0.80 +pkgver=0.81 pkgrel=0 pkgdesc="Write Perl Subroutines in Other Programming Languages" url="https://metacpan.org/pod/Inline" @@ -12,7 +12,7 @@ makedepends="perl-dev" checkdepends="perl-test-warn" install="" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/I/IN/INGY/Inline-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/T/TI/TINITA/Inline-$pkgver.tar.gz" builddir="$srcdir/Inline-$pkgver" build() { @@ -32,4 +32,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="e64f7752f32fd07c7c7a975429e04730f2987c9588f99b95502d4e5c87d458736a606c03943a68660940c3987cd632ad2f75ec3862342956c1754b1aca86e0bb Inline-0.80.tar.gz" +sha512sums="ea52647af6a51e6902d78c448e53814f1f3de225d3cf5530764d880f604ddea6dc6e6272619a918c213ce611bf3643f602e779d56e503245987b86363cb0501a Inline-0.81.tar.gz" diff --git a/user/perl-json-xs/APKBUILD b/user/perl-json-xs/APKBUILD index 75f0720ce..929c08bbe 100644 --- a/user/perl-json-xs/APKBUILD +++ b/user/perl-json-xs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-json-xs -pkgver=3.04 +pkgver=4.0 pkgrel=0 pkgdesc="JSON serialising/deserialising, done correctly and fast" url="https://metacpan.org/pod/JSON::XS" @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="69c2e199385b5b5e331d905b64805304de80e1a3b393acaf7dce21c45254b1f23f1a83b246dcd3a80c2cfdadaf8ce3634ee587c469629cb69106f0c2239c73db JSON-XS-3.04.tar.gz" +sha512sums="83b8163ee0fa18e4f768de2dc16c66bd31f9e969917c852b66d7a8d630432792f6a3b4cbbd9d72b593b3b146c593344612cf3d5e58797f6f27f79160f3e9aea1 JSON-XS-4.0.tar.gz" diff --git a/user/perl-moosex-role-parameterised/APKBUILD b/user/perl-moosex-role-parameterised/APKBUILD index 6225b2371..de3680532 100644 --- a/user/perl-moosex-role-parameterised/APKBUILD +++ b/user/perl-moosex-role-parameterised/APKBUILD @@ -1,5 +1,5 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-moosex-role-parameterised pkgver=1.10 pkgrel=0 diff --git a/user/perl-package-stash-xs/APKBUILD b/user/perl-package-stash-xs/APKBUILD index e3f4a2635..9559d0161 100644 --- a/user/perl-package-stash-xs/APKBUILD +++ b/user/perl-package-stash-xs/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-package-stash-xs -pkgver=0.28 +pkgver=0.29 pkgrel=0 pkgdesc="Faster and more correct implementation of Package::Stash" url="https://metacpan.org/release/Package-Stash-XS" @@ -11,7 +11,7 @@ depends="" makedepends="perl-dev" checkdepends="perl-test-fatal perl-test-requires" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/D/DO/DOY/Package-Stash-XS-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Package-Stash-XS-$pkgver.tar.gz" builddir="$srcdir/Package-Stash-XS-$pkgver" build() { @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="409e884998bf063f438335067ff8f702aa1f12fc686c1912ad532f6536a711273e52c140d9c407c47b7ba4ccacedec480c1542437a90dd76367dc0f732c0db38 Package-Stash-XS-0.28.tar.gz" +sha512sums="f7afcf1a67915d9990a8d63e418ebc6b6b48947b90a72a454b8197656233d8cc976f72d44e4179621628e52fa7ab9a9a74f18f95ad1999d3f45181531ed44849 Package-Stash-XS-0.29.tar.gz" diff --git a/user/perl-package-stash/APKBUILD b/user/perl-package-stash/APKBUILD index 4b07f6718..3dd369b5a 100644 --- a/user/perl-package-stash/APKBUILD +++ b/user/perl-package-stash/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-package-stash -pkgver=0.37 +pkgver=0.38 pkgrel=0 pkgdesc="Perl routines for manipulating stashes" url="https://metacpan.org/release/Package-Stash" @@ -11,7 +11,7 @@ depends="perl-module-implementation perl-package-stash-xs" makedepends="perl-dev" checkdepends="perl-dist-checkconflicts perl-test-fatal perl-test-requires" subpackages="$pkgname-doc" -source="https://cpan.metacpan.org/authors/id/D/DO/DOY/Package-Stash-$pkgver.tar.gz" +source="https://cpan.metacpan.org/authors/id/E/ET/ETHER/Package-Stash-$pkgver.tar.gz" builddir="$srcdir/Package-Stash-$pkgver" build() { @@ -31,4 +31,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="d10321903591568d4ac4db91ad9e4dfcffe564ab22a5ecdd8fa103749c9708da082ffb3ca478e98ac120a23e51c0ab0ccf799c0da10fe2be194e9cace1f16b06 Package-Stash-0.37.tar.gz" +sha512sums="4846953a845727d2b987a4625fc96e18c7d68a365ac8dbacfa21388b0a063ebac9c91e43190dc4f91af4b3adca508b32a6c7ec18213096622162c06c11cbb611 Package-Stash-0.38.tar.gz" diff --git a/user/perl-task-test-run-allplugins/APKBUILD b/user/perl-task-test-run-allplugins/APKBUILD index 1afce955b..353fae3b0 100644 --- a/user/perl-task-test-run-allplugins/APKBUILD +++ b/user/perl-task-test-run-allplugins/APKBUILD @@ -1,5 +1,5 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-task-test-run-allplugins pkgver=0.0105 pkgrel=0 diff --git a/user/perl-term-readkey/APKBUILD b/user/perl-term-readkey/APKBUILD new file mode 100644 index 000000000..6b789b097 --- /dev/null +++ b/user/perl-term-readkey/APKBUILD @@ -0,0 +1,34 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-term-readkey +_pkgreal=TermReadKey +pkgver=2.38 +pkgrel=0 +pkgdesc="Change terminal modes, and perform non-blocking reads" +url="https://metacpan.org/release/TermReadKey" +arch="all" +license="Artistic-1.0-Perl OR GPL-1.0+" +depends="perl" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://search.cpan.org/CPAN/authors/id/J/JS/JSTOWE/$_pkgreal-$pkgver.tar.gz" +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 +} + +sha512sums="fb09f013f9f0d8a4397e39f6f3db7a6d023259219af8f76744094e396437a01b19141b3cdb39a158d3b518903fb010088bc37406763bfbeb3fcab810bb0bb157 TermReadKey-2.38.tar.gz" diff --git a/user/perl-test-command/APKBUILD b/user/perl-test-command/APKBUILD index 7dac2a6ad..589d61488 100644 --- a/user/perl-test-command/APKBUILD +++ b/user/perl-test-command/APKBUILD @@ -1,7 +1,7 @@ -# Automatically generated by apkbuild-cpan, template 1 # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Contributor: A. Wilcox <awilfox@adelielinux.org> -# Maintainer: Kiyoshi Aman <aerdan@adelielinux.org> +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-test-command _pkgreal=Test-Command pkgver=0.11 diff --git a/user/perl-type-tiny/APKBUILD b/user/perl-type-tiny/APKBUILD index 9e4cd812c..825483cce 100644 --- a/user/perl-type-tiny/APKBUILD +++ b/user/perl-type-tiny/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-type-tiny -pkgver=1.004002 +pkgver=1.004004 pkgrel=0 pkgdesc="Tiny Moo(se) compatible type constraint" url="https://metacpan.org/release/Type-Tiny" @@ -30,4 +30,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="fcdd8740e1ef6a2c5d214a54b57e65ebd222188377ebdd7bbdadc74741f3a5d00ba4a7490628bfb7cc937a32f5d5a578963ea1b6208e8fb99f095f2c3239cf82 Type-Tiny-1.004002.tar.gz" +sha512sums="a1e09c5a3369e0a9ea8e172d86e68e818a720c5c4d633103a442fe389f7a8a7b4a03b2487ffd09f184caf4eca94ef471cc9293b04557b8d4dd260649b4121673 Type-Tiny-1.004004.tar.gz" diff --git a/user/perl-xml-sax-base/APKBUILD b/user/perl-xml-sax-base/APKBUILD new file mode 100644 index 000000000..e303436bd --- /dev/null +++ b/user/perl-xml-sax-base/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-xml-sax-base +pkgver=1.09 +pkgrel=0 +pkgdesc="Driver for Perl SAX parser" +url="https://metacpan.org/release/XML-SAX-Base" +arch="noarch" +license="Artistic-1.0-Perl OR GPL-2.0-only" +depends="" +makedepends="perl-dev" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-Base-$pkgver.tar.gz" +builddir="$srcdir/XML-SAX-Base-$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 +} + +sha512sums="72a34fd2b0375222cad3a42a0e2d92f793d7a2ac27d831a8a8d3322fdc75ba246ca53c33cdc0fbade81f3a96ad977ebf5d4cddc6d75d76be79b2e655f316d532 XML-SAX-Base-1.09.tar.gz" diff --git a/user/perl-xml-sax/APKBUILD b/user/perl-xml-sax/APKBUILD new file mode 100644 index 000000000..5f6559057 --- /dev/null +++ b/user/perl-xml-sax/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> +pkgname=perl-xml-sax +pkgver=1.00 +pkgrel=0 +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="perl-dev" +install="$pkgname.post-install $pkgname.pre-deinstall" +subpackages="$pkgname-doc" +source="https://cpan.metacpan.org/authors/id/G/GR/GRANTM/XML-SAX-$pkgver.tar.gz + install-fix.patch + " +builddir="$srcdir/XML-SAX-$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 +} + +sha512sums="95553c9693d8a310747b4b86d4e80a58d4056b18cfc334f6979c98d0e9034a34253bfb17daecfc5bb28b1bd65e6baf52136f5135a969fadba86aa4148ea9bc1d XML-SAX-1.00.tar.gz +a2177f0aa00bb31c41298f0c622f800ac0dddb1d30bc1bf86e035cfd8327fa8078baf46587ffd4a782c22fba0783709f2459c81b95a8ef86e1fd4e4058e3a166 install-fix.patch" diff --git a/user/perl-xml-sax/install-fix.patch b/user/perl-xml-sax/install-fix.patch new file mode 100644 index 000000000..c28d48b3a --- /dev/null +++ b/user/perl-xml-sax/install-fix.patch @@ -0,0 +1,11 @@ +--- XML-SAX-1.00/Makefile.PL.old 2018-02-15 09:44:15.000000000 +0000 ++++ XML-SAX-1.00/Makefile.PL 2019-01-11 20:58:06.250000000 +0000 +@@ -23,7 +23,7 @@ + + eval { require XML::SAX }; + if ($@) { +- $write_ini_ok = 1; ++ $write_ini_ok = 0; + } + else { + my $dir = File::Basename::dirname($INC{'XML/SAX.pm'}); diff --git a/user/perl-xml-sax/perl-xml-sax.post-install b/user/perl-xml-sax/perl-xml-sax.post-install new file mode 100644 index 000000000..b07b8dae7 --- /dev/null +++ b/user/perl-xml-sax/perl-xml-sax.post-install @@ -0,0 +1,5 @@ +#!/bin/sh +# Add the parser to the registry. + +LC_ALL=C perl -MXML::SAX -e \ + "XML::SAX->add_parser(q(XML::SAX::PurePerl))->save_parsers()" diff --git a/user/perl-xml-sax/perl-xml-sax.pre-deinstall b/user/perl-xml-sax/perl-xml-sax.pre-deinstall new file mode 100644 index 000000000..cdfeaccfa --- /dev/null +++ b/user/perl-xml-sax/perl-xml-sax.pre-deinstall @@ -0,0 +1,5 @@ +#!/bin/sh +# Remove the parser from the registry. + +LC_ALL=C perl -MXML::SAX -e \ + "XML::SAX->remove_parser(q(XML::SAX::PurePerl))->save_parsers()" diff --git a/user/perl-yaml-libyaml/APKBUILD b/user/perl-yaml-libyaml/APKBUILD index 5d90d2620..42578f61e 100644 --- a/user/perl-yaml-libyaml/APKBUILD +++ b/user/perl-yaml-libyaml/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Dan Theisen <djt@hxx.in> # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org> pkgname=perl-yaml-libyaml -pkgver=0.75 +pkgver=0.76 pkgrel=0 pkgdesc="Perl YAML Serialization using XS and libyaml" url="https://metacpan.org/pod/YAML::LibYAML" @@ -33,4 +33,4 @@ package() { find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete } -sha512sums="ed4a56ab70938eb62151e28adb875dc58558dda8569d60ff0f835646888dc0c0d4bf41699163171c34b091848eb9d135560d61ca8d7cf5aab589ceccb02a4ccb YAML-LibYAML-0.75.tar.gz" +sha512sums="1a5058cc957bc891aaf1468bd03b7a169372f2711ce027ec701126f8c3d2c15d2029946ca2db77438cf8d43a3a1964238c50fc1a3da20addb3a525733b4499c8 YAML-LibYAML-0.76.tar.gz" diff --git a/user/php7-apcu/APKBUILD b/user/php7-apcu/APKBUILD index aa487a4e6..4398a424d 100644 --- a/user/php7-apcu/APKBUILD +++ b/user/php7-apcu/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=php7-apcu _pkgname=${pkgname#php7-} -pkgver=5.1.14 +pkgver=5.1.15 pkgrel=0 pkgdesc="Userland cache for PHP" url="https://github.com/krakjoe/apcu" @@ -39,4 +39,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="fe39d46d2905732296a70b79ab0977909c9ff7cb571118f35831e75a9a018edf909992954e39f79cc4710f9fdec93e6067068afea02304345e4ff6babc65a7d0 php7-apcu-5.1.14.tar.gz" +sha512sums="d95ab6a8a073acfc6af2f83b038f68e4150a1eb518369c163f4d1bc0c8b006c84754759fa9b72ac6f7ca008c27802a3a2aca14ae9d7ca23c02078d720a530b1c php7-apcu-5.1.15.tar.gz" diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD index 89ab74709..9da2b1de2 100644 --- a/user/php7/APKBUILD +++ b/user/php7/APKBUILD @@ -26,7 +26,7 @@ pkgname=php7 _pkgname=php pkgver=7.2.11 -pkgrel=2 +pkgrel=3 _apiver=20170718 pkgdesc="The PHP7 language runtime engine" url="https://php.net/" @@ -34,7 +34,8 @@ arch="all" options="!checkroot" license="PHP-3.01 AND Zend-2.0 AND Custom:TSRM AND LGPL-2.1+ AND MIT AND Beerware AND Public-Domain AND BSD-3-Clause AND Apache-1.0 AND PostgreSQL AND BSD-2-Clause AND Zlib AND BSD-4-Clause" depends="" -depends_dev="$pkgname=$pkgver-r$pkgrel autoconf pcre-dev" +depends_dev="$pkgname=$pkgver-r$pkgrel autoconf icu-dev libedit-dev libxml2-dev + pcre-dev zlib-dev" makedepends="autoconf apache-httpd-dev aspell-dev diff --git a/user/pidgin/APKBUILD b/user/pidgin/APKBUILD index 55caf7b39..5921247b8 100644 --- a/user/pidgin/APKBUILD +++ b/user/pidgin/APKBUILD @@ -1,25 +1,22 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pidgin pkgver=2.13.0 -pkgrel=0 +pkgrel=1 pkgdesc="Multi-protocol instant messaging client" url="http://pidgin.im/" arch="all" license="GPL-2.0-only" -depends= +depends="gst-plugins-base" makedepends="gtk+-dev perl-dev libsm-dev startup-notification-dev gtkspell-dev libxml2-dev libidn-dev gnutls-dev dbus-dev dbus-glib-dev gstreamer-dev cyrus-sasl-dev ncurses-dev nss-dev tcl-dev tk-dev intltool - " -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang - libpurple-oscar:_oscar - finch libpurple - " + gst-plugins-base-dev farstream-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang finch libpurple" source="https://bitbucket.org/pidgin/main/downloads/$pkgname-$pkgver.tar.bz2" build() { cd "$builddir" - LIBS="-ltinfo" ./configure \ + LIBS="-lX11 -ltinfo" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -31,13 +28,14 @@ build() { --disable-meanwhile \ --disable-nm \ --enable-perl \ + --disable-python \ --disable-schemas-install \ --disable-screensaver \ --enable-tcl \ - --disable-vv \ + --enable-vv \ --enable-gstreamer \ --enable-gstreamer-interfaces \ - --disable-farstream \ + --enable-farstream \ --enable-cyrus-sasl \ --enable-nss make @@ -70,22 +68,4 @@ libpurple() { "$subpkgdir"/usr/share/ } -_mv_purple() { - pkgdesc="$1" - shift - mkdir -p "$subpkgdir"/usr/lib/purple-2/ - for i; do - mv "$pkgdir"/usr/lib/purple-2/${i}.* \ - "$subpkgdir"/usr/lib/purple-2/ - done -} - -_bonjour() { - _mv_purple "Bonjour (Zeroconf) plugin for libpurple" libbonjour -} - -_oscar() { - _mv_purple "AIM and ICQ plugins for libpurple" liboscar libaim libicq -} - sha512sums="68b3d1eefee111544c7eb347386d0aea4f47c3e320d5963a4e0d833ed6af7b1be243a7bcd6a38c9234b58601d10a9aebf8541f1d97decfeca754fa78dc693047 pidgin-2.13.0.tar.bz2" diff --git a/user/plasma-desktop/APKBUILD b/user/plasma-desktop/APKBUILD index 4b06e92d6..963cfc1dd 100644 --- a/user/plasma-desktop/APKBUILD +++ b/user/plasma-desktop/APKBUILD @@ -4,7 +4,7 @@ pkgname=plasma-desktop pkgver=5.12.7 pkgrel=0 pkgdesc="Modern, functional, integrated libre desktop environment" -url="https://www.kde.org/info/plasma-desktop" +url="https://www.kde.org/plasma-desktop" arch="all" options="!check" # Test suite fails due to keyboard layouts license="GPL-2.0 LGPL-2.1" diff --git a/user/plasma-framework/APKBUILD b/user/plasma-framework/APKBUILD index a0cd8af19..a0f00850a 100644 --- a/user/plasma-framework/APKBUILD +++ b/user/plasma-framework/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=plasma-framework -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Frameworks for the KDE Plasma 5 desktop environment" url="https://www.kde.org/" @@ -47,4 +47,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="ab48ae771b8b4b30ab21ed3504d92e4e4fb69539e9a9a8deafebfd036ba672777c8a9eece05049f2d8dc49774c5c42124519a7a9545c1e3370a414b4b2342096 plasma-framework-5.52.0.tar.xz" +sha512sums="618f2beb3b8a25cacf7c11339ba15cae10db461c61e278a5ba845e9afac7e9edb48fde16bd78b4bb7d16c07001f8d9fbdbf5bfd58593488a544fa183b3df8c15 plasma-framework-5.54.0.tar.xz" diff --git a/user/plasma-workspace-wallpapers/APKBUILD b/user/plasma-workspace-wallpapers/APKBUILD new file mode 100644 index 000000000..d4d5fc2d3 --- /dev/null +++ b/user/plasma-workspace-wallpapers/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=plasma-workspace-wallpapers +pkgver=5.12.7 +pkgrel=0 +pkgdesc="Default wallpapers from KDE" +url="https://www.KDE.org/" +arch="noarch" +license="LGPL-3.0-only" +depends="" +makedepends="cmake extra-cmake-modules" +subpackages="" +source="https://download.kde.org/stable/plasma/$pkgver/plasma-workspace-wallpapers-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7abda6e4cf223a72222ab2f2b3d8deb631b7ce1e6a415697c367acb53ae5f653fc8dbf6ddd631ff7a1888c2293d102bc0ba1753e50419138f7c9d7d2ea5f08a9 plasma-workspace-wallpapers-5.12.7.tar.xz" diff --git a/user/polkit/APKBUILD b/user/polkit/APKBUILD index 05976199d..5b5dfdacd 100644 --- a/user/polkit/APKBUILD +++ b/user/polkit/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=polkit pkgver=0.115 -pkgrel=2 +pkgrel=3 pkgdesc="Toolkit for controlling system-wide privileges" url="https://www.freedesktop.org/wiki/Software/polkit/" arch="all" @@ -14,7 +14,7 @@ makedepends="glib-dev gobject-introspection-dev gtk-doc intltool linux-pam-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" pkgusers="polkitd" pkggroups="polkitd" -install="$pkgname.pre-install" +install="$pkgname.pre-install $pkgname.pre-upgrade" source="https://www.freedesktop.org/software/polkit/releases/polkit-$pkgver.tar.gz 0001-make-netgroup-support-optional.patch CVE-2018-19788.patch diff --git a/user/polkit/polkit.pre-upgrade b/user/polkit/polkit.pre-upgrade new file mode 100644 index 000000000..816f89236 --- /dev/null +++ b/user/polkit/polkit.pre-upgrade @@ -0,0 +1,5 @@ +#!/bin/sh + +useradd -r -s /sbin/nologin -d /usr/lib/polkit-1 -M -U polkitd 2>/dev/null + +exit 0 diff --git a/user/poppler-qt5/APKBUILD b/user/poppler-qt5/APKBUILD index f6d9eb933..86bb1481c 100644 --- a/user/poppler-qt5/APKBUILD +++ b/user/poppler-qt5/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=poppler-qt5 _realname=poppler -pkgver=0.69.0 +pkgver=0.73.0 pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0 (Qt 5 bindings)" url="https://poppler.freedesktop.org/" @@ -38,4 +38,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9c0382059c786e17b16dc0847212006a7c05e51b3963a7470e49cede87c7855bdfa1b80b2d884e4fb4a430cdd5ab666391ecf53230486e245b6f28af03890e1d poppler-0.69.0.tar.xz" +sha512sums="6924a343032573504a0039c56a6263cd1183fa6aca75966fe1f084bd19da78553e455e541a3693896c1ed0c3865f11c11758a0f5a66b2f6cd48ac8a7eccf891a poppler-0.73.0.tar.xz" diff --git a/user/poppler/APKBUILD b/user/poppler/APKBUILD index 4542c0de7..6269b5565 100644 --- a/user/poppler/APKBUILD +++ b/user/poppler/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=poppler -pkgver=0.69.0 +pkgver=0.73.0 pkgrel=0 pkgdesc="PDF rendering library based on xpdf 3.0" url="https://poppler.freedesktop.org/" @@ -27,7 +27,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_INSTALL_LIBDIR=/usr/lib \ - -DENABLE_XPDF_HEADERS:bool=ON \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ .. make } @@ -59,4 +59,4 @@ _cpp() { "$subpkgdir"/usr/lib/ } -sha512sums="9c0382059c786e17b16dc0847212006a7c05e51b3963a7470e49cede87c7855bdfa1b80b2d884e4fb4a430cdd5ab666391ecf53230486e245b6f28af03890e1d poppler-0.69.0.tar.xz" +sha512sums="6924a343032573504a0039c56a6263cd1183fa6aca75966fe1f084bd19da78553e455e541a3693896c1ed0c3865f11c11758a0f5a66b2f6cd48ac8a7eccf891a poppler-0.73.0.tar.xz" diff --git a/user/postfix/APKBUILD b/user/postfix/APKBUILD new file mode 100644 index 000000000..a0c2d1533 --- /dev/null +++ b/user/postfix/APKBUILD @@ -0,0 +1,96 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Dan Theisen <djt@hxx.in> +pkgname=postfix +pkgver=3.3.2 +pkgrel=2 +pkgdesc="Mail server (MTA) that is Sendmail outside and Qmail inside" +url="http://www.postfix.org/" +arch="all" +options="!check suid" # No test suite. +license="EPL-2.0 AND IPL-1.0" +depends="" +makedepends="cyrus-sasl-dev db-dev icu-dev linux-pam-dev lmdb-dev openldap-dev + openssl-dev pcre-dev perl postgresql-dev sqlite-dev" +install="$pkgname.pre-install" +subpackages="$pkgname-doc $pkgname-ldap $pkgname-lmdb $pkgname-openrc + $pkgname-pgsql $pkgname-sqlite" +pkgusers="postfix" +pkggroups="postfix postdrop" +source="http://www.namesdir.com/mirrors/postfix-release/official/postfix-$pkgver.tar.gz + honour-config-directory.patch + postfix.initd + " + +build() { + cd "$builddir" + local CCARGS="-DHAS_LDAP -DHAS_LMDB -DHAS_PCRE -DHAS_PGSQL -I$(pg_config --includedir) -DHAS_SQLITE -DNO_NIS -DUSE_CYRUS_SASL -DUSE_SASL_AUTH -I/usr/include/sasl -DUSE_LDAP_SASL -DUSE_TLS -Wno-comment" + local AUXLIBS="-lpam $(pcre-config --libs) -lsasl2 -lssl -lcrypto" + make DEBUG="" shared=yes dynamicmaps=yes pie=yes \ + config_directory="/etc/postfix" \ + daemon_directory="/usr/libexec/postfix" \ + meta_directory="/etc/postfix" \ + shlib_directory="/usr/lib/postfix" \ + CC="gcc" OPT="$CFLAGS" CCARGS="$CCARGS" AUXLIBS="$AUXLIBS" \ + AUXLIBS_LDAP="-lldap -llber" AUXLIBS_LMDB="-llmdb" \ + AUXLIBS_PCRE="$(pcre-config --libs)" \ + AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq" \ + AUXLIBS_SQLITE="$(pkgconf --libs sqlite3)" \ + makefiles +} + +package() { + cd "$builddir" + make install_root="$pkgdir" manpage_directory="/usr/share/man" \ + command_directory="/usr/sbin" mailq_path="/usr/bin/mailq" \ + newaliases_path="/usr/bin/newaliases" \ + sendmail_path="/usr/sbin/sendmail" \ + non-interactive-package + + mkdir -p "$pkgdir"/etc/apk/protected_paths.d + cat > "$pkgdir"/etc/apk/protected_paths.d/postfix.list <<-EOF + !var/lib/postfix + !var/spool/postfix + EOF + + chown -R postfix:postfix \ + "$pkgdir"/var/lib/postfix + chown -R postfix:postfix \ + "$pkgdir"/var/spool/postfix + chgrp postdrop "$pkgdir"/var/spool/postfix/{public,maildrop} + chmod 0750 "$pkgdir"/var/lib/postfix + chgrp postdrop "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue + chmod 2755 "$pkgdir"/usr/sbin/postdrop "$pkgdir"/usr/sbin/postqueue + + install -D -m755 "$srcdir"/postfix.initd "$pkgdir"/etc/init.d/postfix +} + +_database() { + pkgdesc="Postfix mapping plugin for storing users in $2" + + install -d "$subpkgdir"/etc/postfix/dynamicmaps.cf.d + grep $1 "$pkgdir"/etc/postfix/dynamicmaps.cf > \ + "$subpkgdir"/etc/postfix/dynamicmaps.cf.d/$1 + sed -i "/$1/d" "$pkgdir"/etc/postfix/dynamicmaps.cf + install -d "$subpkgdir"/usr/lib/postfix + mv "$pkgdir"/usr/lib/postfix/postfix-$1.so "$subpkgdir"/usr/lib/postfix/ +} + +ldap() { + _database "ldap" "LDAP" +} + +lmdb() { + _database "lmdb" "LMDB" +} + +pgsql() { + _database "pgsql" "PostgreSQL" +} + +sqlite() { + _database "sqlite" "SQLite 3" +} + +sha512sums="df67eb978751900d357597def16f744dae990f5cc4e48af8dca57f84b0140e05416712727c1760b8f557ed3564cd593620756561b0a6f31db4b54d928e15293f postfix-3.3.2.tar.gz +63ea7fe461fca1306088e9984acfab6ab3e919dafa2b606d43fbca472969e6ec232800071f939f5a4482c01c6d7b53a86de9e7e893ab94f4cb135d16ff5763cc honour-config-directory.patch +2ad1b053bbb51d4f480dbf5a01252e8e99a82ec14a75ff49336b2b190ea55bc02400542b109fa0cc4ebfe6b42eaabbc45f70f2ea581f1eb9c4189c439b825592 postfix.initd" diff --git a/user/postfix/honour-config-directory.patch b/user/postfix/honour-config-directory.patch new file mode 100644 index 000000000..a32c588ee --- /dev/null +++ b/user/postfix/honour-config-directory.patch @@ -0,0 +1,11 @@ +--- postfix-3.3.2/postfix-install ++++ postfix-3.3.2/postfix-install +@@ -832,7 +832,7 @@ + # the wrong place when Postfix is being upgraded. + + case "$mail_version" in +-"") mail_version="`bin/postconf -dhx mail_version`" || exit 1 ++"") mail_version="`bin/postconf -c $CONFIG_DIRECTORY -dhx mail_version`" || exit 1 + esac + + # Undo MAIL_VERSION expansion at the end of a parameter value. If diff --git a/user/postfix/postfix.initd b/user/postfix/postfix.initd new file mode 100644 index 000000000..9a1c1e21d --- /dev/null +++ b/user/postfix/postfix.initd @@ -0,0 +1,85 @@ +#!/sbin/openrc-run +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload abort flush" + +description_reload="Re-read configuration files. Running processes terminate at their earliest convenience." +description_abort="Stop the Postfix mail system abruptly. Running processes are signaled to stop immediately." +description_flush="Force delivery: attempt to deliver every message in the deferred mail queue." + +# Please read http://www.postfix.org/MULTI_INSTANCE_README.html for multi instance support +CONF_DIR="/etc/postfix" +CONF_OPT="${SVCNAME##*.}" +if [ -n ${CONF_OPT} -a ${SVCNAME} != "postfix" ]; then + CONF_DIR="${CONF_DIR}.${CONF_OPT}" +fi +if [ "${CONF_DIR}" = "/etc/postfix" ]; then + CONF_PARAM="" + CONF_MESSAGE="" +else + CONF_PARAM="-c ${CONF_DIR}" + CONF_MESSAGE="(${CONF_DIR})" +fi + +depend() { + use logger dns ypbind amavisd antivirus postfix_greylist net saslauthd + if [ "${SVCNAME}" = "postfix" ]; then + provide mta + fi +} + +start() { + if [ ! -z "${CONF_PARAM}" ]; then + einfo "Please consider updating your config for postmulti support." + fi + ebegin "Starting postfix ${CONF_MESSAGE}" + if [ ! -d ${CONF_DIR} ]; then + eend 1 "${CONF_DIR} does not exist" + return 1 + fi + /usr/sbin/postfix ${CONF_PARAM} start >/dev/null 2>&1 + eend $? +} + +stop() { + ebegin "Stopping postfix ${CONF_MESSAGE}" + /usr/sbin/postfix ${CONF_PARAM} stop >/dev/null 2>&1 + eend +} + +status() { + local _retval + einfon "" + /usr/sbin/postfix ${CONF_PARAM} status + _retval=$? + if [ x${_retval} = 'x0' ]; then + mark_service_started "${SVCNAME}" + eend 0 + else + mark_service_stopped "${SVCNAME}" + eend 3 + fi +} + +reload() { + ebegin "Reloading postfix ${CONF_MESSAGE}" + /usr/sbin/postfix ${CONF_PARAM} reload >/dev/null 2>&1 + eend $? +} + +abort() { + ebegin "Aborting postfix ${CONF_MESSAGE}" + + if service_started "${SVCNAME}"; then + mark_service_stopped "${SVCNAME}" + fi + /usr/sbin/postfix ${CONF_PARAM} abort >/dev/null 2>&1 + eend $? +} + +flush() { + ebegin "Flushing postfix ${CONF_MESSAGE}" + /usr/sbin/postfix ${CONF_PARAM} flush >/dev/null 2>&1 + eend $? +} diff --git a/user/postfix/postfix.pre-install b/user/postfix/postfix.pre-install new file mode 100644 index 000000000..73ebdba3f --- /dev/null +++ b/user/postfix/postfix.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +groupadd -g 207 -r postfix +groupadd -g 208 -r postdrop +useradd -u 207 -c "Postfix Mail Server" -M -N -G postfix,mail -r -s /sbin/nologin postfix diff --git a/user/prison/APKBUILD b/user/prison/APKBUILD index 1698372ea..d6bb9b46f 100644 --- a/user/prison/APKBUILD +++ b/user/prison/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=prison -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Qt Barcode library for programatically creating QR codes" url="https://www.kde.org/" @@ -47,4 +47,4 @@ quick() { mv "$pkgdir"/usr/lib/qt5/qml "$subpkgdir"/usr/lib/qt5/ } -sha512sums="5592e99865d491fef36aa10552245f555aaf12a9bc0b17e2df44efb091ac1d06fb1ada647c63c33a1df32737f34943202db6a286b714a1bfb63fa0180a433797 prison-5.52.0.tar.xz" +sha512sums="6ffdeb4c8196a9ec6c845ebe1d58801c02d570f831bf5c1a2bd8f30d048cc0d62aa8e8273fc8db4689c6ac45caa35906bad82b211e58108b7ed8cf42649acf16 prison-5.54.0.tar.xz" diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD index 990de722f..8fc6ce35c 100644 --- a/user/prosody/APKBUILD +++ b/user/prosody/APKBUILD @@ -2,7 +2,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=prosody -pkgver=0.10.2 +pkgver=0.11.2 pkgrel=0 pkgdesc="Lua based Jabber/XMPP server" url="http://prosody.im/" @@ -17,7 +17,6 @@ pkgusers="prosody" pkggroups="prosody" source="https://prosody.im/downloads/source/$pkgname-$pkgver.tar.gz prosody.cfg.lua.patch - mallinfo.patch $pkgname.initd " @@ -53,7 +52,6 @@ package() { install -D -m755 "$srcdir"/"$pkgname".initd "$pkgdir"/etc/init.d/"$pkgname" } -sha512sums="9fc05e34b45b0c16835ba94a73532fb3b4ee335f27d56bb9260e1b3e22614f89f44eb5d04b4e90d016db0b5bee6f5c7e7d099e1defb027e6823ee7667c1fe28f prosody-0.10.2.tar.gz +sha512sums="22e55a551a40c92f38a1ed1de5fdcad574d699d58c2e27f93c3d465b55487b8e923c2ba088daf93c7140cbafb0d429687e0b662c8bb1c1aba4b79ac1ea271cd1 prosody-0.11.2.tar.gz a6ca168fe3d11ee3b05295fb36dfaf8240c60a85507032b2502f9a97d3fd055f7eee38ba6efbb8f79472fc7cdd3556922194d0bd7099f7fb809be01890acc511 prosody.cfg.lua.patch -b07498cd42677d09f1a3fd4a5d91a085e90dd10cee7d6ee7c5e41438cfc2f4049ab9948c0fd0f7e148dd81f6a25c64c6ae832ea4864cee2329d3c6735216b78b mallinfo.patch 24360603dbd5d2a92758e6c4b4aab4f02cbd05373580cba2df76df98b6045891e8108e8c2d16af9508e93968ed5880db952e7a21b2742ebeec6f14b167968c2c prosody.initd" diff --git a/user/proxymngr/APKBUILD b/user/proxymngr/APKBUILD new file mode 100644 index 000000000..00215b164 --- /dev/null +++ b/user/proxymngr/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=proxymngr +pkgver=1.0.4 +pkgrel=0 +pkgdesc="X11 proxy manager service" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="lbxproxy" +makedepends="libice-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/proxymngr-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="dce0d93558e674ce82197476d204488505079c8aa5192387e57c06844c4ea83da1cf45238e0a63e2bbf9867388ca1175125b6d7b4036085be89b3de353887fd2 proxymngr-1.0.4.tar.bz2" diff --git a/user/pulseaudio/APKBUILD b/user/pulseaudio/APKBUILD index 1a5bf62d3..9e3f7a565 100644 --- a/user/pulseaudio/APKBUILD +++ b/user/pulseaudio/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=pulseaudio pkgver=12.2 -pkgrel=1 +pkgrel=3 pkgdesc="A featureful, general-purpose sound server" url="https://www.freedesktop.org/wiki/Software/PulseAudio" pkgusers="pulse" @@ -22,7 +22,9 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-bluez $pkgname-zsh-completion:zshcomp:noarch" source="https://freedesktop.org/software/pulseaudio/releases/pulseaudio-$pkgver.tar.xz $pkgname.initd - $pkgname.confd" + $pkgname.confd + disable-flat-volume.patch + " build() { cd "$builddir" @@ -76,6 +78,7 @@ libs() { "$subpkgdir"/usr/lib/ mv "$pkgdir"/usr/lib/libpulse.so.0* \ "$pkgdir"/usr/lib/libpulse-simple.so.0* \ + "$pkgdir"/usr/lib/libpulse-mainloop-*.so.0* \ "$subpkgdir"/usr/lib/ mv "$pkgdir"/etc/pulse/client.conf \ "$subpkgdir"/etc/pulse/ @@ -130,4 +133,5 @@ zshcomp() { sha512sums="877754c1838b3cb042dbc18a5f1cc3cf313ffcaee7a64703330406d1f86279c34f1107634ac3083b158365e6757fbacf5ec406bc3c5788d291de67b77a561a4e pulseaudio-12.2.tar.xz 34fe54ece5df60ce63a7955cd828a2716670fef71f40960698ae5518fdaf9cd599f4d8f8852e2c88d715600a9ad06a38984415e5eb320071012e5eb6e5c1b8b1 pulseaudio.initd -75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd" +75b54581591519d63a3362b155c0f9b0501a60763ab394693a456c44d0216138cf3a40bdd0f7442028663bc045e9ffee286f8f8eaf2ee3bb17379b43615fee0e pulseaudio.confd +dcb50f7c4fd86b0311ab050f7f0340dcf54379a685903951f22e24df6aee5486ee5e02f866c9e53dd55a54ba302658ad282114ce37f169d185855dc37dae0349 disable-flat-volume.patch" diff --git a/user/pulseaudio/disable-flat-volume.patch b/user/pulseaudio/disable-flat-volume.patch new file mode 100644 index 000000000..8325c8d1f --- /dev/null +++ b/user/pulseaudio/disable-flat-volume.patch @@ -0,0 +1,11 @@ +--- pulseaudio-12.2/src/daemon/daemon.conf.in.old 2018-07-13 19:06:14.000000000 +0000 ++++ pulseaudio-12.2/src/daemon/daemon.conf.in 2019-01-22 00:30:56.700000000 +0000 +@@ -60,7 +60,7 @@ + ; enable-lfe-remixing = no + ; lfe-crossover-freq = 0 + +-; flat-volumes = yes ++flat-volumes = no + + ifelse(@HAVE_SYS_RESOURCE_H@, 1, [dnl + ; rlimit-fsize = -1 diff --git a/user/py3-certifi/APKBUILD b/user/py3-certifi/APKBUILD index f4fa5f71e..a67195293 100644 --- a/user/py3-certifi/APKBUILD +++ b/user/py3-certifi/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: zlg <zlg+adelie@zlg.space> pkgname=py3-certifi _pkgname=${pkgname#py3-} -pkgver=2018.10.15 +pkgver=2018.11.29 pkgrel=0 pkgdesc="Python package for providing Mozilla's CA Bundle" url="https://pypi.org/project/certifi" @@ -26,5 +26,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="3324ae6c4b99dda6f48aa9f0918fe045a19b19b26fcfdcca4be93ec967b9e4112d863c982686837b327f1663e308250d56ea337caeeeeb96579e08b20fca92df certifi-2018.10.15.tar.gz +sha512sums="6a6bf1ff98caefcdbf78a8c83e11e155368bacdd806f0ae0c6afa8f513667df6598e594b3584de61acdca3d6049f4a776937f2aa8672b602bd6db7b737f6074e certifi-2018.11.29.tar.gz 1de38c55102b41bc91870b4810de89d8b0cffd61ba14257fe6c8445173b8b44153f2736050772eb63dd0a755890afe0f2d27516bbd39f05bf4016a4e29eebb67 use-system-certs.patch" diff --git a/user/py3-configargparse/APKBUILD b/user/py3-configargparse/APKBUILD index 2cb311647..4641df6e8 100644 --- a/user/py3-configargparse/APKBUILD +++ b/user/py3-configargparse/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: zlg <zlg+adelie@zlg.space> pkgname=py3-configargparse _pkgname=ConfigArgParse -pkgver=0.13.0 +pkgver=0.14.0 pkgrel=0 pkgdesc="A drop-in replacement for argparse" url="https://github.com/bw2/ConfigArgParse" @@ -33,5 +33,5 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="797c5edbc51353797204152b5c908ddb4e883a98f247430448d774957fd841286ea1a3cb87db3186e683a65f566cfce0a815e4bd558b9c823d9226d856341ca9 py3-configargparse-0.13.0.tar.gz +sha512sums="e48ca61027abf0e0acb8414b6d89b276b186b4f714368b8c33975537c2264bb2d81f18cf3013b99d9ce752014361afa973f704b3f6957ca4b98319bb0ca5ca8c py3-configargparse-0.14.0.tar.gz df324cbc12d0d5cf3cf8bfe494e358d366d8a7891183e9a7922d5331f86e30cbe5810b709ad93dfd41f33cd08c1d87371b9aa13c92d7637d4459d83db41be33f python3.patch" diff --git a/user/py3-cryptography/APKBUILD b/user/py3-cryptography/APKBUILD index 0c42cdc67..587199c0e 100644 --- a/user/py3-cryptography/APKBUILD +++ b/user/py3-cryptography/APKBUILD @@ -2,14 +2,14 @@ # Maintainer: zlg <zlg+adelie@zlg.space> pkgname=py3-cryptography _pkgname=${pkgname#py3-} -pkgver=2.4.2 +pkgver=2.5 pkgrel=0 pkgdesc="A package which provides cryptographic recipes and primitives" -url="https://pypi.python.org/pypi/cryptography" +url="https://pypi.org/project/cryptography" arch="all" options="!check" # tests want hypothesis; deep rabbit hole license="Apache-2.0 OR BSD-3-Clause" -depends="python3 py3-cffi py3-idna py3-asn1crypto py3-six" +depends="python3 py3-cffi py3-asn1crypto py3-six" makedepends="python3-dev libffi-dev openssl-dev" subpackages="" source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="800735fa86e9ad0f8517328d47e55dc79a2b86d8c7539ee2921c526085782d8dad5559bbee84f7effb42275503fa9a984b099a688c530c92f5672c423c0f1a28 cryptography-2.4.2.tar.gz" +sha512sums="5e8f8818fcaa8143526006b027107b8afbdc925d40c846701e65b2c7ee02235b7e0918246515520ef2030b1c87bb157d0d403c28ad68c31459d677af7e2d0b3f cryptography-2.5.tar.gz" diff --git a/user/py3-distutils-extra/APKBUILD b/user/py3-distutils-extra/APKBUILD index 8f68f3e10..557658b55 100644 --- a/user/py3-distutils-extra/APKBUILD +++ b/user/py3-distutils-extra/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=py3-distutils-extra -pkgver=2.41 +pkgver=2.42 pkgrel=0 pkgdesc="Python distutils extras for gettext, themed icons, and scrollkeepr docs" url="https://launchpad.net/python-distutils-extra" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="db42d0f3b6cf9c77cc3b07f1224bcfecc6259816ebda87c5e8733933f8d906c352602a6ea50b93c9e6847010b9a28d295875535bc57efe42dbaa00567ffa0cfb python-distutils-extra-2.41.tar.bz2" +sha512sums="3f69aa3617c4b6f33bee989f8b3612aa12b4ce3c5e07f47799209aa402640078d738e15a1e883afb7062d177ed70ff235af6b09910e4f2cc890e013998eca832 python-distutils-extra-2.42.tar.bz2" diff --git a/user/py3-future/APKBUILD b/user/py3-future/APKBUILD index f6f6b1fcc..d98fc65c2 100644 --- a/user/py3-future/APKBUILD +++ b/user/py3-future/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: zlg <zlg+adelie@zlg.space> pkgname=py3-future _pkgname=python-future -pkgver=0.15.2 +pkgver=0.17.0 pkgrel=0 pkgdesc="Easy, clean, reliable Python 2/3 compatibility" url="http://python-future.org/" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="96365f3c97f801e045d0957509ce05269e72f411202e4af0f9ddff08e5d385e25d73c9a5ad3080d157fd9fed65483a2a355f05d75ab15b19c4777e93c180f70b py3-future-0.15.2.tar.gz" +sha512sums="0b914ba062dd2b3c6837d8d8d274d27faadc587b264e887266527940fa7b4b98ce1b0076f1e589f943406d24b9e17f3ae8c2060c4ffa2207f620040988c176a3 py3-future-0.17.0.tar.gz" diff --git a/user/py3-idna/APKBUILD b/user/py3-idna/APKBUILD index ecf2f5ce3..0fd7e1e8e 100644 --- a/user/py3-idna/APKBUILD +++ b/user/py3-idna/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: zlg <zlg+adelie@zlg.space> pkgname=py3-idna _pkgname=${pkgname#py3-} -pkgver=2.7 +pkgver=2.8 pkgrel=0 pkgdesc="IDNA 2008 and UTS #46 for Python" url="https://github.com/kjd/idna" @@ -31,4 +31,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="6fcfd9aec25d6ca14a72e5e236d612ec9aba81aa41e31001bd4cf3cc5499ac133e05bf8393fc2e5d54ea7602ba6601c87e7a219339d9a4979198572d78cf4987 idna-2.7.tar.gz" +sha512sums="848ca6a2630da1cfd9c4657854d71dc060f31fdd1f687ce35fd10467ca08ab29223bae521999aabde44ef777724bd5f5c2b5f362109c2c531c2ad6358ed1f3d6 idna-2.8.tar.gz" diff --git a/user/py3-openssl/APKBUILD b/user/py3-openssl/APKBUILD index ecab996e1..b19a1d09d 100644 --- a/user/py3-openssl/APKBUILD +++ b/user/py3-openssl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: zlg <zlg+adelie@zlg.space> pkgname=py3-openssl _pkgname=pyOpenSSL -pkgver=18.0.0 +pkgver=19.0.0 pkgrel=0 pkgdesc="Python wrapper module around the OpenSSL library" url="https://github.com/pyca/pyopenssl" @@ -26,4 +26,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="7106d4116243a164c1f458ad495564c2cf3a46b4b0fbb1d452b4174ead4409bc9c783c3a4674231ed3c26ecf588077b01dadbdefe033d5e7251a61531c6f6c15 pyOpenSSL-18.0.0.tar.gz" +sha512sums="a7e12bf5be725ccebd1223d567a9b9e8bd35f79cbf3a0409108fa6f00e10ab137dd6876369e9dede02b2abc7d700786cc905532ca5c31b6e246f6df8b24e2818 pyOpenSSL-19.0.0.tar.gz" diff --git a/user/py3-ply/APKBUILD b/user/py3-ply/APKBUILD new file mode 100644 index 000000000..495a66d53 --- /dev/null +++ b/user/py3-ply/APKBUILD @@ -0,0 +1,31 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=py3-ply +pkgver=3.11 +pkgrel=0 +pkgdesc="lex(1) and yacc(1) parser in Python" +url="http://www.dabeaz.com/ply/" +arch="noarch" +license="BSD-3-Clause" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="http://www.dabeaz.com/ply/ply-$pkgver.tar.gz" +builddir="$srcdir/ply-$pkgver" + +build() { + cd "$builddir" + python3 setup.py build +} + +check() { + cd "$builddir" + python3 setup.py check +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008 ply-3.11.tar.gz" diff --git a/user/py3-pycairo/APKBUILD b/user/py3-pycairo/APKBUILD index b93a99c1e..87de6f166 100644 --- a/user/py3-pycairo/APKBUILD +++ b/user/py3-pycairo/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=py3-pycairo -pkgver=1.17.1 +pkgver=1.18.0 pkgrel=0 pkgdesc="Python bindings for Cairo" url="https://pycairo.readthedocs.io/" @@ -9,8 +9,7 @@ arch="all" license="MIT AND (LGPL-2.1-only OR MPL-1.1)" makedepends="python3-dev cairo-dev meson" subpackages="$pkgname-dev" -source="https://files.pythonhosted.org/packages/68/76/340ff847897296b2c8174dfa5a5ec3406e3ed783a2abac918cf326abad86/pycairo-$pkgver.tar.gz" -sha512sums="b6a6af4afa4ac92020b375a72e6f8a7981e6628d4e68877a7fd08bd8ae3835063000b16214d84a40aff4c6b4cf0937236724631ae6dac368a9db0bf3837063fe pycairo-1.17.1.tar.gz" +source="https://files.pythonhosted.org/packages/source/p/pycairo/pycairo-$pkgver.tar.gz" builddir="$srcdir/pycairo-$pkgver" build() { @@ -34,3 +33,4 @@ package() { DESTDIR="$pkgdir" ninja -C output install } +sha512sums="29af1eff8fc3ca942c6d7fcda8e5e004f01d1bfdab911f4ebb34213520922cf35c12d07bd18fe74a2c6d3c7f5a1aefd7fb5fe9b7cd310e6707b7451d5d5e18b0 pycairo-1.18.0.tar.gz" diff --git a/user/py3-requests/APKBUILD b/user/py3-requests/APKBUILD index 68a449743..1746a8256 100644 --- a/user/py3-requests/APKBUILD +++ b/user/py3-requests/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: zlg <zlg+adelie@zlg.space> pkgname=py3-requests _pkgname=${pkgname#py3-} -pkgver=2.19.1 +pkgver=2.21.0 pkgrel=0 pkgdesc="A HTTP request library for Python" url="http://www.python-requests.org/" @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="deef2662227497b472f6e7eb7f0ee468c772069fc66552f71d80e5a12af62a187f8bc6a8a78531915e824c7f277d0db61c1534c89d13d473f68504f0bd6edf47 requests-2.19.1.tar.gz" +sha512sums="385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104 requests-2.21.0.tar.gz" diff --git a/user/py3-rfc3339/APKBUILD b/user/py3-rfc3339/APKBUILD index ae6c517af..928996f5e 100644 --- a/user/py3-rfc3339/APKBUILD +++ b/user/py3-rfc3339/APKBUILD @@ -6,7 +6,7 @@ _pkgname=pyRFC3339 pkgver=1.1 pkgrel=0 pkgdesc="Generate and parse RFC 3339 timestamps" -url="https://pypi.python.org/pypi/pyRFC3339" +url="https://pypi.org/project/pyRFC3339" arch="noarch" options="!check" # needs nose license="MIT" diff --git a/user/py3-tz/APKBUILD b/user/py3-tz/APKBUILD index 6dc33045e..d8182670c 100644 --- a/user/py3-tz/APKBUILD +++ b/user/py3-tz/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: zlg <zlg+adelie@zlg.space> pkgname=py3-tz _pkgname=pytz -pkgver=2018.5 +pkgver=2018.9 pkgrel=0 pkgdesc="Timezone definitions for Python" url="http://pytz.sourceforge.net/" @@ -28,7 +28,6 @@ package() { cd "$builddir" python3 setup.py install --prefix=/usr --root="$pkgdir" } - -sha512sums="35b6bdd25b8e57c693da4379c2032401ef3cf290a57d8448c67dcaf1491a21d27ff25d932ef3ec3a51e31fbb7541e081073f292867a7d1ad47904b69dc7e4863 pytz-2018.5.tar.gz +sha512sums="c3dabe61d04539245761a5c4e3bfb614df1c3b8ccc2ffa1cf320c5ad642242c29b3321fe7855d32a2ae55c739acbbe8c0e1813df5b3c757b8f56fff910fee159 pytz-2018.9.tar.gz be61b829014be0d0d7db0c544481d378a95324c1f5968cbbcd7887c6ee8ce52a0b47ae734e16fc5fb2429d8d49c8ef199b6b3b7194f9e654699bb73ab8f3a10d zoneinfo-noinstall.patch a09467dbb00c1ab9f7e7527d9b020a6d913b8da2380a5359e782f27ccf9ec4dd4f50bfc92c95dc2e793904242c8139793c15e78e651d2777fb3b3abc48fcd640 zoneinfo-fix.patch" diff --git a/user/py3-urllib3/APKBUILD b/user/py3-urllib3/APKBUILD index e97b7032b..68ea652b2 100644 --- a/user/py3-urllib3/APKBUILD +++ b/user/py3-urllib3/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: zlg <zlg+adelie@zlg.space> pkgname=py3-urllib3 _pkgname=${pkgname#py3-} -pkgver=1.23 +pkgver=1.24.1 pkgrel=0 pkgdesc="HTTP library with thread-safe connection pooling, file post, and more" url="https://github.com/shazow/urllib3" @@ -13,7 +13,7 @@ license="MIT" depends="python3 py3-certifi py3-cryptography py3-idna py3-openssl py3-pysocks" makedepends="python3-dev" subpackages="" -source="$pkgname-$pkgver.tar.gz::https://github.com/shazow/urllib3/archive/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/urllib3/urllib3/archive/$pkgver.tar.gz" builddir="$srcdir/$_pkgname-$pkgver" build() { @@ -27,4 +27,4 @@ package() { python3 setup.py install --prefix=/usr --root="$pkgdir" } -sha512sums="1d9eccdd2f939a1029fb6e49c45409b3a493f38b5880bba45a6e8a8088c0478190807b1fe7341b22abe363809ef41c5367de831de9618bcc62f34cb9f0cbc7af py3-urllib3-1.23.tar.gz" +sha512sums="2f5453cf0ec1b65de9a9fca0fdb45664f7481507c875b7115c063cb177628b4b611377e588508ab8433e0797fc78b60fd3ea5cc5ac0a3f105d36bfff9a56f1f4 py3-urllib3-1.24.1.tar.gz" diff --git a/user/py3-zope-component/APKBUILD b/user/py3-zope-component/APKBUILD index e915703cf..6c283d12c 100644 --- a/user/py3-zope-component/APKBUILD +++ b/user/py3-zope-component/APKBUILD @@ -3,16 +3,16 @@ pkgname=py3-zope-component _pkgname=zope.component pkgver=4.5 -pkgrel=0 +pkgrel=1 pkgdesc="Zope Component Architecture" url="https://pypi.python.org/pypi/zope.component" arch="noarch" options="!check" # needs nose license="ZPL-2.1" -depends="python3 py3-zope-interface py3-zope-event" +depends="python3 py3-zope-deferredimport py3-zope-deprecation py3-zope-event py3-zope-hookable py3-zope-interface py3-zope-proxy" makedepends="python3-dev" subpackages="" -source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/zope.component/archive/$pkgver.tar.gz" +source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" builddir="$srcdir"/$_pkgname-$pkgver build() { diff --git a/user/py3-zope-deferredimport/APKBUILD b/user/py3-zope-deferredimport/APKBUILD new file mode 100644 index 000000000..f93a4d611 --- /dev/null +++ b/user/py3-zope-deferredimport/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=py3-zope-deferredimport +_pkgname=zope.deferredimport +pkgver=4.3 +pkgrel=0 +pkgdesc="Zope module that allows for lazy module importing" +url="https://github.com/zopefoundation/zope.deferredimport" +arch="noarch" +options="!check" # needs zope.testrunner +license="ZPL-2.1" +depends="python3" +makedepends="python3-dev py3-zope-proxy" +subpackages="" +source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + cd "$builddir" + python3 setup.py build +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="0b62cf6caa7709dbb6b0ae85bf9c5e24909c79af57da8e3d081e69ff9f73fc60fbe5a83cdfe795551eeee3c045d3783a09cb3e6eb3964a44e6fbbea149ca3f8a zope.deferredimport-4.3.tar.gz" diff --git a/user/py3-zope-deprecation/APKBUILD b/user/py3-zope-deprecation/APKBUILD new file mode 100644 index 000000000..f21a1fdeb --- /dev/null +++ b/user/py3-zope-deprecation/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=py3-zope-deprecation +_pkgname=zope.deprecation +pkgver=4.4.0 +pkgrel=0 +pkgdesc="A function to mark deprecated parts of an API" +url="https://github.com/zopefoundation/zope.deprecation" +arch="noarch" +options="!check" # needs zope.testrunner +license="ZPL-2.1" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + cd "$builddir" + python3 setup.py build +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="d8632a3442eee059383014bb3341b30897ad8f9206b71bc586c873c4cccf5f87296edaf18f1e1c93878f480e3b0e8e1c1936ac19ed327f4ab227402ebbc73e0e zope.deprecation-4.4.0.tar.gz" diff --git a/user/py3-zope-hookable/APKBUILD b/user/py3-zope-hookable/APKBUILD new file mode 100644 index 000000000..a2b4493be --- /dev/null +++ b/user/py3-zope-hookable/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=py3-zope-hookable +_pkgname=zope.hookable +pkgver=4.2.0 +pkgrel=0 +pkgdesc="A library that provides an interface for hookable functions" +url="https://github.com/zopefoundation/zope.hookable" +arch="all" +options="!check" # needs zope.testing +license="ZPL-2.1" +depends="python3" +makedepends="python3-dev py3-tox coverage" +subpackages="" +source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + cd "$builddir" + python3 setup.py build +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="aeeafff7e5c7cbe3d5944864278896f926086514e75be1d5956e32fc0a3769ac11b008c3855a0816084c7deb64f14c65db49852dac2beaf06420a304af6ebb69 zope.hookable-4.2.0.tar.gz" diff --git a/user/py3-zope-proxy/APKBUILD b/user/py3-zope-proxy/APKBUILD new file mode 100644 index 000000000..37a7b35b2 --- /dev/null +++ b/user/py3-zope-proxy/APKBUILD @@ -0,0 +1,28 @@ +# Contributor: zlg <zlg+adelie@zlg.space> +# Maintainer: zlg <zlg+adelie@zlg.space> +pkgname=py3-zope-proxy +_pkgname=zope.proxy +pkgver=4.3.1 +pkgrel=0 +pkgdesc="Zope module for class and function proxies" +url="https://github.com/zopefoundation/zope.proxy" +arch="all" +options="!check" # needs zope.testrunner, zope.security +license="ZPL-2.1" +depends="python3 py3-zope-interface" +makedepends="python3-dev" +subpackages="" +source="$_pkgname-$pkgver.tar.gz::https://github.com/zopefoundation/$_pkgname/archive/$pkgver.tar.gz" +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + cd "$builddir" + python3 setup.py build +} + +package() { + cd "$builddir" + python3 setup.py install --prefix=/usr --root="$pkgdir" +} + +sha512sums="1072258c35bf23162c4f347060ea79979cbfc551c308e809b7e63f1d9434f566b665954edf3d2ab0b72161fb74b0e707c5904775876188306411ed0401424612 zope.proxy-4.3.1.tar.gz" diff --git a/user/qpdf/APKBUILD b/user/qpdf/APKBUILD index 0b957061b..144939793 100644 --- a/user/qpdf/APKBUILD +++ b/user/qpdf/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: pkgname=qpdf -pkgver=8.2.1 +pkgver=8.3.0 pkgrel=0 pkgdesc="Command-line tools and library for transforming PDF files" url="http://qpdf.sourceforge.net" @@ -60,4 +60,4 @@ fix_qdf() { mv "$pkgdir"/usr/bin/fix-qdf "$subpkgdir"/usr/bin/ } -sha512sums="ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c qpdf-8.2.1.tar.gz" +sha512sums="9982a489cc6b9c880adc7decb18f1941930a86f430a00505f230364fbadf83c5afd832a1ccf7966a9453cdbb40b7c60db438f7b27d836a242eefb07a77d7284d qpdf-8.3.0.tar.gz" diff --git a/user/qpdfview/APKBUILD b/user/qpdfview/APKBUILD index 8fd0e21d7..612cb251e 100644 --- a/user/qpdfview/APKBUILD +++ b/user/qpdfview/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=qpdfview pkgver=0.4.16 -pkgrel=0 +pkgrel=1 pkgdesc="A tabbed document viewer" url="https://launchpad.net/qpdfview" arch="all" diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD index 6996d9d04..cdcc140e8 100644 --- a/user/qps/APKBUILD +++ b/user/qps/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=qps -pkgver=1.10.18 +pkgver=1.10.19 pkgrel=0 pkgdesc="Qt-based task manager" -url="https://github.com/QtDesktop" +url="https://lxqt.org" arch="all" options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev - qt5-qttools-dev libxrender-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" @@ -42,5 +42,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="f2647cb814e6cefba71aa70ee63c92dde88b312c9ada67e677de2bf22141afa3d7196d089606d270b610ddf3bd7466e6534de3614bea1a68d3a3b61a23b1c37d qps-1.10.18.tar.xz +sha512sums="8fccc259016e03e8dd0723364fe9224b5348016c1840e9aef8939688c794179c58724690cf4e9bfb94d43372d57a94503a0a684598c7a73dd724f10964dae91a qps-1.10.19.tar.xz 32c154f1d3c9e74dda3eabfd2e3b9e9f3c1d77f808dfacc9dd05c904066832d92d361ca56ef9d784d945fad60cf67d6c909cbb730a0ffed1fea3bf44c3aad5a2 qps-1.10.17-compile-fixes.patch" diff --git a/user/qt5-qtspeech/APKBUILD b/user/qt5-qtspeech/APKBUILD new file mode 100644 index 000000000..408e95824 --- /dev/null +++ b/user/qt5-qtspeech/APKBUILD @@ -0,0 +1,32 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=qt5-qtspeech +_pkgname=qtspeech-opensource-src +pkgver=5.9.7 +pkgrel=0 +pkgdesc="Qt 5 - Library for speech processing and Text-to-Speech (TTS)" +url="https://www.qt.io/" +arch="all" +options="!check" +license="LGPLv2 with exceptions OR GPLv3 with exceptions" +depends="" +makedepends="qt5-qtbase-dev qt5-qtmultimedia-dev speech-dispatcher-dev" +subpackages="$pkgname-dev" +source="https://download.qt.io/official_releases/qt/${pkgver%.*}/$pkgver/submodules/$_pkgname-$pkgver.tar.xz + fix-linking-order.patch + " +builddir="$srcdir"/$_pkgname-$pkgver + +build() { + cd "$builddir" + qmake + make +} + +package() { + cd "$builddir" + make install INSTALL_ROOT="$pkgdir" +} + +sha512sums="e2d1f2f73bc6595572d18b1c17caf27878851adf164dbca25925301b94916cce96b2ea3db4c2c7e6a23d6e79c37c35b28239aa613adaf6cb9eb340f40c396099 qtspeech-opensource-src-5.9.7.tar.xz +7bce4bd52aa0b60fbd0ec781fc18ac518a8fe76c99e61be03170f00d27747e989b1562a45435be78d0d166ab0fdf523055620ba7c63f49e328704e1cd6aa4718 fix-linking-order.patch" diff --git a/user/qt5-qtspeech/fix-linking-order.patch b/user/qt5-qtspeech/fix-linking-order.patch new file mode 100644 index 000000000..b07e0536d --- /dev/null +++ b/user/qt5-qtspeech/fix-linking-order.patch @@ -0,0 +1,6 @@ +--- qtspeech-opensource-src-5.9.7/config.tests/flite_alsa/flite_alsa.pro.old 2018-05-31 12:22:17.000000000 +0000 ++++ qtspeech-opensource-src-5.9.7/config.tests/flite_alsa/flite_alsa.pro 2019-02-17 15:12:30.810000000 +0000 +@@ -1,2 +1,2 @@ +-LIBS += -lasound + include(../flite/flite.pri) ++LIBS += -lasound diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD index f8cb02cd8..faf9c6455 100644 --- a/user/qt5ct/APKBUILD +++ b/user/qt5ct/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=qt5ct -pkgver=0.36 +pkgver=0.37 pkgrel=0 pkgdesc="GUI utility for configuring Qt5" url="https://sourceforge.net/projects/qt5ct/" @@ -23,4 +23,4 @@ package() { make INSTALL_ROOT="$pkgdir" install } -sha512sums="dfd6f85328fe8f14c8f2349bc0cac698e549350e2c000a73ac26474ca38ec5f44fd4ebed9b6976fc3423dda8322fd80355eafa6ecbec17495d1e2278c3189a88 qt5ct-0.36.tar.bz2" +sha512sums="685716b2e756ff433f5092cda981ef665ca5a44ad009745f51b38278c3d8eed6939fc52c6cf1f09046ab0a3910261892d7cf5250360874e2d7e4f12bff692da7 qt5ct-0.37.tar.bz2" diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD index f297b4ac5..c91021fd6 100644 --- a/user/qterminal/APKBUILD +++ b/user/qterminal/APKBUILD @@ -1,16 +1,16 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=qterminal -pkgver=0.9.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Qt-based terminal for LXQt" 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.5.0 - qtermwidget-dev>=0.9.0 qt5-qttools-dev kwindowsystem-dev" +makedepends="cmake extra-cmake-modules lxqt-build-tools>=0.6.0 + qtermwidget-dev>=${pkgver%.*}.0 qt5-qttools-dev kwindowsystem-dev" source="https://github.com/lxqt/qterminal/releases/download/$pkgver/qterminal-$pkgver.tar.xz" build() { @@ -26,7 +26,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ ${CMAKE_CROSSOPTS} .. make } @@ -41,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="42553a847873e71543161855b6f07b521ebf7db8091a1753dfc4ad4bbdf7f074f74b7e7195e56ee482b5b9ff3ea3037250ba74fb64a8137fb3959fceaa2baa6e qterminal-0.9.0.tar.xz" +sha512sums="8254b1604648a6d01eb1f55e3aa35dbcedff30998ee7c95e02558939f1cbb4f9fab3ca76118b654979cedff4e35a2cb3de01aab92b89d78b8c9332c36c10f0ec qterminal-0.14.0.tar.xz" diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD index b315cefc4..386f1431e 100644 --- a/user/qtermwidget/APKBUILD +++ b/user/qtermwidget/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=qtermwidget -pkgver=0.9.0 -pkgrel=1 +pkgver=0.14.0 +pkgrel=0 pkgdesc="Qt-based terminal widget, used in QTerminal" url="https://lxqt.org/" arch="all" @@ -11,7 +11,7 @@ license="GPL-2.0+" depends="" depends_dev="libutempter-dev" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev - lxqt-build-tools>0.5.0 $depends_dev" + lxqt-build-tools>0.6.0 $depends_dev" subpackages="$pkgname-dev" source="https://github.com/lxqt/qtermwidget/releases/download/$pkgver/qtermwidget-$pkgver.tar.xz fix-linking.patch @@ -30,7 +30,6 @@ build() { -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ - -DPULL_TRANSLATIONS=False \ -DQTERMWIDGET_USE_UTEMPTER=True \ ${CMAKE_CROSSOPTS} .. make @@ -46,5 +45,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="fc7286dc3494bd1ccdd95fae3cee7cc8dd39b51eab58e697d939d5fb85c930545d79b984769815708852335e460ad063b684291b200e1e7f90c13195ea5e66dc qtermwidget-0.9.0.tar.xz +sha512sums="ff133a8084ec5159199bf89952c677f65e908c6d765f6bff7d79d9eda43a0ca80a95f91c83cb9134eb53775101f29c0fc8b29d0ff5cf77e4f403cdd8d897dc85 qtermwidget-0.14.0.tar.xz f2d43f12479a3a3a01be9ebee9ce349b0f4e60b07dfc79e8666ed913d5682987f81b08a397ee8ca628c36f5770ddfe63f5abafa94dff6c1c1e090adc1637af35 fix-linking.patch" diff --git a/user/rdesktop/APKBUILD b/user/rdesktop/APKBUILD new file mode 100644 index 000000000..06ed9d766 --- /dev/null +++ b/user/rdesktop/APKBUILD @@ -0,0 +1,52 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=rdesktop +pkgver=1.8.4 +pkgrel=0 +pkgdesc="Remote Desktop Protocol client" +url="https://www.rdesktop.org/" +arch="all" +options="!check" # No test suite. +license="GPL-3.0-only" +depends="" +makedepends="alsa-lib-dev krb5-dev libice-dev libsamplerate-dev libx11-dev + libxrandr-dev openssl-dev pcsc-lite-dev" +subpackages="$pkgname-doc" +source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop-$pkgver.tar.gz + gssapi.patch + signed-int.patch + " + +prepare() { + cd "$builddir" + default_prepare + update_config_sub + ./bootstrap +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --enable-smartcard + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="9e4f6723eb0baab31ad11f1c5c29a4753c655386c2381d01646b7834c959ffc2ec1e0c2f3f73626255aa018889709758d97387c7563da98bb1b7f269610929ae rdesktop-1.8.4.tar.gz +ae91f4e0eb1e2c3141aedef660eb89628b334155c8c0559805cc4ac75274fff94101daf665052b27fe5074ce7468ff854fab865e7efd377d08d525319c7aa150 gssapi.patch +e8b4af70a54944d83b7c899aa680042f559e75af3e9a3deb2c7395f8b4a56e50d1c2f26bd10b2377ff577115d635c2aa0fdbddf995588f1d492badfc3e72456e signed-int.patch" diff --git a/user/rdesktop/gssapi.patch b/user/rdesktop/gssapi.patch new file mode 100644 index 000000000..5befcf02e --- /dev/null +++ b/user/rdesktop/gssapi.patch @@ -0,0 +1,82 @@ +From 71f1cfb909c0a955632001cf9fad80a321a43372 Mon Sep 17 00:00:00 2001 +From: Pierre Ossman <ossman@cendio.se> +Date: Mon, 10 Jul 2017 15:12:26 +0200 +Subject: [PATCH 1/2] Fix pointer types for gss_wrap()/gss_unrap() + +We were using the incorrect type for the context for these two calls. +No practical effects, but some noise from the compiler about the wrong +pointer type. +--- + cssp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/cssp.c b/cssp.c +index 9f4c0829..6ac37746 100644 +--- a/cssp.c ++++ b/cssp.c +@@ -173,7 +173,7 @@ cssp_gss_get_service_name(char *server, gss_name_t * name) + } + + static RD_BOOL +-cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) ++cssp_gss_wrap(gss_ctx_id_t ctx, STREAM in, STREAM out) + { + int conf_state; + OM_uint32 major_status; +@@ -212,7 +212,7 @@ cssp_gss_wrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) + } + + static RD_BOOL +-cssp_gss_unwrap(gss_ctx_id_t * ctx, STREAM in, STREAM out) ++cssp_gss_unwrap(gss_ctx_id_t ctx, STREAM in, STREAM out) + { + OM_uint32 major_status; + OM_uint32 minor_status; + +From b556651fe109c8802a0c798b8a680e5ff883bf4e Mon Sep 17 00:00:00 2001 +From: Pierre Ossman <ossman@cendio.se> +Date: Mon, 10 Jul 2017 15:14:01 +0200 +Subject: [PATCH 2/2] Use standard GSSAPI rather than libgssglue + +That project is abandoned and the distributions aren't including +it anymore. +--- + configure.ac | 15 ++++----------- + 1 file changed, 4 insertions(+), 11 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e045c409..a969ad5d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -122,27 +122,20 @@ fi + + dnl CredSSP feature + AC_ARG_ENABLE([credssp], AS_HELP_STRING([--disable-credssp], [disable support for CredSSP])) +-AC_ARG_ENABLE([static-gssglue], AS_HELP_STRING([--enable-static-gssglue]), +- [static_gssglue=yes], [static_gssglue=no]) + AS_IF([test "x$enable_credssp" != "xno"], [ + if test -n "$PKG_CONFIG"; then +- PKG_CHECK_MODULES(GSSGLUE, libgssglue, [WITH_CREDSSP=1], [WITH_CREDSSP=0]) ++ PKG_CHECK_MODULES(GSSAPI, krb5-gssapi, [WITH_CREDSSP=1], [WITH_CREDSSP=0]) + fi + + if test x"$WITH_CREDSSP" = "x1"; then + CREDSSPOBJ="cssp.o" +- CFLAGS="$CFLAGS $GSSGLUE_CFLAGS" +- +- AS_IF([test "x$static_gssglue" != "xno"], [ +- LIBS="$LIBS -Wl,-Bstatic -lgssglue -Wl,-Bdynamic" +- ], [ +- LIBS="$LIBS -lgssglue" +- ]) ++ CFLAGS="$CFLAGS $GSSAPI_CFLAGS" ++ LIBS="$LIBS $GSSAPI_LIBS" + + AC_DEFINE(WITH_CREDSSP) + else + echo +- echo "CredSSP support requires libgssglue, install the dependency" ++ echo "CredSSP support requires GSSAPI, install the dependency" + echo "or disable the feature using --disable-credssp." + echo + exit 1 diff --git a/user/rdesktop/signed-int.patch b/user/rdesktop/signed-int.patch new file mode 100644 index 000000000..405a4dd3e --- /dev/null +++ b/user/rdesktop/signed-int.patch @@ -0,0 +1,11 @@ +--- rdesktop-1.8.4/orders.c.old 2019-01-02 14:03:25.000000000 +0000 ++++ rdesktop-1.8.4/orders.c 2019-01-09 17:13:26.170000000 +0000 +@@ -1266,7 +1266,7 @@ + in_uint16_le(s, flags); /* used by bmpcache2 */ + in_uint8(s, type); + +- if (!s_check_rem(s, length + 7)) ++ if (!s_check_rem(s, (sint16) length + 7)) + { + rdp_protocol_error("process_secondary_order(), next order pointer would overrun stream", &packet); + } diff --git a/user/recode/APKBUILD b/user/recode/APKBUILD new file mode 100644 index 000000000..09b9a8121 --- /dev/null +++ b/user/recode/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=recode +pkgver=3.7.1 +pkgrel=0 +pkgdesc="Character set conversion utilities" +url=" " +arch="all" +options="!check" # Requires unpackaged `cython`. +license="GPL-3.0+" +depends="" +makedepends="help2man cmd:lex python3" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs" +source="https://github.com/rrthomas/recode/releases/download/v$pkgver/recode-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + ac_cv_path_PYTHON=/usr/bin/python3 + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3cb067fb7e1b0ec89c47e7177cb172bc8253042780101f6d8cb1de7bc0873d2af217e7b04a33ac23bdb8ffd41e43eac767307c4bd8a94355c188d5013f177b04 recode-3.7.1.tar.gz" diff --git a/user/redshift/APKBUILD b/user/redshift/APKBUILD new file mode 100644 index 000000000..8e3441950 --- /dev/null +++ b/user/redshift/APKBUILD @@ -0,0 +1,57 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +pkgname=redshift +pkgver=1.12 +pkgrel=0 +pkgdesc="Adjust the color temperature of your screen according to your surroundings" +url="http://jonls.dk/redshift/" +arch="all" +license="GPL-3.0+" +options="!check" # No test suite +depends="" +makedepends="intltool libdrm-dev libx11-dev libxcb-dev libxxf86vm-dev" +subpackages="$pkgname-doc $pkgname-gui $pkgname-lang" +source="https://github.com/jonls/redshift/releases/download/v$pkgver/redshift-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --disable-rpath \ + --disable-corelocation \ + --enable-drm \ + --disable-geoclue2 \ + --enable-nls \ + --disable-quartz \ + --enable-randr \ + --enable-vidmode \ + --disable-wingdi + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +doc() { + cd "$builddir" + install -Dm644 -t "$subpkgdir/usr/share/doc/$pkgname" redshift.conf.sample + default_doc +} + +gui() { + depends="py3-pygobject" + + install -d "$subpkgdir/usr/bin" "$subpkgdir/usr/lib" "$subpkgdir/usr/share" + mv "$pkgdir/usr/bin/redshift-gtk" "$subpkgdir/usr/bin/" + mv "$pkgdir/usr/lib/python"* "$subpkgdir/usr/lib/" + mv "$pkgdir/usr/share/appdata" "$pkgdir/usr/share/applications" "$pkgdir/usr/share/icons" "$subpkgdir/usr/share/" +} + +sha512sums="225e222e5f2c55be4571094ccaf02a92e162dfc35fd0fe504084e21e358b888a72f9992f9f9edaf1d496eb673af74a0d825ae5cf6ef7f0f1ab51d32419722c32 redshift-1.12.tar.xz" diff --git a/user/rendercheck/APKBUILD b/user/rendercheck/APKBUILD new file mode 100644 index 000000000..30a821e2c --- /dev/null +++ b/user/rendercheck/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=rendercheck +pkgver=1.5 +pkgrel=0 +pkgdesc="X11 Render extension testing and debugging utility" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libx11-dev libxrender-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/rendercheck-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="ffa1abf317f85a8bcef3544e3f810b34567553524ac0a784d2a67470e0811854d7983af8600a04aadecf42871ccb83ad5c0e9e25179142fda2a8f5853a07f616 rendercheck-1.5.tar.bz2" diff --git a/user/rgb/APKBUILD b/user/rgb/APKBUILD new file mode 100644 index 000000000..42be8cbe4 --- /dev/null +++ b/user/rgb/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=rgb +pkgver=1.0.6 +pkgrel=0 +pkgdesc="X11 colour name database" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/rgb-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e rgb-1.0.6.tar.bz2" diff --git a/user/rocs/APKBUILD b/user/rocs/APKBUILD index 729d3a6a5..51a33b683 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=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Graph theory IDE" url="https://www.kde.org/applications/education/rocs/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e45cdb2d14d5b488935a5d5d8cba4f7fe26263793500d1e7f93c07fa547314816bb94a8a00226577cc1aa80eb0a94b76174e429542799ce3d6dbb4935ae3686d rocs-18.08.3.tar.xz" +sha512sums="6bba77de1b9f374c178772c1e256c49ac10decf711028b29612cb75de8dcba7637c734c0d60fd8aee99ecb895c6bcc15e029ced791c2d9f829f9c2470127ac57 rocs-18.12.2.tar.xz" diff --git a/user/rpcsvc-proto/APKBUILD b/user/rpcsvc-proto/APKBUILD new file mode 100644 index 000000000..533e63cc5 --- /dev/null +++ b/user/rpcsvc-proto/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=rpcsvc-proto +pkgver=1.4 +pkgrel=0 +pkgdesc="RPC service protocol definitions and compiler" +url=" " +arch="all" +license="BSD-3-Clause" +depends="" +makedepends="" +subpackages="$pkgname-doc" +source="https://github.com/thkukuk/rpcsvc-proto/releases/download/v$pkgver/rpcsvc-proto-$pkgver.tar.gz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d1ad662e8036f17cd013b7becbf811caa62ef444f1c48ba6864c3c3cb28c5d69366b0c18b21692d1ad3f8445f33805e6bffe12c00d07e30324f8b930eae418d4 rpcsvc-proto-1.4.tar.gz" diff --git a/user/rpm2targz/APKBUILD b/user/rpm2targz/APKBUILD new file mode 100644 index 000000000..ca2cd6a5a --- /dev/null +++ b/user/rpm2targz/APKBUILD @@ -0,0 +1,30 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=rpm2targz +pkgver=9.0.0.5g +pkgrel=0 +pkgdesc="Convert Red Hat packages (RPM) to .tar.gz archives" +url="http://www.slackware.com/config/packages.php" +arch="all" +license="BSD-1-Clause" +depends="cmd:cpio xz" +makedepends="" +subpackages="" +source="https://distfiles.adelielinux.org/source/rpm2targz-$pkgver.tar.xz" + +build() { + cd "$builddir" + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="a595d23581bd396a3a00b6eae4cf6edca1c65b52510a02c7b162afc3d89f45026663a271279bb519741b4a35a0ee653fbfb124c5a7d6d921b466dc9236cbf549 rpm2targz-9.0.0.5g.tar.xz" diff --git a/user/rrdtool/APKBUILD b/user/rrdtool/APKBUILD index d80d885df..f61223adc 100644 --- a/user/rrdtool/APKBUILD +++ b/user/rrdtool/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: pkgname=rrdtool -pkgver=1.7.0 +pkgver=1.7.1 pkgrel=0 pkgdesc="Data logging and graphing application" url="https://oss.oetiker.ch/rrdtool/" @@ -86,5 +86,5 @@ utils() { "$subpkgdir"/usr/bin } -sha512sums="36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f rrdtool-1.7.0.tar.gz +sha512sums="ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14 rrdtool-1.7.1.tar.gz c0c27b2c2dfa8e7ec1cb1160d2bda8d7996bbea67f4ce7779da029f583c35e5e415cf46e2a1e5cb8ed2e63d2c58a68fd7471ee6bd820db4c0f4eeeb5c252f8a3 rrdcached.initd" diff --git a/user/sassc/APKBUILD b/user/sassc/APKBUILD new file mode 100644 index 000000000..dcda892bb --- /dev/null +++ b/user/sassc/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=sassc +pkgver=3.5.0 +pkgrel=0 +pkgdesc="CSS preprocessor and extension language compiler" +url="http://sass-lang.com/" +arch="all" +license="MIT" +depends="" +makedepends="libsass-dev" +subpackages="" +source="sassc-$pkgver.tar.gz::https://github.com/sass/sassc/archive/$pkgver.tar.gz" + +prepare() { + cd "$builddir" + default_prepare + export SASSC_VERSION=$pkgver + autoreconf --force --install +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --enable-shared + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="9c94056f66688016dd8eaae9cc791be4b397406b89f1289946c4481b5e1904486878d22fd65e695ed89f9b41a9f902932eb4074e7b0923ce3d4823ea3140334f sassc-3.5.0.tar.gz" diff --git a/user/scons/APKBUILD b/user/scons/APKBUILD new file mode 100644 index 000000000..c3ebf5694 --- /dev/null +++ b/user/scons/APKBUILD @@ -0,0 +1,33 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=scons +pkgver=3.0.4 +pkgrel=0 +pkgdesc="Python-based software building system" +url="https://scons.org/" +arch="noarch" +license="MIT" +depends="python3" +makedepends="python3-dev" +subpackages="" +source="https://prdownloads.sourceforge.net/scons/scons-$pkgver.tar.gz + python3-bang.patch + " + +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="064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627 scons-3.0.4.tar.gz +cb8be26f0d8cae7974dffcb3008c67254e8904bb8bb91f9732dd01a9942e33d57527101ec4104a866061096b991a336d00b344da48cf835489fc5d26fb1f331e python3-bang.patch" diff --git a/user/scons/python3-bang.patch b/user/scons/python3-bang.patch new file mode 100644 index 000000000..e902e7418 --- /dev/null +++ b/user/scons/python3-bang.patch @@ -0,0 +1,8 @@ +--- scons-3.0.4/script/scons.old 2019-01-23 17:30:36.000000000 +0000 ++++ scons-3.0.4/script/scons 2019-01-23 22:08:17.600000000 +0000 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # SCons - a Software Constructor + # diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD index 83f3d4a33..827127a65 100644 --- a/user/screengrab/APKBUILD +++ b/user/screengrab/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=screengrab -pkgver=1.99 +pkgver=1.100 pkgrel=0 pkgdesc="Cross-platform Qt-based software for taking screenshots" url="https://github.com/lxqt/screengrab" @@ -40,4 +40,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="06666cad70a9309f987b6fff8f85028b877f0c621cdcc5cb91f8b82a954637a45af30a144cfe50dc6dc04fb24c17ff2768368f3bf318f244b8a8d5b922bfa42c screengrab-1.99.tar.xz" +sha512sums="06bcb5c294d7a379edb9af6cd0be0ce56efb397e9eaa024333f94fc12840ec4114a1acc36b7368133c831e44bafbb4c0daa1bfb4a870ae6c61724f8a73855b40 screengrab-1.100.tar.xz" diff --git a/user/serf/APKBUILD b/user/serf/APKBUILD new file mode 100644 index 000000000..db2ae5425 --- /dev/null +++ b/user/serf/APKBUILD @@ -0,0 +1,41 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=serf +pkgver=1.3.9 +pkgrel=0 +pkgdesc="High-performance HTTP library from Apache" +url="https://serf.apache.org/" +arch="all" +license="Apache-2.0" +depends="" +makedepends="apr-dev apr-util-dev openssl-dev scons zlib-dev" +subpackages="$pkgname-dev" +source="https://www.apache.org/dist/serf/serf-$pkgver.tar.bz2 + py3.patch + " + +build() { + cd "$builddir" + scons PREFIX=/usr -j "$JOBS" +} + +check() { + cd "$builddir" + scons test +} + +package() { + cd "$builddir" + local _header + install -D -m644 libserf-1.a "$pkgdir"/usr/lib/libserf-1.a + install -D -m755 libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1.3.0 + ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so.1 + ln -s libserf-1.so.1.3.0 "$pkgdir"/usr/lib/libserf-1.so + for _header in serf{_bucket_{types,util},}.h; do + install -D -m644 $_header "$pkgdir"/usr/include/serf-1/$_header + done + install -D -m644 serf-1.pc "$pkgdir"/usr/lib/pkgconfig/serf-1.pc +} + +sha512sums="9f5418d991840a08d293d1ecba70cd9534a207696d002f22dbe62354e7b005955112a0d144a76c89c7f7ad3b4c882e54974441fafa0c09c4aa25c49c021ca75d serf-1.3.9.tar.bz2 +4f55a30f8e505e757c36debc8e19041dbf824c5708495d9e0338e4bac736445eff72ea60aa9a9bafdcdde9b26e2ffb6c79c39b4e6f6422cffc34d3986e49d1b1 py3.patch" diff --git a/user/serf/py3.patch b/user/serf/py3.patch new file mode 100644 index 000000000..12e7be1bc --- /dev/null +++ b/user/serf/py3.patch @@ -0,0 +1,24 @@ +--- serf-1.3.9/SConstruct.old 2015-09-17 12:46:24.000000000 +0000 ++++ serf-1.3.9/SConstruct 2019-01-23 22:11:30.900000000 +0000 +@@ -163,9 +163,9 @@ + suffix='.def', src_suffix='.h') + }) + +-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*' +- 'SERF_MINOR_VERSION ([0-9]+).*' +- 'SERF_PATCH_VERSION ([0-9]+)', ++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*' ++ b'SERF_MINOR_VERSION ([0-9]+).*' ++ b'SERF_PATCH_VERSION ([0-9]+)', + env.File('serf.h').get_contents(), + re.DOTALL) + MAJOR, MINOR, PATCH = [int(x) for x in match.groups()] +@@ -183,7 +183,7 @@ + + unknown = opts.UnknownVariables() + if unknown: +- print 'Warning: Used unknown variables:', ', '.join(unknown.keys()) ++ print('Warning: Used unknown variables:', ', '.join(unknown.keys())) + + apr = str(env['APR']) + apu = str(env['APU']) diff --git a/user/sg3_utils/APKBUILD b/user/sg3_utils/APKBUILD new file mode 100644 index 000000000..7dc10d989 --- /dev/null +++ b/user/sg3_utils/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=sg3_utils +pkgver=1.44 +pkgrel=0 +pkgdesc="Utilities to manipulate SCSI devices" +url="http://sg.danny.cz/sg/sg3_utils.html" +arch="all" +license="BSD-2-Clause AND GPL-2.0-only" +depends="" +makedepends="" +subpackages="$pkgname-dev $pkgname-doc" +source="http://sg.danny.cz/sg/p/sg3_utils-$pkgver.tar.xz" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d sg3_utils-1.44.tar.xz" diff --git a/user/showfont/APKBUILD b/user/showfont/APKBUILD new file mode 100644 index 000000000..63af1593b --- /dev/null +++ b/user/showfont/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=showfont +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Utility to display font information from an X11 Font Server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libfs-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/showfont-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd showfont-1.0.5.tar.bz2" diff --git a/user/smproxy/APKBUILD b/user/smproxy/APKBUILD new file mode 100644 index 000000000..03e3eda4e --- /dev/null +++ b/user/smproxy/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=smproxy +pkgver=1.0.6 +pkgrel=0 +pkgdesc="X11R6 Session Manager proxy" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libice-dev libsm-dev libxmu-dev libxt-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/smproxy-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7 smproxy-1.0.6.tar.bz2" diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD new file mode 100644 index 000000000..93b519d45 --- /dev/null +++ b/user/socat/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=socat +pkgver=1.7.3.2 +pkgrel=0 +pkgdesc="Multipurpose network relay" +url="http://www.dest-unreach.org/socat/" +arch="all" +options="!check" # No testsuite +license="GPL-2.0-only" +depends="" +makedepends="openssl-dev" +subpackages="$pkgname-doc" +source="http://www.dest-unreach.org/socat/download/socat-$pkgver.tar.gz + netdb-internal.patch" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="540658b2a3d1b87673196282e5c62b97681bd0f1d1e4759ff9d72909d11060235ee9e9521a973603c1b00376436a9444248e5fbc0ffac65f8edb9c9bc28e7972 socat-1.7.3.2.tar.gz +22a6e0c2317a9317997c98114daac258ebbcc3d8e58e49a6ebf24781b98967afed47c63807282582fa0909076fe349281f05e4462faacb90e7aabc853903d6e6 netdb-internal.patch" diff --git a/user/socat/netdb-internal.patch b/user/socat/netdb-internal.patch new file mode 100644 index 000000000..d1ebc8e5b --- /dev/null +++ b/user/socat/netdb-internal.patch @@ -0,0 +1,13 @@ +--- socat-1.7.2.4.orig/compat.h ++++ socat-1.7.2.4/compat.h +@@ -656,6 +656,10 @@ + # define NETDB_INTERNAL h_NETDB_INTERNAL + #endif + ++#if !defined(NETDB_INTERNAL) ++# define NETDB_INTERNAL (-1) ++#endif ++ + #ifndef INET_ADDRSTRLEN + # define INET_ADDRSTRLEN sizeof(struct sockaddr_in) + #endif diff --git a/user/solid/APKBUILD b/user/solid/APKBUILD index 4e95481af..e5b2b0f5a 100644 --- a/user/solid/APKBUILD +++ b/user/solid/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=solid -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Platform-independent hardware discovery and access" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="baae7fd654e6da92d634ff76a94db1da3eb9dce6bd66634c84d00c7d8e5c20ca98713a8802d92e834b1760bd4058b3432598934b22b3c5456ae43506803b0384 solid-5.52.0.tar.xz" +sha512sums="5728b617d5d6ec6acc71cd4707ab25e3c753c9616c2b5b1d4b1c66899faa526b395c206c3d3b3f36cb4e2f005f1267c12c9f73cf4d9fffd486eae64fbf78d855 solid-5.54.0.tar.xz" diff --git a/user/sonnet/APKBUILD b/user/sonnet/APKBUILD index c2d650ee9..80398527a 100644 --- a/user/sonnet/APKBUILD +++ b/user/sonnet/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sonnet -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for implementing portable spell check functionality" url="https://www.kde.org/" @@ -50,4 +50,4 @@ aspell() { "$subpkgdir"/usr/lib/qt5/plugins/kf5/sonnet/sonnet_aspell.so } -sha512sums="165645d9fc8ea4f3e373d6b585a8a54f2e13fc6c4f265a2806c8325e52c9e55a1806a0a439fa9c31733306aa11dc04d43e484805ee1e881600e010cb6f4fcf99 sonnet-5.52.0.tar.xz" +sha512sums="fe7551fb65fe896a872c3f0af4ce1c60f4b974f993465b5ae7b3eea219a0964f7ae5107aa9346884ffd37c95b4bf7ea0bed05592245978c07fd633af88eeca88 sonnet-5.54.0.tar.xz" diff --git a/user/sound-theme-freedesktop/APKBUILD b/user/sound-theme-freedesktop/APKBUILD new file mode 100644 index 000000000..ad1f9c0e4 --- /dev/null +++ b/user/sound-theme-freedesktop/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=sound-theme-freedesktop +pkgver=0.8 +pkgrel=0 +pkgdesc="Stereo sound theme" +url="https://www.freedesktop.org/wiki/Specifications/sound-theme-spec/" +arch="noarch" +license="CC-BY-SA AND GPL-2.0+ AND CC-BY-3.0 AND GPL-2.0-only" +depends="" +makedepends="intltool" +subpackages="" +source="https://people.freedesktop.org/~mccann/dist/sound-theme-freedesktop-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f08e0414443f3a47bc433a69a7226d2b9383bc7c64e0711e8a605bd761ac69ea052a6db7f0037d88fbf0900efddaae6466ca96391eb71295ee1d0edbd0364621 sound-theme-freedesktop-0.8.tar.bz2" diff --git a/user/spectacle/APKBUILD b/user/spectacle/APKBUILD index 4d0da18bc..e680c02f3 100644 --- a/user/spectacle/APKBUILD +++ b/user/spectacle/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=spectacle -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Application for capturing desktop screenshots" url="https://www.kde.org/applications/graphics/spectacle/" @@ -12,7 +12,7 @@ makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kcoreaddons-dev kwidgetsaddons-dev kdbusaddons-dev knotifications-dev kconfig-dev ki18n-dev kio-dev kxmlgui-dev kwindowsystem-dev python3 kdoctools-dev kdeclarative-dev xcb-util-image-dev xcb-util-cursor-dev - libxcb-dev xcb-util-renderutil-dev knewstuff-dev" + libxcb-dev xcb-util-renderutil-dev knewstuff-dev libkipi-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/spectacle-$pkgver.tar.xz" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="edf6f5439af917f6beb8d6063b8d7b1567207f3e84b8e07e2cbcd0c25ced4adf58db2b6ce9794a7dd3c31ff6b31c896df92705d01305b25d9164876605be5a54 spectacle-18.08.3.tar.xz" +sha512sums="4a201c36b9b2c7ec576915a2b71459d79b6528d508ea7b51e243010e98dc00864a5bfc08a91de2b935b8283c1eca87a980b3a680176ff3a4ca7a620e268e865c spectacle-18.12.2.tar.xz" diff --git a/user/speech-dispatcher/APKBUILD b/user/speech-dispatcher/APKBUILD new file mode 100644 index 000000000..b35da35bd --- /dev/null +++ b/user/speech-dispatcher/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=speech-dispatcher +pkgver=0.8.8 +pkgrel=0 +pkgdesc="High-level interface to speech synthesis libraries" +url="https://freebsoft.org/speechd" +arch="all" +license="LGPL-2.1-only AND (GPL-2.0+ AND LGPL-2.1+) AND LGPL-2.1+ AND GPL-2.0+" +depends="flite" +makedepends="alsa-lib-dev dotconf-dev flite-dev glib-dev intltool + libsndfile-dev pulseaudio-dev" +subpackages="$pkgname-dev $pkgname-doc" +source="https://freebsoft.org/pub/projects/speechd/speech-dispatcher-$pkgver.tar.gz" + +build() { + cd "$builddir" + LIBS="-lasound" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7c7b9bf9b9ce541e790b5ae396cb614616c6b3883e75c0258603e91bf679850e3d63a6251daa3a1819b30d7518e3f552c83fe87b006274ffe1aa0f7e19c0b99b speech-dispatcher-0.8.8.tar.gz" diff --git a/user/spleen/APKBUILD b/user/spleen/APKBUILD new file mode 100644 index 000000000..add08cb24 --- /dev/null +++ b/user/spleen/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=spleen +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Monospace bitmap typeface from OpenBSD" +url="https://www.cambus.net/spleen-monospaced-bitmap-fonts/" +arch="noarch" +options="!check" +license="BSD-2-Clause" +depends="fontconfig mkfontdir mkfontscale" +makedepends="" +subpackages="" +source="https://github.com/fcambus/spleen/releases/download/$pkgver/spleen-$pkgver.tar.gz" + +package() { + cd "$builddir" + local _font + for _font in *.pcf; do + gzip -9 $_font + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/misc/ $_font.gz + done +} + +sha512sums="e97245e3a7f176e1160900ebb0390165184f2f298ab210c5b1a870ed3c556a35ef0c6d7aeadf129c1f850ed060718ed07d4e27b3f93873f8b808b9610925c880 spleen-1.0.4.tar.gz" diff --git a/user/step/APKBUILD b/user/step/APKBUILD index 05e7124f6..7801024d9 100644 --- a/user/step/APKBUILD +++ b/user/step/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=step -pkgver=18.08.3 +pkgver=18.12.2 pkgrel=0 pkgdesc="Interactive physics simulation" url="https://www.kde.org/applications/education/step/" @@ -10,7 +10,8 @@ license="GPL-2.0-only" depends="" makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev kdoctools-dev qt5-qtsvg-dev kcrash-dev khtml-dev kconfig-dev eigen-dev - kdelibs4support-dev knewstuff-dev kplotting-dev gsl-dev" + kdelibs4support-dev knewstuff-dev kplotting-dev gsl-dev + libqalculate-dev" subpackages="$pkgname-doc $pkgname-lang" source="https://download.kde.org/stable/applications/$pkgver/src/step-$pkgver.tar.xz" @@ -41,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e9d6af9c9aecba86ba751914d4c1ac18b59da8d5b19ccc45d75461bf63a7730c303ddc0289187304891ed589ee5fcf9504edcc326f4e333e2fd6be391a1b6f9d step-18.08.3.tar.xz" +sha512sums="e162f9b3a436507ee3c9971df67106b814015d1b8035fb4ab422834d2a72e81ef35eae7fadef55c7b7024cb215fd5752f384cbf718cdb43a3f6f31971641f47f step-18.12.2.tar.xz" diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD new file mode 100644 index 000000000..3d9a96a68 --- /dev/null +++ b/user/subversion/APKBUILD @@ -0,0 +1,58 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=subversion +pkgver=1.10.4 +pkgrel=0 +pkgdesc="Version control system from 2000" +url="https://subversion.apache.org/" +arch="all" +license="Apache-2.0" +depends="" +depends_dev="apr-dev apr-util-dev linux-headers" +makedepends="apr-dev apr-util-dev cyrus-sasl-dev db-dev dbus-dev file-dev + kdelibs4support-dev kwallet-dev libsecret-dev lz4-dev openssl-dev + serf-dev sqlite-dev utf8proc-dev zlib-dev" +subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet + $pkgname-lang" +source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2 + python3-bang.patch + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --with-kwallet + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" -j1 install +} + +gnome() { + pkgdesc="$pkgdesc (GNOME Keychain integration)" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libsvn_auth_gnome* "$subpkgdir"/usr/lib/ +} + +kwallet() { + pkgdesc="$pkgdesc (KDE Wallet integration)" + install_if="$pkgname=$pkgver-r$pkgrel kwallet" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libsvn_auth_kwallet* "$subpkgdir"/usr/lib/ +} + +sha512sums="c44a4a4a9533cd4f4cb6ddbc3ce98585a96da6c8e75497d087034b52f899797bb0972dfc0e79db99e81149e59e7fa765398c6ad35eba64f11f4ae9c3b3537434 subversion-1.10.4.tar.bz2 +1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a python3-bang.patch" diff --git a/user/subversion/python3-bang.patch b/user/subversion/python3-bang.patch new file mode 100644 index 000000000..fa92ff098 --- /dev/null +++ b/user/subversion/python3-bang.patch @@ -0,0 +1,8 @@ +--- subversion-1.10.4/subversion/tests/cmdline/svneditor.py.old 2010-02-22 19:47:55.000000000 +0000 ++++ subversion-1.10.4/subversion/tests/cmdline/svneditor.py 2019-01-23 23:08:14.830000000 +0000 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # + # svneditor.py: a mock $SVN_EDITOR for the Subversion test suite + # diff --git a/user/sword/APKBUILD b/user/sword/APKBUILD new file mode 100644 index 000000000..db3e5574f --- /dev/null +++ b/user/sword/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=sword +pkgver=1.8.1 +pkgrel=0 +pkgdesc="Cross-platform library for accessing and searching OSIS books" +url="http://www.crosswire.org/sword/index.jsp" +arch="all" +license="GPL-2.0-only AND LGPL-2.1+ AND zlib" +depends="" +makedepends="clucene-dev curl-dev icu-dev zlib-dev" +subpackages="$pkgname-dev" +source="http://crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-$pkgver.tar.gz" + +build() { + cd "$builddir" + CPPFLAGS="$CPPFLAGS -DU_USING_ICU_NAMESPACE" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install_config +} + +sha512sums="5c08c070ea0c86b7d929bbf94c89730eb5a487986deb9edf01c08d1710356aecd1ab3bde4437a778e5fc1ceb05b63287612ec6161381c0986a36344c27d2ab36 sword-1.8.1.tar.gz" diff --git a/user/syntax-highlighting/APKBUILD b/user/syntax-highlighting/APKBUILD index 247931bfc..a50500eb3 100644 --- a/user/syntax-highlighting/APKBUILD +++ b/user/syntax-highlighting/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=syntax-highlighting -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="Framework for rendering programming code with formatting" url="https://www.kde.org/" @@ -42,4 +42,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="8d11159b13b610026a66959db86277dbffa7ebcffcd94554fb6d3a643f5f6e70242c8b9674ee3a8bbfc54f3458059cb48b806ad4a86c8fd4c198003b0be9ea63 syntax-highlighting-5.52.0.tar.xz" +sha512sums="b789db79a75c5bddcabd2e18e04122c91f096df190dee891b6c3441ea79feeb1aee683dda3fb81663cbb0f3a6d16cee52c51664b28bb9e0fe42c70af2c685eae syntax-highlighting-5.54.0.tar.xz" diff --git a/user/talloc/APKBUILD b/user/talloc/APKBUILD new file mode 100644 index 000000000..82ba9d682 --- /dev/null +++ b/user/talloc/APKBUILD @@ -0,0 +1,53 @@ +# Contributor: William Pitcock <nenolod@dereferenced.org> +# Maintainer: Max Rees <maxcrees@me.com> +pkgname=talloc +pkgver=2.1.15 +pkgrel=0 +pkgdesc="Memory pool management library" +url="https://talloc.samba.org" +arch="all" +license="LGPL-3.0+ AND GPL-3.0+ AND ISC AND LGPL-2.1+ AND BSD-3-Clause AND PostgreSQL" +replaces="samba-common" +depends="" +makedepends="docbook-xsl libxslt python3-dev" +subpackages="$pkgname-dev py3-$pkgname:py3 $pkgname-doc" +source="https://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz + waf-location.patch" + +build() { + cd "$builddir" + PYTHON=python3 ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --disable-rpath \ + --disable-rpath-install + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +py3() { + pkgdesc="Python 3 binding for libtalloc" + + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libpytalloc-util.cpython* \ + "$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/ +} + +sha512sums="41896f8877e9a52e70b9881c41667dc52d7c1b03c3b248020fd909b794a4c5a4addee3eb944aa80ecfa3b03e6e5e1f67a62b5f3a5dcdc412b3e975352057ff40 talloc-2.1.15.tar.gz +d19553fae679b5db10ab77a86f9fa0525ccba37a3ef30e530cd96245ee5fc94d4570079bbfe0271c32fbc84a3556c4bf86cc1cab6ffb61863cbce3f5a911efec waf-location.patch" diff --git a/user/talloc/waf-location.patch b/user/talloc/waf-location.patch new file mode 100644 index 000000000..a5ca47f44 --- /dev/null +++ b/user/talloc/waf-location.patch @@ -0,0 +1,10 @@ +--- talloc-2.1.15/Makefile 2019-01-14 17:24:45.000000000 -0500 ++++ talloc-2.1.15/Makefile 2019-01-27 22:57:15.919981283 -0500 +@@ -1,6 +1,6 @@ + # simple makefile wrapper to run waf + +-WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf ++WAF_BINARY=$(PYTHON) buildtools/bin/waf + WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) + + all: diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD index 9d69ce148..0e8d933fb 100644 --- a/user/tellico/APKBUILD +++ b/user/tellico/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=tellico pkgver=3.1.3 -pkgrel=0 +pkgrel=1 pkgdesc="Collection manager" url="http://tellico-project.org/" arch="all" diff --git a/user/terminus-font/APKBUILD b/user/terminus-font/APKBUILD index 0020705e8..10ebdd481 100644 --- a/user/terminus-font/APKBUILD +++ b/user/terminus-font/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=terminus-font pkgver=4.46 -pkgrel=0 +pkgrel=1 pkgdesc="Monospace bitmap font (for X11 and console)" url="http://terminus-font.sourceforge.net/" # No HTTPS arch="noarch" @@ -17,7 +17,7 @@ build() { ./configure \ --prefix=/usr \ --psfdir=/usr/share/consolefonts \ - --x11dir=/usr/share/fonts/misc + --x11dir=/usr/share/fonts/X11/misc make } diff --git a/user/threadweaver/APKBUILD b/user/threadweaver/APKBUILD index fba05821e..91ae58c82 100644 --- a/user/threadweaver/APKBUILD +++ b/user/threadweaver/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=threadweaver -pkgver=5.52.0 +pkgver=5.54.0 pkgrel=0 pkgdesc="High-level threading framework" url="https://www.kde.org/" @@ -41,4 +41,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="a798369463f7108e679e2c8e02cb6096eab94f4d62f299846a89ec47fc35392e4b0841f7f5974400ab3f3af1d2ada06b55b76e3f212c907a73036226e7110724 threadweaver-5.52.0.tar.xz" +sha512sums="aaea9474d1015748600c97ec18d2cac888b468ce6fe66e9c7c8ca4f0a176795839ad74df2a5292bd4ba6004ed6f563825d3be00f87fd56124de0e8765e11c842 threadweaver-5.54.0.tar.xz" diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD index b11ee1106..2cc4590c0 100644 --- a/user/thunar/APKBUILD +++ b/user/thunar/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=thunar -pkgver=1.8.2 +pkgver=1.8.4 pkgrel=0 pkgdesc="File manager for the XFCE desktop environment" url="https://xfce.org" @@ -37,4 +37,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="c770fae8b6e5e0e42148ed2b9777afba5159783e5fc716eba1e0499b5390684f386eb575f1a608814bc118bbf05ede34c6737e28c06470c4d01717b579308ec9 Thunar-1.8.2.tar.bz2" +sha512sums="886c0789aa19c2ab2ef34892c4afd09c857585b4796140ea3c84ccb9e1e1ca2935cf7e3a760a6ca8d8c68a5866663412500b4779878c7f48c9365c3ac7bf0eec Thunar-1.8.4.tar.bz2" diff --git a/user/tigervnc/APKBUILD b/user/tigervnc/APKBUILD index 9b88fe183..2d78b6150 100644 --- a/user/tigervnc/APKBUILD +++ b/user/tigervnc/APKBUILD @@ -4,7 +4,7 @@ pkgname=tigervnc pkgver=1.9.0 pkgrel=1 pkgdesc="High-performance, platform-neutral VNC remote desktop application" -url="http://tigervnc.org/" +url="https://tigervnc.org/" arch="all" options="!check" # No test suite. license="GPL-2.0" diff --git a/user/tlp/APKBUILD b/user/tlp/APKBUILD index dd34fe5cc..54f478361 100644 --- a/user/tlp/APKBUILD +++ b/user/tlp/APKBUILD @@ -5,7 +5,7 @@ _pkgname=TLP pkgver=1.1 pkgrel=0 pkgdesc="Linux Advanced Power Management" -url="http://linrunner.de/en/tlp/tlp.html" +url="https://linrunner.de/en/tlp/tlp.html" arch="noarch" options="!check" # No test suite. license="GPL-2.0+ AND GPL-3.0+" diff --git a/user/transset/APKBUILD b/user/transset/APKBUILD new file mode 100644 index 000000000..8b063867c --- /dev/null +++ b/user/transset/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=transset +pkgver=1.0.2 +pkgrel=0 +pkgdesc="Transparency / opacity manipulation for X11 windows" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/transset-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f7a658cae70e211a0455420efbfacee0f3032821d94e7a80ec6db32ced716c1ce013f38713915505998071c312cedd1bad08575dbadfbbeb94361b048623f874 transset-1.0.2.tar.bz2" diff --git a/user/trojita/APKBUILD b/user/trojita/APKBUILD index 2c92fc0fd..429226f42 100644 --- a/user/trojita/APKBUILD +++ b/user/trojita/APKBUILD @@ -4,7 +4,7 @@ pkgname=trojita pkgver=0.7 pkgrel=0 pkgdesc="Qt-based IMAP email client" -url="https://trojita.flaska.net/" +url="http://trojita.flaska.net/" arch="all" options="!check" license="(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1 WITH Nokia-Qt-exception-1.1 OR GPL-3.0-only) AND BSD-3-Clause AND GPL-2.0-only AND GPL-2.0+ AND LGPL-2.0-only AND LGPL-2.0+ AND LGPL-2.1+" diff --git a/user/ttc-iosevka/APKBUILD b/user/ttc-iosevka/APKBUILD new file mode 100644 index 000000000..65708fe74 --- /dev/null +++ b/user/ttc-iosevka/APKBUILD @@ -0,0 +1,24 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ttc-iosevka +pkgver=2.0.2 +pkgrel=0 +pkgdesc="Monospace sans-serif typeface" +url="http://typeof.net/Iosevka/" +arch="noarch" +options="!check" # No test suite. +license="OFL-1.1" +depends="fontconfig" +makedepends="" +subpackages="" +source="https://github.com/be5invis/Iosevka/releases/download/v2.0.2/ttc-iosevka-$pkgver.zip + https://github.com/be5invis/Iosevka/releases/download/v2.0.2/ttc-iosevka-slab-$pkgver.zip" +builddir="$srcdir" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttc +} + +sha512sums="8dbb60b94ade9212a7dbcfaf3a4dfba3f7d148ad78cf6f658ec3d471a799b172815ff43a6fe4e3916e2d0790c9097d3d452e56ded052f7c9e1fd0d69af8c6bd4 ttc-iosevka-2.0.2.zip +92baa82979901b895d8038b020a47697b749e9600422236f02ad93381c8af8efb16978798bec38edeed0a8ad9a10f43f4879702936c885d8c21b700cd8f6e3cf ttc-iosevka-slab-2.0.2.zip" diff --git a/user/ttf-alee/APKBUILD b/user/ttf-alee/APKBUILD new file mode 100644 index 000000000..658060518 --- /dev/null +++ b/user/ttf-alee/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ttf-alee +pkgver=13 +pkgrel=0 +pkgdesc="Hangul fonts" +url=" " +arch="noarch" +options="!check" # No test suite. +license="Artistic-1.0-cl8" +depends="fontconfig" +makedepends="" +subpackages="" +source="http://turul.canonical.com/pool/main/t/ttf-alee/ttf-alee_$pkgver.tar.gz" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF *.ttf +} + +sha512sums="2f72067ccb3264c5847639d9b9db4c820ad65bf2b2bfef710fbc42463e4b091dedc004281d05694a92680fde01c56edeb40ca78cd2a659533e22b17bd14b4b2c ttf-alee_13.tar.gz" diff --git a/user/ttf-freefont/APKBUILD b/user/ttf-freefont/APKBUILD index 532f064a7..d4a67e4a0 100644 --- a/user/ttf-freefont/APKBUILD +++ b/user/ttf-freefont/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: pkgname=ttf-freefont pkgver=20120503 -pkgrel=0 +pkgrel=1 pkgdesc="High-quality TrueType fonts covering the UCS character set" url="http://www.nongnu.org/freefont/" arch="noarch" @@ -14,8 +14,8 @@ builddir="$srcdir/freefont-$pkgver" package() { cd "$builddir" - install -d "$pkgdir/usr/share/fonts/TTF" - install -m644 *.ttf "$pkgdir/usr/share/fonts/TTF/" + install -d "$pkgdir/usr/share/fonts/$pkgname/" + install -m644 *.ttf "$pkgdir/usr/share/fonts/$pkgname/" # Licensing exception is discussed in README in pkgver==20120503 install -Dm644 README "$pkgdir/usr/share/licenses/$pkgname/README" } diff --git a/user/ttf-noto-cjk/APKBUILD b/user/ttf-noto-cjk/APKBUILD index cf8b77938..a5d7c3034 100644 --- a/user/ttf-noto-cjk/APKBUILD +++ b/user/ttf-noto-cjk/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Max Rees <maxcrees@me.com> pkgname=ttf-noto-cjk pkgver=20170601 -pkgrel=0 +pkgrel=1 pkgdesc="Noto fonts for Chinese, Japanese, and Korean" url="https://www.google.com/get/noto/help/cjk/" arch="noarch" @@ -25,11 +25,11 @@ source="https://dev.sick.bike/$pkgname-$pkgver.tar.xz " package() { - mkdir -p "$pkgdir"/usr/share/fonts/truetype/"$pkgname" \ + mkdir -p "$pkgdir"/usr/share/fonts/"$pkgname" \ "$pkgdir"/etc/fonts/conf.d \ "$pkgdir"/etc/fonts/conf.avail - cp "$builddir"/*.ttc "$pkgdir"/usr/share/fonts/truetype/"$pkgname" + cp "$builddir"/*.ttc "$pkgdir"/usr/share/fonts/"$pkgname" cp "$srcdir"/90-ttf-noto-cjk.conf "$pkgdir"/etc/fonts/conf.avail cd "$pkgdir"/etc/fonts/conf.d diff --git a/user/ttf-noto/APKBUILD b/user/ttf-noto/APKBUILD index 3551fe7fe..21c83d972 100644 --- a/user/ttf-noto/APKBUILD +++ b/user/ttf-noto/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=ttf-noto pkgver=20170403 -pkgrel=1 +pkgrel=2 pkgdesc="Noto font family" url="https://www.google.com/get/noto/" arch="noarch" @@ -21,9 +21,9 @@ source="https://dev.gentoo.org/~floppym/dist/noto-$pkgver.tar.xz builddir="$srcdir"/noto-$pkgver package() { - mkdir -p "$pkgdir"/usr/share/fonts/truetype/ + mkdir -p "$pkgdir"/usr/share/fonts/$pkgname/ mkdir -p "$pkgdir"/etc/fonts/conf.d/ - cp "$builddir"/*.ttf "$pkgdir"/usr/share/fonts/truetype/ + cp "$builddir"/*.ttf "$pkgdir"/usr/share/fonts/$pkgname/ cp "$srcdir"/*.conf "$pkgdir"/etc/fonts/conf.d/ } diff --git a/user/ttf-sinhala-lklug/APKBUILD b/user/ttf-sinhala-lklug/APKBUILD new file mode 100644 index 000000000..c487c96f4 --- /dev/null +++ b/user/ttf-sinhala-lklug/APKBUILD @@ -0,0 +1,21 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=ttf-sinhala-lklug +pkgver=0.6 +pkgrel=0 +pkgdesc="Typeface for Sinhalaese script" +url="http://sinhala.sourceforge.net/" +arch="noarch" +options="!check" # No test suite. +license="GPL-2.0-only" +depends="fontconfig" +makedepends="" +subpackages="" +source="http://sinhala.sourceforge.net/files/ttf-sinhala-lklug-$pkgver.tar.gz" + +package() { + cd "$builddir" + install -m644 -Dt "$pkgdir"/usr/share/fonts/X11/TTF/ lklug.ttf +} + +sha512sums="d1b1459981f1d80acd17aa09a2171e17ad246d98e00035c9592a6c93d89423ccb20f440c3eaccb21b9bb5fae2ac8eca5458715fe8a60e7294f75f9fffe3417aa ttf-sinhala-lklug-0.6.tar.gz" diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD new file mode 100644 index 000000000..385b2bd77 --- /dev/null +++ b/user/ttf-sudo/APKBUILD @@ -0,0 +1,24 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=ttf-sudo +pkgver=0.37 +pkgrel=0 +pkgdesc="Monospaced font family for programming and console users" +url="https://www.kutilek.de/sudo-font/" +arch="noarch" +options="!check" # No tests +license="OFL-1.1" +depends="fontconfig" +makedepends="" +source="https://github.com/jenskutilek/sudo-font/releases/download/v$pkgver/sudo.zip" +builddir="$srcdir/sudo" + +package() { + cd "$builddir" + mkdir -p "$pkgdir"/usr/share/X11/TTF/${pkgname#*-} + for i in *.ttf; do + install -Dm644 "$i" "$pkgdir"/usr/share/X11/TTF/${pkgname#*-} + done +} + +sha512sums="9622d6f6aaf6724255d62b655b9bdb0fb9b67b66aa367f10df6fec5efd1d68e6da34a8b58bee04fb1d277bb225ed7bf17491e50e27a13383c7c9a79172439b4f sudo.zip" diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD new file mode 100644 index 000000000..532c7fa36 --- /dev/null +++ b/user/ttf-terminus/APKBUILD @@ -0,0 +1,24 @@ +# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=ttf-terminus +pkgver=4.47.0 +pkgrel=0 +pkgdesc="TrueType variant of Terminus Font" +url="https://files.ax86.net/terminus-ttf/" +arch="noarch" +options="!check" # No tests +license="OFL-1.1" +depends="fontconfig" +makedepends="" +source="https://files.ax86.net/terminus-ttf/files/$pkgver/terminus-ttf-$pkgver.zip" +builddir="$srcdir/terminus-ttf-$pkgver" + +package() { + cd "$builddir" + mkdir -p "$pkgdir"/usr/share/X11/TTF/${pkgname#*-} + for i in *.ttf; do + install -Dm644 "$i" "$pkgdir"/usr/share/X11/TTF/${pkgname#*-} + done +} + +sha512sums="500e0aa12223f958dd0b00d1637ee26370700f937998335d54bc94528045157c5646ff6a2b35c37b44b765d36ebaf26cbf50458819debd536b29cb393833a584 terminus-ttf-4.47.0.zip" diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD index e1cf61892..fbf615688 100644 --- a/user/tumbler/APKBUILD +++ b/user/tumbler/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=tumbler pkgver=0.2.3 -pkgrel=0 +pkgrel=1 pkgdesc="Thumbnail generation service for the XFCE desktop environment" url="https://xfce.org" arch="all" diff --git a/user/umbrello/APKBUILD b/user/umbrello/APKBUILD index d200097fa..e33337220 100644 --- a/user/umbrello/APKBUILD +++ b/user/umbrello/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=umbrello -pkgver=18.08.3 -pkgrel=1 +pkgver=18.12.2 +pkgrel=0 pkgdesc="Software modelling tool and code generator" url="https://umbrello.kde.org/" arch="all" @@ -44,5 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="2aaceb8e351e4a0a13834ce6ad1c8dd5575ea591e4c69ac080ad53798338200fa9768460ee63f7462941e372ddb9458afba8b602843c63c9cad2cee6f763d6b1 umbrello-18.08.3.tar.xz +sha512sums="b251425ef28e656d258ed6dec9fa737115c16d3fa0f663de734f2c27200c92f158cd2b22b2f2786c9bb721961feca014408d42c101f87fcaf9af8b06bfd7234b umbrello-18.12.2.tar.xz fcbe03a49d5420bf17383e5e6d4bac4377c1abfcafacea20ac37409457471537067efe3236647fb3570abfa410a4a3870b1638bb1ef880a24e6f60e2b189a562 hax.patch" diff --git a/user/unbound/APKBUILD b/user/unbound/APKBUILD new file mode 100644 index 000000000..3c6810ec3 --- /dev/null +++ b/user/unbound/APKBUILD @@ -0,0 +1,76 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +pkgname=unbound +pkgver=1.9.0 +pkgrel=0 +pkgdesc="A validating, recursive and caching DNS resolver" +url="https://unbound.net/" +arch="all" +options="!checkroot" +license="BSD-3-Clause" +depends="" +makedepends="expat-dev libevent-dev openssl-dev python3-dev swig" +subpackages="$pkgname-dev $pkgname-doc $pkgname-openrc $pkgname-python" +install="$pkgname.pre-install" +pkgusers="unbound" +pkggroups="unbound" +source="https://nlnetlabs.nl/downloads/$pkgname/$pkgname-$pkgver.tar.gz + unbound.confd + unbound.initd" + +build() { + cd "$builddir" + + # cachedb, dnscrypt and dnstap have yet unpackaged dependencies + PYTHON_VERSION=3 ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-rpath \ + --with-rootkey-file=/etc/unbound/var/root.key \ + --with-pidfile=/run/unbound.pid \ + --enable-tfo-client \ + --enable-tfo-server \ + --disable-cachedb \ + --disable-dnscrypt \ + --disable-dnstap \ + --enable-ipsecmod \ + --enable-subnet \ + --with-pthreads \ + --with-pyunbound \ + --without-pythonmodule \ + --with-ssl=/usr \ + --with-libevent=/usr \ + --with-libexpat=/usr + make +} + +check() { + cd "$builddir" + sed -i -e 's/ELAPSED/ELAPSE/' testdata/auth_xfr_notify.rpl # Bug in unbound-1.8.3 test suite + make test +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install + install -do unbound "$pkgdir/etc/unbound/var" +} + +openrc() { + default_openrc + install -Dm755 "$srcdir/unbound.initd" "$subpkgdir/etc/init.d/unbound" + install -Dm644 "$srcdir/unbound.confd" "$subpkgdir/etc/conf.d/unbound" +} + +python() { + pkgdesc="$pkgdesc (Python bindings)" + + install -d "$subpkgdir/usr/lib" + mv "$pkgdir/usr/lib/python"* "$subpkgdir" +} + +sha512sums="7dfa8e078507fc24a2d0938eea590389453bacfcac023f1a41af19350ea1f7b87d0c82d7eead121a11068921292a96865e177274ff27ed8b8868445f80f7baf6 unbound-1.9.0.tar.gz +de9dc269553f5449c1757690c2a8a3b9f228964f5672d721cfdbc29e6fab8954907fa4fa3761dd6f705b3ccd2f729cc6e2fe870107feb68cca611589f8306b94 unbound.confd +6627cbcbcb4e04f596e7e0ffdbf80ceb54cdb59144cb89896e53503dfb41b99fd77d8b85d05e6670f77023b6eafec8885b00c0c8e4e34e3e638c52c037a7985e unbound.initd" diff --git a/user/unbound/unbound.confd b/user/unbound/unbound.confd new file mode 100644 index 000000000..ce468e95c --- /dev/null +++ b/user/unbound/unbound.confd @@ -0,0 +1,5 @@ +# +# Specify daemon options here. +# + +unbound_opts="" diff --git a/user/unbound/unbound.initd b/user/unbound/unbound.initd new file mode 100644 index 000000000..0ffc19aba --- /dev/null +++ b/user/unbound/unbound.initd @@ -0,0 +1,16 @@ +#!/sbin/openrc-run + +name="unbound" +command="/usr/sbin/unbound" +command_args="${unbound_opts}" +pidfile="/run/unbound.pid" +extra_started_commands="reload" + +depend() { + use logger net + provide dns +} + +reload() { + start-stop-daemon --signal HUP --pidfile "${pidfile}" +} diff --git a/user/unbound/unbound.pre-install b/user/unbound/unbound.pre-install new file mode 100755 index 000000000..9f203cb08 --- /dev/null +++ b/user/unbound/unbound.pre-install @@ -0,0 +1,5 @@ +#!/bin/sh + +groupadd -r unbound 2>/dev/null +useradd -M -N -g unbound -r -s /sbin/nologin -d /etc/unbound unbound 2>/dev/null +exit 0 diff --git a/user/uptimed/APKBUILD b/user/uptimed/APKBUILD new file mode 100644 index 000000000..ace7b6884 --- /dev/null +++ b/user/uptimed/APKBUILD @@ -0,0 +1,39 @@ +# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org> +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> +pkgname=uptimed +pkgver=0.4.1 +pkgrel=0 +pkgdesc='System uptime record daemon' +arch="all" +options="!check" # No tests +url="https://github.com/rpodgorny/uptimed" +license="GPL-2.0-only" +subpackages="$pkgname-doc $pkgname-openrc" +makedepends="autoconf automake libtool" +source="$pkgname-$pkgver.tar.gz::https://github.com/rpodgorny/uptimed/archive/v$pkgver.tar.gz + uptimed.init" + +build() { + cd "$builddir" + autoreconf -vif + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man + make +} + +package() { + cd "$builddir" + make install DESTDIR="$pkgdir" + mv "$pkgdir"/etc/uptimed.conf-dist \ + "$pkgdir"/etc/uptimed.conf + install -Dm755 "$srcdir"/uptimed.init \ + "$pkgdir"/etc/init.d/uptimed +} + +sha512sums="5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a uptimed-0.4.1.tar.gz +0884e9f5ace5a69b8eea4401c7f3b84f0a434f0ceb2b920919e83f318eb9e54182932de174cf1666ddddbab84c146781f3dd78571e80cc274963a72bf4f53a6b uptimed.init" diff --git a/user/uptimed/uptimed.init b/user/uptimed/uptimed.init new file mode 100644 index 000000000..deba54128 --- /dev/null +++ b/user/uptimed/uptimed.init @@ -0,0 +1,12 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="uptimed - a daemon to record uptime records" +pidfile="/var/run/uptimed/uptimed.pid" +command="/usr/sbin/uptimed" +command_args="-p ${pidfile}" + +start_pre() { + uptimed -b +} diff --git a/user/user-manager/APKBUILD b/user/user-manager/APKBUILD new file mode 100644 index 000000000..7864d7720 --- /dev/null +++ b/user/user-manager/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=user-manager +pkgver=5.12.7 +pkgrel=0 +pkgdesc="Manage user accounts from KDE" +url="https://www.KDE.org/" +arch="all" +license="GPL-2.0+ AND LGPL-2.0+ AND GPL-2.0-only" +depends="accountsservice" +makedepends="cmake extra-cmake-modules qt5-qtbase-dev kauth-dev kcmutils-dev + kconfig-dev kconfigwidgets-dev kcoreaddons-dev ki18n-dev kiconthemes-dev + kio-dev kwidgetsaddons-dev libpwquality-dev" +subpackages="$pkgname-lang" +source="https://download.kde.org/stable/plasma/$pkgver/user-manager-$pkgver.tar.xz" + +build() { + cd "$builddir" + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} + make +} + +check() { + cd "$builddir" + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="286b4adc7ff01c25f1f32bc64e9f119aa693d74e0468e575c792d5357df6066c18de233eb78acd5ed4288518902461ffa7408af8d559e8b5f4081893bdec7f8f user-manager-5.12.7.tar.xz" diff --git a/user/utf8proc/APKBUILD b/user/utf8proc/APKBUILD new file mode 100644 index 000000000..8be033ef7 --- /dev/null +++ b/user/utf8proc/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=utf8proc +pkgver=2.2.0 +pkgrel=0 +pkgdesc="C library for processing UTF-8 data" +url=" " +arch="all" +license="MIT AND Unicode-DFS-2016" +depends="" +makedepends="" +subpackages="$pkgname-dev" +source="utf8proc-$pkgver.tar.gz::https://github.com/JuliaStrings/utf8proc/archive/v$pkgver.tar.gz" + +prepare() { + cd "$builddir" + default_prepare + mkdir build +} + +build() { + cd "$builddir"/build + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + .. + make +} + +check() { + cd "$builddir"/build + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + cd "$builddir"/build + make DESTDIR="$pkgdir" install +} + +sha512sums="ae19287e33bc4807475063963557c4d1d2f7d95577d61882ba8df380883662860eeb868e7391ac1b8111614ca2c1855f631925ade6eaa827d07d28cc4cdbab9c utf8proc-2.2.0.tar.gz" diff --git a/user/uwsgi/APKBUILD b/user/uwsgi/APKBUILD new file mode 100644 index 000000000..3ec869b6e --- /dev/null +++ b/user/uwsgi/APKBUILD @@ -0,0 +1,90 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=uwsgi +pkgver=2.0.17.1 +pkgrel=0 +pkgdesc="Web application server" +url="https://projects.unbit.it/uwsgi" +arch="all" +options="!check" # Requires unpackaged `cppcheck`. +license="GPL-2.0-only" +depends="" +makedepends="libxml2-dev openssl-dev zlib-dev + perl-dev php7-dev php7-embed python3-dev ruby-dev" +subpackages="" +# Keep psgi at the end for the CFLAGS hack. +_plugins="asyncio cgi corerouter http logfile php python rack psgi" +for _plugin in $_plugins; do + subpackages="$subpackages $pkgname-$_plugin" +done +source="https://projects.unbit.it/downloads/uwsgi-$pkgver.tar.gz" + +build() { + cd "$builddir" + + echo 'plugin_dir = /usr/lib/uwsgi/plugins' >> buildconf/core.ini + echo 'plugin_build_dir = .' >> buildconf/core.ini + + python3 uwsgiconfig.py --build core + + for _plugin in $_plugins; do + [ $_plugin != "psgi" ] || export CFLAGS="-D_GNU_SOURCE -include /usr/include/setjmp.h" + python3 uwsgiconfig.py --plugin plugins/$_plugin core + done +} + +check() { + cd "$builddir" + python3 uwsgiconfig.py --check +} + +package() { + cd "$builddir" + install -D -m755 "$builddir"/uwsgi "$pkgdir"/usr/bin/uwsgi +} + +_plugpack() { + pkgdesc="$pkgdesc ($2 plugin)" + depends="" + + install -D -m755 "$builddir"/$1_plugin.so \ + "$subpkgdir"/usr/lib/uwsgi/plugins/$1_plugin.so +} + +asyncio() { + _plugpack asyncio "Python asyncio" +} + +cgi() { + _plugpack cgi "CGI" +} + +corerouter() { + _plugpack corerouter "Core router" +} + +http() { + _plugpack http "HTTP server" +} + +logfile() { + _plugpack logfile "Log file" +} + +php() { + _plugpack php "PHP" +} + +psgi() { + _plugpack psgi "PSGI" +} + +python() { + _plugpack python "Python 3" +} + +rack() { + _plugpack rack "Ruby Rack" +} + +sha512sums="10d357961fde3a3f5f8e77986cc647313f95a33243e24c2afc482fce21df68a8ae48f90e7b5b76d7edc3cf8fd474d99823d6d60ef7477349abc65a319222f11b uwsgi-2.0.17.1.tar.gz" diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD index b9422dc0a..b48ad70e7 100644 --- a/user/vala/APKBUILD +++ b/user/vala/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=vala -pkgver=0.42.3 +pkgver=0.42.5 pkgrel=0 pkgdesc="Compiler for the Vala programming language" url="https://wiki.gnome.org/Projects/Vala" @@ -33,4 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="89dc3d208af3c3ab49cf9706187a6df9db7b7cd5ae033f733324532eed48d5f70cd150e9f07755376e0cc8b284a9bb380d7bd44a6bf669e38ca7826dbf8afb23 vala-0.42.3.tar.xz" +sha512sums="1862307eab505e500326f84e267648f084926629f6b45b9abb6a90a20a7aa6dd2fc305962b9028c5ca7becb574573cca43fbecd9294b782d9942e71639a32aa9 vala-0.42.5.tar.xz" diff --git a/user/valgrind/APKBUILD b/user/valgrind/APKBUILD index d79ba75c4..fc710b4b2 100644 --- a/user/valgrind/APKBUILD +++ b/user/valgrind/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=valgrind pkgver=3.13.0 -pkgrel=4 +pkgrel=5 pkgdesc="A tool to help find memory-management problems in programs" url="http://valgrind.org/" arch="all" @@ -15,10 +15,11 @@ makedepends="autoconf automake libtool bash perl cmd:which" options="!strip !check" subpackages="$pkgname-dev $pkgname-doc" source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2 - uclibc.patch - arm.patch 0001-Ensure-ELFv2-is-supported-on-PPC64.patch + arm.patch + realloc.patch suppressions.patch + uclibc.patch " prepare() { @@ -65,7 +66,8 @@ package() { } sha512sums="34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009 valgrind-3.13.0.tar.bz2 -d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d uclibc.patch -9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe arm.patch 71afb12748f69f0976a299c65572818b70cbce5d04f230a49a50f114351d8083c59a9e197cefbcb9145806797ff4d1d54488f50342b680c9a2b76e4a7f7cf305 0001-Ensure-ELFv2-is-supported-on-PPC64.patch -d011b2769d35ca3206967e6dac9f3fb24a6496e5bbfdc73342382245c89375b09d6948b10ba3cf8aa0050c79c0dd13b75764aec0ec5c6ac479fa930941067747 suppressions.patch" +9ee297d1b2b86891584443ad0caadc4977e1447979611ccf1cc55dbee61911b0b063bc4ad936d86c451cedae410cb3219b5a088b2ad0aa17df182d564fe36cfe arm.patch +57086a768f3876b26b0e507bc159a73f0955f03d5af8cc30e21103e348ca67f2e58b5555a5a97f299751c6602692ad43d8346bb68a80917d740fb4d65bba9665 realloc.patch +d011b2769d35ca3206967e6dac9f3fb24a6496e5bbfdc73342382245c89375b09d6948b10ba3cf8aa0050c79c0dd13b75764aec0ec5c6ac479fa930941067747 suppressions.patch +d59a10db9037e120df2ee94a103402ca95a79abee9d8be63e4e1bca29c82dca775cc402a79b854ec11a2160a4d2da202c237369418e221d1925267ea2613fd5d uclibc.patch" diff --git a/user/valgrind/realloc.patch b/user/valgrind/realloc.patch new file mode 100644 index 000000000..d0eb795b8 --- /dev/null +++ b/user/valgrind/realloc.patch @@ -0,0 +1,24 @@ +--- valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c ++++ valgrind-3.13.0/coregrind/m_replacemalloc/vg_replace_malloc.c +@@ -765,13 +765,15 @@ static void init(void); + DO_INIT; \ + MALLOC_TRACE("realloc(%p,%llu)", ptrV, (ULong)new_size ); \ + \ +- if (ptrV == NULL) \ +- /* We need to call a malloc-like function; so let's use \ +- one which we know exists. */ \ +- return VG_REPLACE_FUNCTION_EZU(10010,VG_Z_LIBC_SONAME,malloc) \ +- (new_size); \ ++ if (ptrV == NULL) { \ ++ TRIGGER_MEMCHECK_ERROR_IF_UNDEFINED(new_size); \ ++ v = (void*)VALGRIND_NON_SIMD_CALL1( info.tl_malloc, new_size ); \ ++ MALLOC_TRACE(" = %p\n", v ); \ ++ return v; \ ++ } \ + if (new_size <= 0) { \ +- VG_REPLACE_FUNCTION_EZU(10050,VG_Z_LIBC_SONAME,free)(ptrV); \ ++ if (ptrV != NULL) \ ++ VALGRIND_NON_SIMD_CALL1( info.tl_free, ptrV ); \ + MALLOC_TRACE(" = 0\n"); \ + return NULL; \ + } \ diff --git a/user/viewres/APKBUILD b/user/viewres/APKBUILD new file mode 100644 index 000000000..0185ca839 --- /dev/null +++ b/user/viewres/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=viewres +pkgver=1.0.5 +pkgrel=0 +pkgdesc="View widget class trees in software using Athena widgets (Xaw)" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/viewres-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="fe573e9b5ae679b65eee95733cbea20c86c92089c3a2dadfe977bc9c54d1f58c5e5f4663e51a1cf206543a43592b3a3c266da1769279f08be85c66b0aa5b0f7f viewres-1.0.5.tar.bz2" diff --git a/user/vlc/APKBUILD b/user/vlc/APKBUILD index 1d8f2de92..a06e293ed 100644 --- a/user/vlc/APKBUILD +++ b/user/vlc/APKBUILD @@ -2,8 +2,8 @@ # Contributor: Leonardo Arena <rnalrd@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=vlc -pkgver=3.0.4 -pkgrel=2 +pkgver=3.0.6 +pkgrel=1 pkgdesc="Multi-platform MPEG, VCD/DVD, and DivX player" triggers="vlc-libs.trigger=/usr/lib/vlc/plugins" pkgusers="vlc" @@ -51,17 +51,15 @@ makedepends="autoconf automake bison eudev-dev flex libarchive-dev xdg-utils a52dec-dev alsa-lib-dev faad2-dev ffmpeg-dev flac-dev fluidsynth-dev - libaacs-dev libavc1394-dev libbluray-dev>=0.2.1 libbluray-dev<20100000 - libcddb-dev libdc1394-dev>=2.1.0 libdca-dev libdvbpsi-dev libdvdnav-dev - libdvdread-dev libmad-dev libmatroska-dev libmpeg2-dev libogg-dev + gstreamer-dev gst-plugins-base-dev libaacs-dev libavc1394-dev + libbluray-dev>=0.2.1 libbluray-dev<20100000 libcddb-dev libdc1394-dev + libdca-dev libdvbpsi-dev libdvdnav-dev libdvdread-dev libmad-dev + libmatroska-dev libmodplug-dev libmpeg2-dev libmtp-dev libogg-dev libraw1394-dev>=2.0.1 librsvg-dev libshout-dev libtheora-dev libva-dev - libvdpau-dev libvorbis-dev live-media-dev>=2012.01.26 - opus-dev pulseaudio-dev speex-dev speexdsp-dev taglib-dev v4l-utils-dev - x264-dev x265-dev gstreamer-dev gst-plugins-base-dev - " + libvdpau-dev libvorbis-dev live-media-dev opus-dev pulseaudio-dev + speex-dev speexdsp-dev taglib-dev v4l-utils-dev x264-dev x265-dev" source="https://get.videolan.org/vlc/$pkgver/vlc-$pkgver.tar.xz check-headless.patch - CVE-2018-19857.patch disable-sub-autodetect-fuzzy-1-test.patch endian-fix.patch fix-testing.patch @@ -114,7 +112,6 @@ build() { --enable-avcodec \ --enable-avformat \ --enable-bluray \ - --enable-cdda \ --enable-dc1394 \ --enable-dca \ --enable-dvbpsi \ @@ -298,9 +295,8 @@ plugins_video_filter() { _mv_plugins video_filter; } plugins_video_output() { _mv_plugins video_output; } plugins_visualization() { _mv_plugins visualization; } -sha512sums="55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271 vlc-3.0.4.tar.xz +sha512sums="7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52 vlc-3.0.6.tar.xz 22d80df599b8b65a5439cefbb7140af8e9530f326d54945da3769af65f37518b99ec2cc8647aafd2763324a0698280915afe043cc87e5720c4694881ed35bffa check-headless.patch -57a2b843b4b80d3887ca0141b9ea1a00752473861846a6c988553faa58650eb42cc2cd011503dce075c8a5dcabf834e449397c3cdbfdcb291ae7a41d218512da CVE-2018-19857.patch e214b407235cb3afb8bec93f20c9b42957b57e6fd3960679d3d4235e77762e03e64d03c01f00ef63d589e7c85aaad02ce6abbeeccd66b1867bc92451a5b5e9b0 disable-sub-autodetect-fuzzy-1-test.patch e063c727d952465bbea33f669db49190427521dc8e2291e9a5cbb0f5e8e879bd3ba76855e44bd4630948e30c4329d27bd928f95de20fe1050d5e839778a4d012 endian-fix.patch 63adb16b3a1927ee3de27ac339cbfbbaa346a69928c527f883259d1e03b5cb59f26a55feeda767837b448c455de584abcb53dc733b2845c0cc13621d72e7f6fd fix-testing.patch diff --git a/user/vlc/CVE-2018-19857.patch b/user/vlc/CVE-2018-19857.patch deleted file mode 100644 index a65dcef20..000000000 --- a/user/vlc/CVE-2018-19857.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0cc5ea748ee5ff7705dde61ab15dff8f58be39d0 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Sat, 1 Dec 2018 23:32:18 +0200 -Subject: [PATCH] caf: fix integer underflow - -Pointed-out-by: Hans Jerry Illikainen <hji@dyntopia.com> ---- - modules/demux/caf.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/modules/demux/caf.c b/modules/demux/caf.c -index cc312a5a30..39b381f963 100644 ---- a/modules/demux/caf.c -+++ b/modules/demux/caf.c -@@ -691,14 +691,13 @@ static int ReadKukiChunk( demux_t *p_demux, uint64_t i_size ) - demux_sys_t *p_sys = p_demux->p_sys; - const uint8_t *p_peek; - -- /* vlc_stream_Peek can't handle sizes bigger than INT32_MAX, and also p_sys->fmt.i_extra is of type 'int'*/ -- if( i_size > INT32_MAX ) -+ if( i_size > SSIZE_MAX ) - { - msg_Err( p_demux, "Magic Cookie chunk too big" ); - return VLC_EGENERIC; - } - -- if( (unsigned int)vlc_stream_Peek( p_demux->s, &p_peek, (int)i_size ) < i_size ) -+ if( vlc_stream_Peek( p_demux->s, &p_peek, i_size ) < (ssize_t)i_size ) - { - msg_Err( p_demux, "Couldn't peek extra data" ); - return VLC_EGENERIC; --- -2.11.0 - diff --git a/user/w3m/APKBUILD b/user/w3m/APKBUILD new file mode 100644 index 000000000..134acd67d --- /dev/null +++ b/user/w3m/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=w3m +pkgver=0.5.3_git20190105 +pkgrel=0 +pkgdesc="Text-based Web browser" +url="http://w3m.sourceforge.net/" +arch="all" +options="!check" # No test suite. +license="MIT AND X11" +depends="compface" +makedepends="compface-dev gc-dev gdk-pixbuf-dev glib-dev gtk+2.0-dev imlib2-dev + libbsd-dev libx11-dev ncurses-dev openssl-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="w3m-$pkgver.tar.gz::https://github.com/tats/w3m/archive/v0.5.3+git20190105.tar.gz" +builddir="$srcdir"/w3m-${pkgver/_/-} + +build() { + cd "$builddir" + LIBS="-lX11 -ltinfo" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make funcname.tab + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b63b15d0bea82f50bcaa9fc0826c2d3c265a3ad73069b4a020812f28b552cdf08618ab877280c9f3a43bd64f51b80b7a526098e6395ea121c0981a3fcd2562b4 w3m-0.5.3_git20190105.tar.gz" diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD index 6f8bb3701..b298be73a 100644 --- a/user/weechat/APKBUILD +++ b/user/weechat/APKBUILD @@ -2,8 +2,8 @@ # Contributor: zlg <zlg+adelie@zlg.space> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=weechat -pkgver=2.3 -pkgrel=1 +pkgver=2.4 +pkgrel=0 pkgdesc="Fast, light, extensible ncurses-based chat client" url="https://www.weechat.org" arch="all" @@ -16,8 +16,6 @@ checkdepends="cpputest" subpackages="$pkgname-dev $pkgname-aspell:_plugin $pkgname-lua:_plugin $pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-lang" source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz - fix-python-linking.patch - fix-unsigned-char.patch libintl-fix.patch " @@ -63,7 +61,5 @@ check() { ctest -V } -sha512sums="3315eb672d099dec041a6ece268e3efac9f766fe8273b13810c9ed6bc9129ed0db9730a027db6cdf157338472caf99d60aaf3de9b096a3c395fdf889b106aaea weechat-2.3.tar.gz -95f6d1405141421fae70288ec560a6d61f0bde1ce0bfa6e522e24a9673e699099594e83511b39e413aff28010ea1f7f1672af051ac370b152c732d6ca36a9056 fix-python-linking.patch -e9dddc914f08660c49fd3331ebdca73a3df7e165b284d8b19e0487974ec2d8d75d03cd6d07da6ba9783015ddb19d6c118b697a830dcbea13f078ca7826223370 fix-unsigned-char.patch +sha512sums="3537c3032237b0f1d103849516ccb461a29e13bf37f021af7905c75a3dc7c70fa4a76be2e8559b0299165c114d0408f3267fb74eb21a70f1661e6dac35e3bb9a weechat-2.4.tar.gz 59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca libintl-fix.patch" diff --git a/user/weechat/fix-python-linking.patch b/user/weechat/fix-python-linking.patch deleted file mode 100644 index c45d3af3a..000000000 --- a/user/weechat/fix-python-linking.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- weechat-1.9/cmake/FindPython.cmake.old 2017-06-25 03:20:52.000000000 -0500 -+++ weechat-1.9/cmake/FindPython.cmake 2017-09-24 18:04:48.181662013 -0500 -@@ -67,7 +67,7 @@ - ) - if(ENABLE_PYTHON3) - find_library(PYTHON_LIBRARY -- NAMES python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python3 python2.7 python2.6 python2.5 python -+ NAMES python3.7m python3.7 python3.6m python3.6 python3.5m python3.5 python3.4m python3.4 python3.3 python3.2 python3.1 python3.0 python3 - HINTS ${PYTHON_POSSIBLE_LIB_PATH} - ) - else() diff --git a/user/weechat/fix-unsigned-char.patch b/user/weechat/fix-unsigned-char.patch deleted file mode 100644 index d4acd1986..000000000 --- a/user/weechat/fix-unsigned-char.patch +++ /dev/null @@ -1,37 +0,0 @@ -This patch is backported from the upcoming 2.4 release. It corrects -highlighting behavior for plugins such as urlserver.py. - -See-Also: https://github.com/weechat/weechat/issues/1277 -Patch-Author: Sébastien Helleu <flashcode@flashtux.org> - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ae69ea0f..1d7738af5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,8 +27,8 @@ project(weechat C) - set(CMAKE_VERBOSE_MAKEFILE OFF) - set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) - set(CMAKE_SKIP_RPATH ON) --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration") --set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsigned-char -Wall -Wextra -Werror-implicit-function-declaration") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -Wall -Wextra -Werror-implicit-function-declaration") - - # version - execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major OUTPUT_VARIABLE VERSION_MAJOR) -diff --git a/configure.ac b/configure.ac -index d267ca10f..a0bf00078 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1330,7 +1330,7 @@ AC_DEFINE_UNQUOTED(WEECHAT_SHAREDIR, "$WEECHAT_SHAREDIR") - weechat_libdir=${libdir}/weechat - AC_SUBST(weechat_libdir) - --COMMON_CFLAGS="-Wall -Wextra -Werror-implicit-function-declaration" -+COMMON_CFLAGS="-fsigned-char -Wall -Wextra -Werror-implicit-function-declaration" - AC_MSG_CHECKING([whether we have GNU assembler]) - GAS=`as --version < /dev/null 2>/dev/null | grep GNU` - if test "$GAS"; then --- -2.19.1 - diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD new file mode 100644 index 000000000..b1801f7f1 --- /dev/null +++ b/user/wireguard-module/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +_kernelver="4.14.88-mc13" +pkgver=0.0.20190123 +pkgrel=0 +_pkgname="wireguard-module" +pkgname="$_pkgname-$_kernelver" +_pkgreal="WireGuard" +pkgdesc="Kernel module for the WireGuard VPN, built for easy-kernel" +url="https://www.wireguard.com/" +arch="all" +options="!check !dbg !strip" # no test suite +license="GPL-2.0-only" +provides="$_pkgname=$pkgver" +depends="easy-kernel-modules-$_kernelver" +makedepends="easy-kernel-src-$_kernelver" +source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz" +builddir="$srcdir/$_pkgreal-$pkgver" + +prepare() { + cd "$builddir" + sed -i -e '/depmod/d' src/Makefile # temporary hack +} + +build() { + cd "$builddir" + make -C src LDFLAGS="" KERNELDIR="/usr/src/linux-$_kernelver" module +} + +package() { + cd "$builddir" + make -C src KERNELDIR="/usr/src/linux-$_kernelver" INSTALL_MOD_PATH="$pkgdir" module-install +} + +sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59 WireGuard-0.0.20190123.tar.xz" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD new file mode 100644 index 000000000..95a0dd067 --- /dev/null +++ b/user/wireguard-tools/APKBUILD @@ -0,0 +1,46 @@ +# Contributor: Luis Ressel <aranea@aixah.de> +# Maintainer: Luis Ressel <aranea@aixah.de> +pkgname=wireguard-tools +_pkgreal=WireGuard +pkgver=0.0.20190123 +pkgrel=0 +pkgdesc="Userland tools for the WireGuard VPN" +url="https://www.wireguard.com/" +arch="all" +options="!check" # no test suite +license="GPL-2.0-only" +depends="bash iproute2" +makedepends="libmnl-dev" +subpackages="$pkgname-bash-completion:bashcomp:noarch $pkgname-doc wireguard-patch:_patch:noarch" +source="https://git.zx2c4.com/WireGuard/snapshot/$_pkgreal-$pkgver.tar.xz" +builddir="$srcdir/$_pkgreal-$pkgver" + +build() { + cd "$builddir" + make RUNSTATEDIR=/run -C src/tools +} + +package() { + cd "$builddir" + make WITH_BASHCOMPLETION=yes WITH_WGQUICK=yes DESTDIR="$pkgdir" -C src/tools install +} + +bashcomp() { + depends="$pkgname" + pkgdesc="$pkgdesc (Bash completion)" + + mkdir -p "$subpkgdir/usr/share" + mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/" +} + +_patch() { + depends="" + pkgdesc="Kernel patch for the WireGuard VPN" + + cd "$builddir" + mkdir -p "$subpkgdir/usr/share/wireguard" + contrib/kernel-tree/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch" + +} + +sha512sums="8be40cebabca2a40f98ee10d6fa93708b12b17c6b0eab9aa8b7fab353d78fbd5b280b7b90cb2973cf74a1b9d47c3d250bf3ede6d1318129a45d57e21329b7f59 WireGuard-0.0.20190123.tar.xz" diff --git a/user/wv/APKBUILD b/user/wv/APKBUILD new file mode 100644 index 000000000..ec9a0a081 --- /dev/null +++ b/user/wv/APKBUILD @@ -0,0 +1,36 @@ +# Contributor: Natanael Copa <ncopa@alpinelinux.org> +# Maintainer: multiplexd <multi@in-addr.xyz> +pkgname=wv +pkgver=1.2.9 +pkgrel=0 +pkgdesc="A library that can 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" +source="https://www.abisource.com/downloads/wv/$pkgver/wv-$pkgver.tar.gz" + +prepare() { + update_config_sub + default_prepare +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --mandir=/usr/share/man + make +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5 wv-1.2.9.tar.gz" diff --git a/user/x11/APKBUILD b/user/x11/APKBUILD new file mode 100644 index 000000000..9ed101368 --- /dev/null +++ b/user/x11/APKBUILD @@ -0,0 +1,16 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=x11 +pkgver=7.7 +pkgrel=0 +pkgdesc="The X Window System" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +options="!check" # Metapacakge +subpackages="" +depends="xorg-apps xorg-drivers xorg-fonts xorg-server xbitmaps xcursor-themes" +source="" + +package() { + mkdir -p $pkgdir +} diff --git a/user/x11perf/APKBUILD b/user/x11perf/APKBUILD new file mode 100644 index 000000000..2c3d265bb --- /dev/null +++ b/user/x11perf/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=x11perf +pkgver=1.6.0 +pkgrel=0 +pkgdesc="X11 server benchmarking utility" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libx11-dev libxft-dev libxmu-dev libxrender-dev util-macros + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/x11perf-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623 x11perf-1.6.0.tar.bz2" diff --git a/user/x11vnc/APKBUILD b/user/x11vnc/APKBUILD new file mode 100644 index 000000000..c68858df3 --- /dev/null +++ b/user/x11vnc/APKBUILD @@ -0,0 +1,47 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=x11vnc +pkgver=0.9.16 +pkgrel=0 +pkgdesc="VNC server for X11 sessions" +url="http://www.karlrunge.com/x11vnc/" +arch="all" +license="GPL-2.0-only" +makedepends="cairo-dev libjpeg-turbo-dev libvncserver-dev libxcursor-dev + openssl-dev utmps-dev zlib-dev" +subpackages="$pkgname-doc" +source="$pkgname-$pkgver.tar.gz::https://github.com/LibVNC/x11vnc/archive/$pkgver.tar.gz + utmps.patch + " + +prepare() { + cd "$builddir" + default_prepare + ./autogen.sh +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec x11vnc-0.9.16.tar.gz +8aaa6d1fd9e795a60cad162f2b21fe96cd3a7076a0c4fae6e6b0021881bd019312a678fa3ed69b694da36ee64cc0601812da5df96c6461baf68b7e70adf6cd4e utmps.patch" diff --git a/user/x11vnc/utmps.patch b/user/x11vnc/utmps.patch new file mode 100644 index 000000000..0a41b2037 --- /dev/null +++ b/user/x11vnc/utmps.patch @@ -0,0 +1,9 @@ +--- x11vnc-0.9.16/src/Makefile.am.old 2019-01-05 13:22:11.000000000 +0000 ++++ x11vnc-0.9.16/src/Makefile.am 2019-01-10 20:20:45.880000000 +0000 +@@ -145,4 +145,5 @@ + @AVAHI_LIBS@ \ + @XI2_LIBS@ \ + @CAIRO_LIBS@ \ +- $(LD_CYGIPC) ++ $(LD_CYGIPC) \ ++ -lutmps -lskarnet diff --git a/user/xapian-core/APKBUILD b/user/xapian-core/APKBUILD index 17e2e1577..b11d45db9 100644 --- a/user/xapian-core/APKBUILD +++ b/user/xapian-core/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: pkgname=xapian-core -pkgver=1.4.9 +pkgver=1.4.10 pkgrel=0 pkgdesc="Open source search engine library" url="https://xapian.org/" @@ -54,5 +54,5 @@ libxapian() { mv "$pkgdir"/usr/lib/$subpkgname* "$subpkgdir"/usr/lib } -sha512sums="1af23815ff9358d6407723d1a7d3dc00df8f45f4808ccaa4c57f38197763fdc2d62cb7b080fab737408db42ced85707021eac881d80767248ea22aff8a2e4aa3 xapian-core-1.4.9.tar.xz +sha512sums="fa716d6f8c04edb297d99dad4d7835f7874837ab3c39d7017e43708cde6992c596e579418be17b79772e002bd23b94169812523a1abd9519b1dd3df474f027d9 xapian-core-1.4.10.tar.xz 639c0ecd75be0627d334628b5adf581a7da92c4f86dfb86a92669368ff8a874d4bf4e344b8f3b1276d22d126d2bc44c8ab727e39e1c29c0358fe7bbc8aa8050d timeval-t.patch" diff --git a/user/xbiff/APKBUILD b/user/xbiff/APKBUILD new file mode 100644 index 000000000..bef041c3c --- /dev/null +++ b/user/xbiff/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xbiff +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Local email notification applet for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xbitmaps" +makedepends="libx11-dev libxaw-dev libxext-dev libxmu-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xbiff-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e9fa72817cae5fd6c052a4a59fcd6c696ae9d3f5fd8eecb0e9b0d8994258201cf5f4ae99845dd03e3da56e378eb214658e4450c9291a29399d9ece8af3b9f9e9 xbiff-1.0.3.tar.bz2" diff --git a/user/xcalc/APKBUILD b/user/xcalc/APKBUILD new file mode 100644 index 000000000..d15d905fc --- /dev/null +++ b/user/xcalc/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xcalc +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Graphical scientific calculator for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xcalc-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="61b921b6a3fefea20bd9e7ad0b308f589f2aeaafe9316df94cc739a005be6c180bdafc981b8957230f46c9fc1c0e266829a55b473ae26b1377c705796175c908 xcalc-1.0.6.tar.bz2" diff --git a/user/xclipboard/APKBUILD b/user/xclipboard/APKBUILD new file mode 100644 index 000000000..b0219ea81 --- /dev/null +++ b/user/xclipboard/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xclipboard +pkgver=1.1.3 +pkgrel=0 +pkgdesc="Clipboard viewer for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xclipboard-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e xclipboard-1.1.3.tar.bz2" diff --git a/user/xclock/APKBUILD b/user/xclock/APKBUILD new file mode 100644 index 000000000..f8b9e4a22 --- /dev/null +++ b/user/xclock/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xclock +pkgver=1.0.7 +pkgrel=0 +pkgdesc="Clock applet for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxkbfile-dev libxft-dev libxmu-dev + libxrender-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xclock-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607 xclock-1.0.7.tar.bz2" diff --git a/user/xcmsdb/APKBUILD b/user/xcmsdb/APKBUILD new file mode 100644 index 000000000..973f006f0 --- /dev/null +++ b/user/xcmsdb/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xcmsdb +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Device colour management for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xcmsdb-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4 xcmsdb-1.0.5.tar.bz2" diff --git a/user/xcompmgr/APKBUILD b/user/xcompmgr/APKBUILD new file mode 100644 index 000000000..27c149441 --- /dev/null +++ b/user/xcompmgr/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xcompmgr +pkgver=1.1.7 +pkgrel=0 +pkgdesc="Small compositing manager for X11" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libxcomposite-dev libxdamage-dev libxext-dev libxfixes-dev + libxrender-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xcompmgr-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f93a6be78169dd41ff08d71409e28746fd62902810a2f6930c0ac44f1415bc7391a8fb885b074fd40afedd7f1c1590aa7c67fc101c3b6488ddaa74495b42149c xcompmgr-1.1.7.tar.bz2" diff --git a/user/xconsole/APKBUILD b/user/xconsole/APKBUILD new file mode 100644 index 000000000..4bbac0359 --- /dev/null +++ b/user/xconsole/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xconsole +pkgver=1.0.7 +pkgrel=0 +pkgdesc="Console monitor for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros + xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xconsole-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="89f391058ea99904587bd1dac9e31fa3ff06cf63b899abe6c06e4897bbc9919500dd4773873b1a452de4f54cc6999bd496022b6d8df9d4147804448abbdca2f9 xconsole-1.0.7.tar.bz2" diff --git a/user/xcursor-themes/APKBUILD b/user/xcursor-themes/APKBUILD new file mode 100644 index 000000000..e61f4a537 --- /dev/null +++ b/user/xcursor-themes/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xcursor-themes +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Built-in cursor themes for X11" +url="https://www.X.Org/" +arch="noarch" +license="X11" +depends="" +makedepends="libxcursor-dev util-macros xcursorgen" +subpackages="" +source="https://www.x.org/releases/individual/data/xcursor-themes-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f41e1de0d5deafba33106dcad81576d1888fca052a962c202f2221104aa2d8236b066d8d8fc3dcfbdc166db63f84e60980dfc54059b20a26c7415de71ed07a5b xcursor-themes-1.0.5.tar.bz2" diff --git a/user/xcursorgen/APKBUILD b/user/xcursorgen/APKBUILD new file mode 100644 index 000000000..395dfb95b --- /dev/null +++ b/user/xcursorgen/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xcursorgen +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Cursor generator for X11" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libpng-dev libx11-dev libxcursor-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xcursorgen-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3b464b7be3cec8c6d2bf4538266108bdc09e1dae4053d573f7f38e004929b41be0d996aa54918490fa040655644e2b0d4fab1ec24cca014d77bdb91c41ab1db4 xcursorgen-1.0.6.tar.bz2" diff --git a/user/xdbedizzy/APKBUILD b/user/xdbedizzy/APKBUILD new file mode 100644 index 000000000..5d190e7c5 --- /dev/null +++ b/user/xdbedizzy/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xdbedizzy +pkgver=1.1.0 +pkgrel=0 +pkgdesc="X11 demo showcasing the Double Buffering extension" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libx11-dev libxext-dev util-macros" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="58b9c88b09772008fe18921c0b63972a65ee5833f96edbbd2e1dc335e5f20ca9a241728b9a225e3b0f3eb392a7941cc1ab6e3c871b9463ff21bb23e38557e9fa xdbedizzy-1.1.0.tar.bz2" diff --git a/user/xditview/APKBUILD b/user/xditview/APKBUILD new file mode 100644 index 000000000..6902402e2 --- /dev/null +++ b/user/xditview/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xditview +pkgver=1.0.4 +pkgrel=0 +pkgdesc="X11 ditroff viewer" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xditview-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7a0d023cd28ffc63c771814e028e79d20f8b56671a7a558c41ef062ef2d40079b5d37a5cf026b7ad3670da6866a087ae4888cea96d6d9e8a137e115174d637d2 xditview-1.0.4.tar.bz2" diff --git a/user/xdpyinfo/APKBUILD b/user/xdpyinfo/APKBUILD index d6d4a0f89..903b9a11d 100644 --- a/user/xdpyinfo/APKBUILD +++ b/user/xdpyinfo/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xdpyinfo pkgver=1.3.2 -pkgrel=1 -pkgdesc="X11 utility to show display information" +pkgrel=2 +pkgdesc="X11 display information viewer" url="https://www.X.Org/" arch="all" license="X11" depends="" -makedepends="libxtst-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" diff --git a/user/xdriinfo/APKBUILD b/user/xdriinfo/APKBUILD new file mode 100644 index 000000000..ae39b7f97 --- /dev/null +++ b/user/xdriinfo/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xdriinfo +pkgver=1.0.6 +pkgrel=0 +pkgdesc="X11 DRI information viewer" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev mesa-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xdriinfo-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7ddd9e19abaef93e4d85004293528ec3814ef84c470d496dbb8dc8313d804bb7520406de8d33d2bc2b3af942bd0a5d5032a109b2726438a966af63ea680a102f xdriinfo-1.0.6.tar.bz2" diff --git a/user/xedit/APKBUILD b/user/xedit/APKBUILD new file mode 100644 index 000000000..3ad25658c --- /dev/null +++ b/user/xedit/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xedit +pkgver=1.2.2 +pkgrel=0 +pkgdesc="Simple text editor for X11" +url="https://www.X.Org/" +arch="all" +license="BSD-3-Clause AND X11" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xedit-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="24d8e23a2ad1a2e81f6606928bb032f25b70b76da83b65341367bc4111d011abe89f9e30402d057854f2ccdaa9c1ef0d7c55bf29b81ab2d050a8f448cf3eeb5d xedit-1.2.2.tar.bz2" diff --git a/user/xev/APKBUILD b/user/xev/APKBUILD new file mode 100644 index 000000000..951fb10c4 --- /dev/null +++ b/user/xev/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xev +pkgver=1.2.2 +pkgrel=0 +pkgdesc="X11 input event monitor" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxrandr-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xev-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="453fc18072e4d4fd088a1b2e918f3772aaa2c56b36c082deb41ec4d434d1579de75f447fc4e0507086c170152e02d6db8b60dc7fd87ae18a2e817448bd628fca xev-1.2.2.tar.bz2" diff --git a/user/xeyes/APKBUILD b/user/xeyes/APKBUILD new file mode 100644 index 000000000..76edc0272 --- /dev/null +++ b/user/xeyes/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xeyes +pkgver=1.1.2 +pkgrel=0 +pkgdesc="Feel like somebody's watching you" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxext-dev libxmu-dev libxrender-dev libxt-dev + util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xeyes-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="008d76f03ddabd3d86ad9e52a540504553b94cb7a6743b20cf08897549eb27505667365ab9af21956a1b5ec7297acca8903a326536e6195a30e643cd93297ee0 xeyes-1.1.2.tar.bz2" diff --git a/user/xf86-input-evdev/APKBUILD b/user/xf86-input-evdev/APKBUILD index 014f8911f..3339d8caf 100644 --- a/user/xf86-input-evdev/APKBUILD +++ b/user/xf86-input-evdev/APKBUILD @@ -2,7 +2,7 @@ pkgname=xf86-input-evdev pkgver=2.10.6 pkgrel=0 -pkgdesc="X.Org input driver - Evdev" +pkgdesc="X.Org generic input driver" url="https://www.X.Org/" arch="all" license="MIT" diff --git a/user/xf86-input-joystick/APKBUILD b/user/xf86-input-joystick/APKBUILD new file mode 100644 index 000000000..c71441234 --- /dev/null +++ b/user/xf86-input-joystick/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-input-joystick +pkgver=1.6.3 +pkgrel=0 +pkgdesc="X.Org joystick driver" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="541c993bd37dd74d96d90060407d9fb9ebd3fbca352189a08c6b0c899c84609a1b5a3c1ea3febb4ceb5e2b881b54e45c75b8f9b2e475e16d7cffbbe42a3221e5 xf86-input-joystick-1.6.3.tar.bz2" diff --git a/user/xf86-input-keyboard/APKBUILD b/user/xf86-input-keyboard/APKBUILD new file mode 100644 index 000000000..600a12ec6 --- /dev/null +++ b/user/xf86-input-keyboard/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-input-keyboard +pkgver=1.9.0 +pkgrel=0 +pkgdesc="X.Org keyboard driver" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT AND GPL-2.0-only" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d1a52d10039096d0d5e09750b6a8c2388345748331615af93e5be499646c3bc5fbbfc897fcebdeada5efaafff94f26a2ab84d6e35f01a875b8b9956a42015df9 xf86-input-keyboard-1.9.0.tar.bz2" diff --git a/user/xf86-input-libinput/APKBUILD b/user/xf86-input-libinput/APKBUILD index ad5c691bc..655c9319f 100644 --- a/user/xf86-input-libinput/APKBUILD +++ b/user/xf86-input-libinput/APKBUILD @@ -3,7 +3,7 @@ pkgname=xf86-input-libinput pkgver=0.28.1 pkgrel=0 -pkgdesc="X.Org input driver - libinput universal driver" +pkgdesc="X.Org generic input driver using libinput" url="https://www.X.Org/" arch="all" license="MIT" diff --git a/user/xf86-input-mouse/APKBUILD b/user/xf86-input-mouse/APKBUILD new file mode 100644 index 000000000..eaefa3bb0 --- /dev/null +++ b/user/xf86-input-mouse/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-input-mouse +pkgver=1.9.3 +pkgrel=0 +pkgdesc="X.Org mouse driver" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d99f5b4b1ef1aa4cbf1a92549e412f54f121bc804e4d6643248ad7ea18081b38b958bd289dc8476ebc0f6ef5f7424c2f2a8abcfaa30cae5378829549af6b148f xf86-input-mouse-1.9.3.tar.bz2" diff --git a/user/xf86-input-synaptics/APKBUILD b/user/xf86-input-synaptics/APKBUILD index 45de5e926..5d45c4602 100644 --- a/user/xf86-input-synaptics/APKBUILD +++ b/user/xf86-input-synaptics/APKBUILD @@ -2,14 +2,14 @@ pkgname=xf86-input-synaptics pkgver=1.9.1 pkgrel=0 -pkgdesc="X.Org input driver - Synaptics trackpads" +pkgdesc="X.Org input driver for Synaptics laptop trackpads" url="https://www.X.Org/" arch="all" license="MIT" -subpackages="$pkgname-doc $pkgname-dev" depends="" makedepends="libevdev-dev libxi-dev libxkbfile-dev libxrandr-dev libxtst-dev mtdev-dev xorg-server-dev" +subpackages="$pkgname-doc $pkgname-dev" source="https://www.X.Org/releases/individual/driver/$pkgname-$pkgver.tar.bz2" build() { diff --git a/user/xf86-input-void/APKBUILD b/user/xf86-input-void/APKBUILD new file mode 100644 index 000000000..9ce25b0f7 --- /dev/null +++ b/user/xf86-input-void/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-input-void +pkgver=1.4.1 +pkgrel=0 +pkgdesc="X.Org null input driver" +url="https://www.X.Org/" +arch="all" +license="MIT AND X11" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3cbcba9510635fc4a3b610fb940584417d4b3fcace88670b1289906a7da15614e9a286590cecd1840af4bb3bd0c62f246522b1203700067ec384c3cc11b7e94a xf86-input-void-1.4.1.tar.bz2" diff --git a/user/xf86-input-wacom/APKBUILD b/user/xf86-input-wacom/APKBUILD new file mode 100644 index 000000000..da4162103 --- /dev/null +++ b/user/xf86-input-wacom/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-input-wacom +pkgver=0.36.1 +pkgrel=0 +pkgdesc="X.Org driver for Wacom tablets" +url="https://linuxwacom.github.io/" +arch="all" +license="GPL-2.0-only" +depends="" +makedepends="eudev-dev libx11-dev libxext-dev libxi-dev libxinerama-dev + libxrandr-dev util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://github.com/linuxwacom/xf86-input-wacom/releases/download/xf86-input-wacom-$pkgver/xf86-input-wacom-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2618bb53f4d6ed4166cd738022efcd3f35b31e27b04b8293834a1650131f2cbe9e1f11594bbcfb309861360311ae68dfb179d86d27fcb57033847a7b26d6e832 xf86-input-wacom-0.36.1.tar.bz2" diff --git a/user/xf86-video-ast/APKBUILD b/user/xf86-video-ast/APKBUILD new file mode 100644 index 000000000..0d90f631b --- /dev/null +++ b/user/xf86-video-ast/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-ast +pkgver=1.1.5 +pkgrel=0 +pkgdesc="ASPEED video driver for X11" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="" +source="https://www.x.org/releases/individual/driver/xf86-video-ast-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="067c2ce3e74c83fe1531213308753cb80482d177c93009c99dc49e95bfa6ff058d81cc716d6c343b9ca1e0eb7aedf3b84beb12ad08b8cd4d9f43e11f9e192e8e xf86-video-ast-1.1.5.tar.bz2" diff --git a/user/xf86-video-cirrus/APKBUILD b/user/xf86-video-cirrus/APKBUILD new file mode 100644 index 000000000..1c26532ea --- /dev/null +++ b/user/xf86-video-cirrus/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-cirrus +pkgver=1.5.3 +pkgrel=0 +pkgdesc="Cirrus Logic video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="6aec70f943d9bf7455782d300bd5e1caab5c90408cdca25b9a3ef314e565082f3249a179fb508be36a61c8a34006c0ace14b9aa41f724f479511a906fa8f4798 xf86-video-cirrus-1.5.3.tar.bz2" diff --git a/user/xf86-video-dummy/APKBUILD b/user/xf86-video-dummy/APKBUILD new file mode 100644 index 000000000..453dda88c --- /dev/null +++ b/user/xf86-video-dummy/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-dummy +pkgver=0.3.8 +pkgrel=0 +pkgdesc="Null video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="" +source="https://www.x.org/releases/individual/driver/xf86-video-dummy-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f534113fd9987e44d2e0d0c53bd1b71be4ba69ec239ecec4aba8fcdcc10597722c54cbc01da38e0975ac7660e4e4028330e4cdd369e755c25ec059d2dfabad80 xf86-video-dummy-0.3.8.tar.bz2" diff --git a/user/xf86-video-fbdev/APKBUILD b/user/xf86-video-fbdev/APKBUILD index 628551019..d514f987d 100644 --- a/user/xf86-video-fbdev/APKBUILD +++ b/user/xf86-video-fbdev/APKBUILD @@ -2,7 +2,7 @@ pkgname=xf86-video-fbdev pkgver=0.5.0 pkgrel=0 -pkgdesc="X.Org driver for video over framebuffers" +pkgdesc="Framebuffer video driver for X11" url="https://www.X.Org/" arch="all" license="MIT" diff --git a/user/xf86-video-freedreno/APKBUILD b/user/xf86-video-freedreno/APKBUILD new file mode 100644 index 000000000..d46d2b23a --- /dev/null +++ b/user/xf86-video-freedreno/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-freedreno +pkgver=1.4.0 +pkgrel=0 +pkgdesc="Libre Adreno video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11 AND BSD-3-Clause" +depends="" +makedepends="eudev-dev libdrm-dev util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-video-freedreno-$pkgver.tar.bz2 + api-23.patch + secure-atom.patch + " + +build() { + cd "$builddir" + CFLAGS="$CFLAGS -Wno-error=deprecated-declarations" ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="5bc7c35bd79e8ff90d8da5360413b03c497ba3dec9399c78fc85e8f1d2bf8955c27c6b225dfbbcdb73a16a4b539cfa131e309866e42289cb577d0e9bfc15b6ca xf86-video-freedreno-1.4.0.tar.bz2 +6e940ecb5b784b8e8854af47c0f01becf2a3453cc0d81b905612920d78ce8a89f99eac7b5e0c8d4755ec64755b482a6d4c1f369c96ee0c26e2402bd0b5c1f4d5 api-23.patch +5cac3b356339652d5447505ddb5851bdf492341d6f4e04cdda5372f1a74e47fcecfffc18af50bdf6ccaef9a894c6e5a208552add5f9dbe0bbb09805b7794448c secure-atom.patch" diff --git a/user/xf86-video-freedreno/api-23.patch b/user/xf86-video-freedreno/api-23.patch new file mode 100644 index 000000000..fbe8c48a7 --- /dev/null +++ b/user/xf86-video-freedreno/api-23.patch @@ -0,0 +1,256 @@ +From 5c82dc7874b6eaff39dc8c8575e72e5a40f13ea6 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 19 Jul 2016 10:03:56 -0400 +Subject: Adapt Block/WakeupHandler signature for ABI 23 + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/compat-api.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/compat-api.h b/src/compat-api.h +index 4f7b9ea..15b92fe 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -76,8 +76,13 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout ++#define BLOCKHANDLER_ARGS arg, pTimeout ++#else + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask ++#endif + + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen +-- +cgit v1.1 + +From 5f60ca4fe99199183dced955de0206acb5a5ebe9 Mon Sep 17 00:00:00 2001 +From: Keith Packard <keithp@keithp.com> +Date: Tue, 19 Jul 2016 08:33:51 -0700 +Subject: Use NotifyFd for drm and udev fds + +NotifyFd is available after API 22, and must be used after API 23. + +Signed-off-by: Keith Packard <keithp@keithp.com> +--- + src/compat-api.h | 4 ++++ + src/drmmode_display.c | 21 +++++++++++++++++++++ + 2 files changed, 25 insertions(+) + +diff --git a/src/compat-api.h b/src/compat-api.h +index 15b92fe..80dabc1 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -76,6 +76,10 @@ + + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv + ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(22,0) ++#define HAVE_NOTIFY_FD 1 ++#endif ++ + #if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout + #define BLOCKHANDLER_ARGS arg, pTimeout +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 0d94bb5..53ae677 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -1462,6 +1462,18 @@ drmmode_flip_handler(int fd, unsigned int frame, unsigned int tv_sec, + free(flipdata); + } + ++#if HAVE_NOTIFY_FD ++ ++static void ++drmmode_notify_fd(int fd, int notify, void *data) ++{ ++ ScrnInfoPtr scrn = data; ++ drmmode_ptr drmmode = drmmode_from_scrn(scrn); ++ drmHandleEvent(drmmode->fd, &drmmode->event_context); ++} ++ ++#else ++ + static void + drmmode_wakeup_handler(pointer data, int err, pointer p) + { +@@ -1480,6 +1492,7 @@ drmmode_wakeup_handler(pointer data, int err, pointer p) + drmmode_handle_uevents(scrn); + #endif + } ++#endif /* HAVE_NOTIFY_FD */ + + void + drmmode_wait_for_event(ScrnInfoPtr pScrn) +@@ -1517,11 +1530,15 @@ drmmode_screen_init(ScreenPtr pScreen) + drmmode->event_context.version = DRM_EVENT_CONTEXT_VERSION; + drmmode->event_context.page_flip_handler = drmmode_flip_handler; + ++#if HAVE_NOTIFY_FD ++ SetNotifyFd(drmmode->fd, drmmode_notify_fd, X_NOTIFY_READ, pScrn); ++#else + AddGeneralSocket(drmmode->fd); + + /* Register a wakeup handler to get informed on DRM events */ + RegisterBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, + drmmode_wakeup_handler, pScrn); ++#endif + + return TRUE; + } +@@ -1535,10 +1552,14 @@ drmmode_screen_fini(ScreenPtr pScreen) + + drmmode_uevent_fini(pScrn); + ++#if HAVE_NOTIFY_FD ++ RemoveNotifyFd(drmmode->fd); ++#else + /* Register a wakeup handler to get informed on DRM events */ + RemoveBlockAndWakeupHandlers((BlockHandlerProcPtr)NoopDDA, + drmmode_wakeup_handler, pScrn); + RemoveGeneralSocket(drmmode->fd); ++#endif + + drmmode_remove_fb(pScrn); + fd_bo_del(pMsm->scanout); +-- +cgit v1.1 + +From 6c8e21c686578f22d973a243a09c838943ddbadd Mon Sep 17 00:00:00 2001 +From: Rob Clark <robdclark@gmail.com> +Date: Wed, 7 Dec 2016 17:59:09 -0500 +Subject: Use NotifyFd more completely + +previous commit missed some. + +Signed-off-by: Rob Clark <robdclark@gmail.com> +--- + src/Makefile.am | 1 - + src/compat-api.h | 19 +++++++++++++++++++ + src/drmmode_display.c | 18 ++++++++++++++++++ + 3 files changed, 37 insertions(+), 1 deletion(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index d4c1289..f7d5dd1 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -2,7 +2,6 @@ AM_CFLAGS = \ + @XORG_CFLAGS@ \ + @XATRACKER_CFLAGS@ \ + -Wall \ +- -Werror \ + -I$(top_srcdir)/system-includes/ \ + -I$(top_builddir)/ + +diff --git a/src/compat-api.h b/src/compat-api.h +index 80dabc1..af1b922 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -28,6 +28,11 @@ + #ifndef COMPAT_API_H + #define COMPAT_API_H + ++#include <xorg-server.h> ++#include <xorgVersion.h> ++#include <xf86Module.h> ++ ++#include <picturestr.h> + #ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR + #define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] + #define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p +@@ -35,7 +40,13 @@ + + #ifndef XF86_HAS_SCRN_CONV + #define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,1,0,0,0) + #define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] ++#else ++#define xf86ScrnToScreen(s) ((s)->pScreen) ++#endif ++#else ++#define xf86ScrnToScreen(s) ((s)->pScreen) + #endif + + #ifndef XF86_SCRN_INTERFACE +@@ -51,12 +62,17 @@ + #define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask + #define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask + ++#define WAKEUPHANDLER_ARGS_DECL int arg, pointer wakeupData, unsigned long result, pointer read_mask ++#define WAKEUPHANDLER_ARGS arg, wakeupData, result, read_mask ++ + #define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS scrnIndex, pScreen + + #define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags ++#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0 + + #define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags ++#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0 + + #define FREE_SCREEN_ARGS_DECL int arg, int flags + #define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 +@@ -88,6 +104,9 @@ + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask + #endif + ++#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask ++#define WAKEUPHANDLER_ARGS arg, result, read_mask ++ + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen + #define CLOSE_SCREEN_ARGS pScreen + +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 53ae677..c3a55e6 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -1381,6 +1381,15 @@ drmmode_handle_uevents(ScrnInfoPtr scrn) + } + #endif + ++#if HAVE_NOTIFY_FD ++static void ++drmmode_udev_notify(int fd, int notify, void *data) ++{ ++ ScrnInfoPtr scrn = data; ++ drmmode_handle_uevents(scrn); ++} ++#endif ++ + static void + drmmode_uevent_init(ScrnInfoPtr scrn) + { +@@ -1407,7 +1416,12 @@ drmmode_uevent_init(ScrnInfoPtr scrn) + return; + } + ++#if HAVE_NOTIFY_FD ++ SetNotifyFd(udev_monitor_get_fd(mon), drmmode_udev_notify, X_NOTIFY_READ, scrn); ++#else + AddGeneralSocket(udev_monitor_get_fd(mon)); ++#endif ++ + drmmode->uevent_monitor = mon; + #endif + } +@@ -1421,7 +1435,11 @@ drmmode_uevent_fini(ScrnInfoPtr scrn) + if (drmmode->uevent_monitor) { + struct udev *u = udev_monitor_get_udev(drmmode->uevent_monitor); + ++#if HAVE_NOTIFY_FD ++ RemoveNotifyFd(udev_monitor_get_fd(drmmode->uevent_monitor)); ++#else + RemoveGeneralSocket(udev_monitor_get_fd(drmmode->uevent_monitor)); ++#endif + udev_monitor_unref(drmmode->uevent_monitor); + udev_unref(u); + } +-- +cgit v1.1 + diff --git a/user/xf86-video-freedreno/secure-atom.patch b/user/xf86-video-freedreno/secure-atom.patch new file mode 100644 index 000000000..17101fb57 --- /dev/null +++ b/user/xf86-video-freedreno/secure-atom.patch @@ -0,0 +1,33 @@ +From ccba8f89995de7d5e1b216e580b789c4cda05035 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 13 Jun 2017 09:26:28 -0400 +Subject: modesetting: Validate the atom for enum properties + +The client could have said anything here, and if what they said doesn't +actually name an atom NameForAtom() will return NULL, and strcmp() will +be unhappy about that. + +[copied from xserver d4995a3936ae283b9080fdaa0905daa669ebacfc] + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/drmmode_display.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index c3a55e6..83f323d 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -898,7 +898,8 @@ drmmode_output_set_property(xf86OutputPtr output, Atom property, + if (value->type != XA_ATOM || value->format != 32 || value->size != 1) + return FALSE; + memcpy(&atom, value->data, 4); +- name = NameForAtom(atom); ++ if (!(name = NameForAtom(atom))) ++ return FALSE; + + /* search for matching name string, then set its value down */ + for (j = 0; j < p->mode_prop->count_enums; j++) { +-- +cgit v1.1 + diff --git a/user/xf86-video-geode/APKBUILD b/user/xf86-video-geode/APKBUILD new file mode 100644 index 000000000..0ba4f2954 --- /dev/null +++ b/user/xf86-video-geode/APKBUILD @@ -0,0 +1,42 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-geode +pkgver=2.11.19 +pkgrel=0 +pkgdesc="AMD Geode video driver for X11" +url="https://www.X.Org/" +arch="pmmx" +license="X11" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="" +source="https://www.x.org/releases/individual/driver/xf86-video-geode-$pkgver.tar.bz2 + loader.patch + randr.patch + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f0b1c5edf1c226a4379aa9a4983e69cbaced0618868a7902de41a7754c148324c2a4ea73704aefd96f48d36f035fb2c8063604c26e21e986e4f90c3716578d41 xf86-video-geode-2.11.19.tar.bz2 +a6703c78f2790ff67eb812de3afcdff0a86b6dee8469318ed21e8a50af0a286a087739917e7559d920085563b62eaf9874d54397e88bc810e65bd6ffa7d0830f loader.patch +c4b1d09b17e84a3aa842e37f6710fcfe420c2cd9a3efeac5ea50c0d3eb7ebbdb370536a86e1741c89fe50ae38b22d9aecf1d6919077a1579209f2f70c2e0b099 randr.patch" diff --git a/user/xf86-video-geode/loader.patch b/user/xf86-video-geode/loader.patch new file mode 100644 index 000000000..f318fbb17 --- /dev/null +++ b/user/xf86-video-geode/loader.patch @@ -0,0 +1,48 @@ +From 09aaa3d1fae4aeb099b16e7a046151761bcdea95 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 24 Jan 2017 09:53:06 -0500 +Subject: Remove call to LoaderGetOS + +On OSes that don't have a /dev/videox we'll just fail the open() and not +initialize the Xv adaptor. + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/z4l.c | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/src/z4l.c b/src/z4l.c +index eccefe8..be0d345 100644 +--- a/src/z4l.c ++++ b/src/z4l.c +@@ -1709,7 +1709,6 @@ _X_EXPORT XF86ModuleData ztvModuleData = { &z4lVersionRec, z4lSetup, NULL }; + static pointer + z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) + { +- const char *osname; + static Bool setupDone = FALSE; + + if (setupDone != FALSE) { +@@ -1719,19 +1718,7 @@ z4lSetup(pointer module, pointer opts, int *errmaj, int *errmin) + } + + setupDone = TRUE; +- LoaderGetOS(&osname, NULL, NULL, NULL); +- +- if (osname == NULL || strcmp(osname, "linux") != 0) { +- if (errmaj) +- *errmaj = LDR_BADOS; +- if (errmin) +- *errmin = 0; +- +- return NULL; +- } +- + xf86AddDriver(&Z4l, module, 0); +- + return (pointer) 1; + } + +-- +cgit v1.1 + diff --git a/user/xf86-video-geode/randr.patch b/user/xf86-video-geode/randr.patch new file mode 100644 index 000000000..9c2b34ac9 --- /dev/null +++ b/user/xf86-video-geode/randr.patch @@ -0,0 +1,30 @@ +From 8382e6bb0c76a8029493eae3f2d7a3dbfd0cfc12 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Mon, 5 Mar 2018 10:28:15 -0500 +Subject: gx: Fix RANDR initialization for xserver 1.20 + +xf86DisableRandR() doesn't exist anymore, and we don't need it anyway, +the core code will notice that we set up RANDR ourselves. + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- + src/gx_driver.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/gx_driver.c b/src/gx_driver.c +index ab57df1..4de336e 100644 +--- a/src/gx_driver.c ++++ b/src/gx_driver.c +@@ -1426,7 +1426,9 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL) + + /* Set up RandR */ + ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 24 + xf86DisableRandR(); /* We provide our own RandR goodness */ ++#endif + + /* Try to set up the shadow FB for rotation */ + +-- +cgit v1.1 + diff --git a/user/xf86-video-mach64/APKBUILD b/user/xf86-video-mach64/APKBUILD new file mode 100644 index 000000000..2fdbb93c7 --- /dev/null +++ b/user/xf86-video-mach64/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-mach64 +pkgver=6.9.6 +pkgrel=0 +pkgdesc="ATi mach64 video driver for X11" +url="https://www.X.Org/" +arch="all" +license="MIT AND X11" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="" +source="https://www.x.org/releases/individual/driver/xf86-video-mach64-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="687f6ac60491b704d5c4788463763d2f4bf725611e10bd2163156963fe0a8fdbffe0a1b7c737eff131f01759e43b5ec3544a7dabe66a67e85b286dcb969da2f1 xf86-video-mach64-6.9.6.tar.bz2" diff --git a/user/xf86-video-mga/APKBUILD b/user/xf86-video-mga/APKBUILD new file mode 100644 index 000000000..adfbc5b31 --- /dev/null +++ b/user/xf86-video-mga/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-mga +pkgver=2.0.0 +pkgrel=0 +pkgdesc="Matrox video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="b92006486aef815ff4399f291d610c65d88c0b32a9dae97658c644715ff62b221b01495b5c7a2311745e26f699c1c1f753b81c7bf54cf75567af9f78ac015540 xf86-video-mga-2.0.0.tar.bz2" diff --git a/user/xf86-video-nouveau/APKBUILD b/user/xf86-video-nouveau/APKBUILD index 700e82d37..dd6bd27cd 100644 --- a/user/xf86-video-nouveau/APKBUILD +++ b/user/xf86-video-nouveau/APKBUILD @@ -3,7 +3,7 @@ pkgname=xf86-video-nouveau pkgver=1.0.15 pkgrel=2 -pkgdesc="Open-source X.org drivers for nVidia video cards" +pkgdesc="Libre Nvidia video driver for X11" url="https://nouveau.freedesktop.org/" arch="all" license="MIT" diff --git a/user/xf86-video-openchrome/APKBUILD b/user/xf86-video-openchrome/APKBUILD new file mode 100644 index 000000000..10832e4ae --- /dev/null +++ b/user/xf86-video-openchrome/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-openchrome +pkgver=0.6.0 +pkgrel=1 +pkgdesc="S3/VIA Chrome video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxvmc-dev xorgproto-dev xorg-server-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f074e70d54c87a9d6e1b52c2c2d72d7c551dcb59a5f34c0a5f9495db1a6e45db4300d51fabf7eedfbe91f964f9422931c752a49b322715c6aa9ddb0db9dd6004 xf86-video-openchrome-0.6.0.tar.bz2" diff --git a/user/xf86-video-qxl/APKBUILD b/user/xf86-video-qxl/APKBUILD new file mode 100644 index 000000000..3106debc5 --- /dev/null +++ b/user/xf86-video-qxl/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-qxl +pkgver=0.1.5 +pkgrel=0 +pkgdesc="QXL video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="eudev-dev libxfont2-dev spice-protocol util-macros xorgproto-dev + xorg-server-dev" +subpackages="" +source="https://www.x.org/releases/individual/driver/xf86-video-qxl-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7510b2d037b3e978df6063b29e2406f3d1270695a239f29fdaec9b1dc65a30ab10cb959f15eb336f78e93aa708d41c64c5ea43803958feffc64542229605b782 xf86-video-qxl-0.1.5.tar.bz2" diff --git a/user/xf86-video-r128/APKBUILD b/user/xf86-video-r128/APKBUILD new file mode 100644 index 000000000..094b11633 --- /dev/null +++ b/user/xf86-video-r128/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-r128 +pkgver=6.12.0 +pkgrel=0 +pkgdesc="ATi Rage 128 video driver for X11" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-video-r128-$pkgver.tar.bz2 + xaa.patch + " + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="0e667e2cfa8a87a00846361d86528c93754c403c812b66798953fa4c857b2143b2c4c44885da467e7f910d8cb910b69492cdcb6f25e2197bae6617364d152e38 xf86-video-r128-6.12.0.tar.bz2 +45104ea2da49933f6d40834badb58c4db8706a9bf3080df7b2538f4cb1e7964b900c10b47386b9502bb4abee796b5f40f30252d1526e26d860b833c4dabca8ba xaa.patch" diff --git a/user/xf86-video-r128/xaa.patch b/user/xf86-video-r128/xaa.patch new file mode 100644 index 000000000..3ede81203 --- /dev/null +++ b/user/xf86-video-r128/xaa.patch @@ -0,0 +1,21 @@ +--- xf86-video-r128-6.12.0/src/r128_driver.c.old 2019-01-05 15:59:11.340000000 +0000 ++++ xf86-video-r128-6.12.0/src/r128_driver.c 2019-01-05 16:16:10.810000000 +0000 +@@ -1887,14 +1887,16 @@ + } + + if (!info->noAccel) { ++#ifdef HAVE_XAA_H + if (R128XAAAccelInit(pScreen)) { + info->accelOn = TRUE; + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "XAA acceleration enabled.\n"); +- } else { ++ } else ++#endif + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Acceleration disabled.\n"); +- } ++ + } + } + } diff --git a/user/xf86-video-tdfx/APKBUILD b/user/xf86-video-tdfx/APKBUILD new file mode 100644 index 000000000..62b9217cc --- /dev/null +++ b/user/xf86-video-tdfx/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xf86-video-tdfx +pkgver=1.4.7 +pkgrel=0 +pkgdesc="3Dfx video driver for X11" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="util-macros xorgproto-dev xorg-server-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/driver/xf86-video-tdfx-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="573eea7a6b05ed33a963f8e2f80ac1cb14632b7fd10d8d90da16c07db432e73641ced885ee979f68e4ead8429b39506b2f231ca4ac296a0780c9f6d223c3b405 xf86-video-tdfx-1.4.7.tar.bz2" diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD index 97f0d5de7..9cb4c146c 100644 --- a/user/xfce4-battery-plugin/APKBUILD +++ b/user/xfce4-battery-plugin/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-battery-plugin -pkgver=1.1.1 +pkgver=1.1.2 pkgrel=0 pkgdesc="Battery monitor plugin for the XFCE panel" url="https://xfce.org" @@ -34,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="15c0755f95cc03db95f8fe61faa87607dcdb24622c8de3a7941c254e15bf3d65b6683e5a0ff1fd96ca252afede6763f4440c8455665e346169b1107ad44d6651 xfce4-battery-plugin-1.1.1.tar.bz2" +sha512sums="51778d00c34c41bdad234893c4a91f3bd562481df343d811e266719cb7903f60e1d56ba39f64f14ab882ce6419d0f0f4010aa112e9d0059133e7e4d30470f491 xfce4-battery-plugin-1.1.2.tar.bz2" diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD index b58725e9d..4e70ac9d3 100644 --- a/user/xfce4-panel/APKBUILD +++ b/user/xfce4-panel/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-panel -pkgver=4.13.3 +pkgver=4.13.4 pkgrel=0 pkgdesc="Panel for the XFCE desktop environment" url="https://xfce.org" @@ -12,7 +12,6 @@ makedepends="intltool gtk+3.0-dev libice-dev libxfce4util-dev garcon-dev exo-dev subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" langdir="/usr/lib/locale" source="http://archive.xfce.org/src/xfce/xfce4-panel/4.13/xfce4-panel-$pkgver.tar.bz2" -sha512sums="99921ffc295b0e00689df50946ea326496c6fca68d6dfc6a563c0fb9e18bef1e537659963e3a0e6ee83756417565ac3531bc43e0e909dbb369068e4905bde045 xfce4-panel-4.13.3.tar.bz2" build() { cd "$builddir" @@ -36,3 +35,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="16a3680aa2ab7fa357ca9d477ea0e41ca159a2c626fe65454ccdca339bb501ff0979264f5a4ae4728e3c0efe24e193eb28e7b5d1e003fecad8ab36b8457203c8 xfce4-panel-4.13.4.tar.bz2" diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD index 172a3bb47..daac4f234 100644 --- a/user/xfce4-taskmanager/APKBUILD +++ b/user/xfce4-taskmanager/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-taskmanager -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=0 pkgdesc="Process manager for the XFCE desktop environment" url="https://xfce.org" @@ -9,7 +9,6 @@ arch="all" license="GPL-2.0+" makedepends="intltool gtk+3.0-dev gtk+2.0-dev libxmu-dev libwnck-dev" source="http://archive.xfce.org/src/apps/xfce4-taskmanager/1.2/xfce4-taskmanager-$pkgver.tar.bz2" -sha512sums="72a1ea75403ef5b96d461f0e4846374f7aa3eebbdd09a1a25c49278e4909904ed6305fe6a06f3a2fc370e191421726b96924e35427253428e968665155808d4e xfce4-taskmanager-1.2.1.tar.bz2" build() { cd "$builddir" @@ -34,3 +33,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums="670e8fd09bdaa85dc822dd5a7b055f898941e8079315843344e4dae12e2c0a14049b58241fb58f170461e7b8829bc479bea1a488b756210ef91ef8a4d7ff3348 xfce4-taskmanager-1.2.2.tar.bz2" diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD index 7aa9b05af..726611224 100644 --- a/user/xfce4-whiskermenu-plugin/APKBUILD +++ b/user/xfce4-whiskermenu-plugin/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xfce4-whiskermenu-plugin -pkgver=2.2.1 +pkgver=2.3.1 +_pkgmaj=${pkgver%.*} pkgrel=0 pkgdesc="Whisker menu plugin for the XFCE panel" url="https://xfce.org" @@ -10,7 +11,7 @@ options="!check" # no tests license="GPL-2.0+" makedepends="gtk+3.0-dev exo-dev garcon-dev xfce4-panel-dev" subpackages="$pkgname-doc $pkgname-lang" -source="http://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/2.2/xfce4-whiskermenu-plugin-$pkgver.tar.bz2" +source="http://archive.xfce.org/src/panel-plugins/xfce4-whiskermenu-plugin/$_pkgmaj/xfce4-whiskermenu-plugin-$pkgver.tar.bz2" build() { cd "$builddir" @@ -33,4 +34,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="e5b8ab54b66397d0d956d0ddcf7ab9c7531936fa7413094d4cae99aca8f7fca4659012beceec06c9bd6f1ba7695a3e0955d1fd2f10ebf08cf5701224a5dbeb18 xfce4-whiskermenu-plugin-2.2.1.tar.bz2" +sha512sums="f09a3a496aec5c29e6604657c0eb6dbc1bab731b56b34067dfe2548670dd4837741c55ebbb9f98505c6569effee170936cdd48dd0d79947d50b17f85410a38ea xfce4-whiskermenu-plugin-2.3.1.tar.bz2" diff --git a/user/xfd/APKBUILD b/user/xfd/APKBUILD new file mode 100644 index 000000000..5011b28d4 --- /dev/null +++ b/user/xfd/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfd +pkgver=1.1.2 +pkgrel=0 +pkgdesc="Display all characters in X11 fonts" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="fontconfig-dev libxaw-dev libxft-dev libxmu-dev libxrender-dev + util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfd-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="3a158f697dd40c5b650b3d80ad1692d668d9d9bcf586a437fd3dcebf9e8fffb773855df290260995464d5f36cb22e768d1d71de8e61d7cca80eaa4d25c029745 xfd-1.1.2.tar.bz2" diff --git a/user/xfindproxy/APKBUILD b/user/xfindproxy/APKBUILD new file mode 100644 index 000000000..430427fb2 --- /dev/null +++ b/user/xfindproxy/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfindproxy +pkgver=1.0.4 +pkgrel=0 +pkgdesc="X11 proxy locator service" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libice-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfindproxy-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="e99fdec21070d0052e21340bc2d471eed5c6b423ccfb063f3225d2bb63a264d5efa7e4d5d76543554e02f898d209338b178ba18f866593d946bc6fa117a630e2 xfindproxy-1.0.4.tar.bz2" diff --git a/user/xfontsel/APKBUILD b/user/xfontsel/APKBUILD new file mode 100644 index 000000000..e34c9d2ac --- /dev/null +++ b/user/xfontsel/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfontsel +pkgver=1.0.6 +pkgrel=0 +pkgdesc="X11 font chooser and exploration tool" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfontsel-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2f6bc51549a302404cdaf9a5a825add383953fcbb2a0c7076691cefd4dd7e4a3c772c047be74101c8486f75d03ce0bd3e65ede14e91732cf2a932810441c9099 xfontsel-1.0.6.tar.bz2" diff --git a/user/xfs/APKBUILD b/user/xfs/APKBUILD new file mode 100644 index 000000000..d7e0fdeb6 --- /dev/null +++ b/user/xfs/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfs +pkgver=1.2.0 +pkgrel=0 +pkgdesc="The X11 Font Server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xtrans" +makedepends="libxfont2-dev util-macros xmlto xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfs-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="557b08aa07919239ce345d60b288b886640200bb1a59649fc890c3ccaa8559cc6745189614e696ab1b390ec024b393be5493787b7b0d2b3545b342d743c2e0ef xfs-1.2.0.tar.bz2" diff --git a/user/xfsinfo/APKBUILD b/user/xfsinfo/APKBUILD new file mode 100644 index 000000000..932c744c8 --- /dev/null +++ b/user/xfsinfo/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfsinfo +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Display information about X11 font servers" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libfs-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfsinfo-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="49fcbe91ac121022ccecd4a2f0e55a9a5cce7ba12b713be78b3b7f2847e622631bca6f6647256a956910fda591a87b524b966d5c849b8b2526d6f1a1960fe57f xfsinfo-1.0.5.tar.bz2" diff --git a/user/xfwp/APKBUILD b/user/xfwp/APKBUILD new file mode 100644 index 000000000..46540f2ce --- /dev/null +++ b/user/xfwp/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xfwp +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 firewall proxy" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libice-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xfwp-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="493cfff0c90ada372c76f3fc49278bc4b1bf30c013f325d0358d0bd7004144bd540e86dee0fadd0bfbe1c47b91437a61dd7e9ff21d747d75ce9f42750fb17609 xfwp-1.0.3.tar.bz2" diff --git a/user/xgamma/APKBUILD b/user/xgamma/APKBUILD new file mode 100644 index 000000000..d93f3853b --- /dev/null +++ b/user/xgamma/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xgamma +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Tools for manipulating gamma on X11 displays" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxxf86vm-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xgamma-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a xgamma-1.0.6.tar.bz2" diff --git a/user/xgc/APKBUILD b/user/xgc/APKBUILD new file mode 100644 index 000000000..8e55f8a4f --- /dev/null +++ b/user/xgc/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xgc +pkgver=1.0.5 +pkgrel=0 +pkgdesc="X11 graphics core demonstration" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="cmd:lex cmd:yacc libxaw-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xgc-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314 xgc-1.0.5.tar.bz2" diff --git a/user/xkbevd/APKBUILD b/user/xkbevd/APKBUILD new file mode 100644 index 000000000..2402772b7 --- /dev/null +++ b/user/xkbevd/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xkbevd +pkgver=1.1.4 +pkgrel=0 +pkgdesc="Event daemon for XKB" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="cmd:yacc libx11-dev libxkbfile-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xkbevd-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7 xkbevd-1.1.4.tar.bz2" diff --git a/user/xkbprint/APKBUILD b/user/xkbprint/APKBUILD new file mode 100644 index 000000000..3661c7da9 --- /dev/null +++ b/user/xkbprint/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xkbprint +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Tool to generate PostScript descriptions of XKB keyboard layouts" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxkbfile-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xkbprint-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="bb65a93ae737cd4b78787fef51972f4d0072a272166f82103bfaa92cf275db6363fae3530539b7c9a4139f6b87512019ac15ab3478d4ad05967ad18a8e80033a xkbprint-1.0.4.tar.bz2" diff --git a/user/xkbutils/APKBUILD b/user/xkbutils/APKBUILD new file mode 100644 index 000000000..d627a69a8 --- /dev/null +++ b/user/xkbutils/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xkbutils +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Utilities for managing keyboards using XKB" +url="https://www.X.Org/" +arch="all" +license="MIT AND X11" +depends="" +makedepends="libx11-dev libxaw-dev libxt-dev util-macros xorgproto-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d xkbutils-1.0.4.tar.bz2" diff --git a/user/xkill/APKBUILD b/user/xkill/APKBUILD new file mode 100644 index 000000000..bc4d3cceb --- /dev/null +++ b/user/xkill/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xkill +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Kill X11 clients using the mouse cursor" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxmu-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xkill-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="4603a1794f114f5cea2c885020c9d073c8421d1e785c99ff6b936ae97139c8dac8020a187b5bbd0fa6d56ed6fab879441b42ba900cc5f2f5a534dafdc86b9249 xkill-1.0.5.tar.bz2" diff --git a/user/xload/APKBUILD b/user/xload/APKBUILD new file mode 100644 index 000000000..71414484b --- /dev/null +++ b/user/xload/APKBUILD @@ -0,0 +1,38 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xload +pkgver=1.1.3 +pkgrel=0 +pkgdesc="Load average monitor for X11" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros + xorgproto-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8dbc4f0cee7b30d7381be819152b27653d9b0049266e59bde2e2c972a88c4f2bdea766fc407bbdfef15d0aab30fedc756189a1048170a812853133a5094fe7a5 xload-1.1.3.tar.bz2" diff --git a/user/xlogo/APKBUILD b/user/xlogo/APKBUILD new file mode 100644 index 000000000..6ed763de5 --- /dev/null +++ b/user/xlogo/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xlogo +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Display the X11 logo" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libsm-dev libx11-dev libxaw-dev libxext-dev libxmu-dev libxt-dev + util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xlogo-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="cbfcd48425e697950907ddeaec2f06e0607ebf2e93e6799bd263230f036b3021279c2f379de55fae15b403af5f18292caa79159ed544a4a3314b90c85ac9804d xlogo-1.0.4.tar.bz2" diff --git a/user/xlsatoms/APKBUILD b/user/xlsatoms/APKBUILD new file mode 100644 index 000000000..bc05dceb0 --- /dev/null +++ b/user/xlsatoms/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xlsatoms +pkgver=1.1.2 +pkgrel=0 +pkgdesc="List interned atoms in an X11 server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxcb-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xlsatoms-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="f29001de22818792212312f1b9daee1bf7afa2ef2ae945cd8c14bdc1a7bb40064d3878c5efea60458ac0bf515ab1ece16fa90cbd2b0a879a5f07f3aa3e6a0baa xlsatoms-1.1.2.tar.bz2" diff --git a/user/xlsclients/APKBUILD b/user/xlsclients/APKBUILD new file mode 100644 index 000000000..81b470a1d --- /dev/null +++ b/user/xlsclients/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xlsclients +pkgver=1.1.4 +pkgrel=0 +pkgdesc="List running clients on an X11 server" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libxcb-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xlsclients-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="42fd848d88d3cf31168a37fed63f9f5b60ddc4f36be2956b354e574c93129d75f29e005d6631784380bcef27860b54c64f419ca18ad77f092f4520dec47b10f4 xlsclients-1.1.4.tar.bz2" diff --git a/user/xlsfonts/APKBUILD b/user/xlsfonts/APKBUILD new file mode 100644 index 000000000..054386397 --- /dev/null +++ b/user/xlsfonts/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xlsfonts +pkgver=1.0.6 +pkgrel=0 +pkgdesc="List available fonts on an X11 server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xlsfonts-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="052a3b1dec23cb20fdfacd4500cb836feb3b888bf568a548ea71deb58a4ba10a1ad5392d658e95272c6d4a1832edf1f19c3de2498b78dca82c43ee52800a30c0 xlsfonts-1.0.6.tar.bz2" diff --git a/user/xmag/APKBUILD b/user/xmag/APKBUILD new file mode 100644 index 000000000..85191ca8d --- /dev/null +++ b/user/xmag/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xmag +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Tool to magnify part of an X11 screen" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xmag-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de xmag-1.0.6.tar.bz2" diff --git a/user/xman/APKBUILD b/user/xman/APKBUILD new file mode 100644 index 000000000..8bc1b8a44 --- /dev/null +++ b/user/xman/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xman +pkgver=1.1.4 +pkgrel=0 +pkgdesc="Read manual pages from the comfort of X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="groff" +makedepends="libxaw-dev libxt-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xman-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="785e973eb15b0300de08aace24f3604dfee61421c7f64ea4cde2e280480bf5d3ad797ab8208668dc023a375494f8db7534fbcaa1c1ef16e79464fdd017b5da68 xman-1.1.4.tar.bz2" diff --git a/user/xmh/APKBUILD b/user/xmh/APKBUILD new file mode 100644 index 000000000..d7594e546 --- /dev/null +++ b/user/xmh/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xmh +pkgver=1.0.3 +pkgrel=0 +pkgdesc="X11 integration for MH message handling system" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xbitmaps" +makedepends="libx11-dev libxaw-dev libxmu-dev libxt-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xmh-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="acc1fb65fe69891272a25f3f45e7e1e7c57ad075bbaac7b3b53577853fbb07598d3ad3ea01130db6b10e3c347550ce23d709363440cbd73897bc39411640c251 xmh-1.0.3.tar.bz2" diff --git a/user/xmore/APKBUILD b/user/xmore/APKBUILD new file mode 100644 index 000000000..bf2d861bd --- /dev/null +++ b/user/xmore/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xmore +pkgver=1.0.2 +pkgrel=0 +pkgdesc="Display text files using X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxaw-dev util-macros" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xmore-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="718ad254beaae57475cead3815fc7625692699c76749c64e3aeb722daf5e1cecbea9d1207e3427d6a5d0aa240a6aaf678ea1656d6731b9f47e1a8045d62c3efb xmore-1.0.2.tar.bz2" diff --git a/user/xorg-apps/APKBUILD b/user/xorg-apps/APKBUILD new file mode 100644 index 000000000..be8cce184 --- /dev/null +++ b/user/xorg-apps/APKBUILD @@ -0,0 +1,26 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xorg-apps +pkgver=1.0 +pkgrel=0 +pkgdesc="X.Org applications (all)" +url="https://www.X.Org/" +arch="noarch" +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" +source="" + +package() { + mkdir -p $pkgdir +} diff --git a/user/xorg-drivers/APKBUILD b/user/xorg-drivers/APKBUILD new file mode 100644 index 000000000..c6442655d --- /dev/null +++ b/user/xorg-drivers/APKBUILD @@ -0,0 +1,29 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xorg-drivers +pkgver=1.0 +pkgrel=0 +pkgdesc="Drivers for X.Org systems" +url="https://www.X.Org/" +arch="all" +license="MIT" +options="!check !dbg" # Metapacakge +subpackages="" +depends="xf86-input-evdev xf86-input-joystick xf86-input-keyboard + xf86-input-libinput xf86-input-mouse xf86-input-synaptics + xf86-input-void xf86-input-wacom + + xf86-video-ast xf86-video-ati xf86-video-cirrus xf86-video-dummy + xf86-video-fbdev xf86-video-freedreno xf86-video-mach64 xf86-video-mga + xf86-video-nouveau xf86-video-openchrome xf86-video-qxl xf86-video-r128 + xf86-video-tdfx" +case $CTARGET_ARCH in + pmmx) + depends="$depends xf86-video-geode xf86-video-intel" ;; + x86_64) + depends="$depends xf86-video-intel" ;; +esac +source="" + +package() { + mkdir -p $pkgdir +} diff --git a/user/xorg-fonts/APKBUILD b/user/xorg-fonts/APKBUILD new file mode 100644 index 000000000..6de6a89cc --- /dev/null +++ b/user/xorg-fonts/APKBUILD @@ -0,0 +1,29 @@ +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xorg-fonts +pkgver=1.0 +pkgrel=0 +pkgdesc="Fonts from X.Org (all)" +url="https://www.X.Org/" +arch="noarch" +license="MIT" +options="!check" # Metapacakge +subpackages="" +depends="font-adobe-75dpi font-adobe-100dpi font-adobe-utopia-75dpi + font-adobe-utopia-100dpi font-adobe-utopia-type1 font-arabic-misc + font-bh-75dpi font-bh-100dpi font-bh-lucidatypewriter-75dpi + font-bh-lucidatypewriter-100dpi font-bitstream-75dpi + font-bitstream-100dpi font-bitstream-speedo font-bitstream-type1 + font-cronyx-cyrillic font-cursor-misc font-daewoo-misc font-dec-misc + font-isas-misc font-jis-misc font-micro-misc font-misc-cyrillic + font-misc-ethiopic font-misc-misc font-mutt-misc font-schumacher-misc + font-screen-cyrillic font-sony-misc font-sun-misc + font-winitzki-cyrillic font-xfree86-type1" +# font-bh-ttf: non-free license +# font-bh-type1: non-free license +# font-ibm-type1: non-free license +# font-misc-meltho: non-free license +source="" + +package() { + mkdir -p $pkgdir +} diff --git a/user/xorg-server/APKBUILD b/user/xorg-server/APKBUILD index 928b86a42..e5f0041eb 100644 --- a/user/xorg-server/APKBUILD +++ b/user/xorg-server/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=xorg-server pkgver=1.20.3 -pkgrel=0 +pkgrel=2 pkgdesc="X.Org X11 server" url="https://www.X.Org/" arch="all" @@ -27,6 +27,7 @@ makedepends="$depends_dev autoconf automake libtool util-macros source="https://www.X.Org/releases/individual/xserver/$pkgname-$pkgver.tar.bz2 autoconfig-sis.patch fix-musl-arm.patch + support-coffeelake.patch " # secfixes: @@ -59,13 +60,9 @@ prepare() { build() { cd "$builddir" - # xorg modules does not work with the -z now and it seems like we - # cannot pass over the linker flag to .so files. so we tweak the - # gcc specs. export CFLAGS="$CFLAGS -D_GNU_SOURCE" [ "$CLIBC" == musl ] && export CFLAGS="$CFLAGS -D__gid_t=gid_t -D__uid_t=uid_t" export LDFLAGS="$LDFLAGS -Wl,-z,lazy" - _fontroot="/usr/share/fonts" ./configure \ --build=$CBUILD \ @@ -73,8 +70,6 @@ build() { --prefix=/usr \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ - --with-fontrootdir=$_fontroot \ - --with-default-font-path=${_fontroot}/misc,${_fontroot}/100dpi:unscaled,${_fontroot}/75dpi:unscaled,${_fontroot}/TTF,${_fontroot}/Type1,${_fontroot}/truetype \ --with-xkb-path=/usr/share/X11/xkb \ --with-xkb-output=/var/lib/xkb \ --without-systemd-daemon \ @@ -147,4 +142,5 @@ xwayland() { sha512sums="ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba xorg-server-1.20.3.tar.bz2 30a78f4278edd535c45ee3f80933427cb029a13abaa4b041f816515fdd8f64f00b9c6aef50d4eba2aaf0d4f333e730399864fd97fa18891273601c77a6637200 autoconfig-sis.patch -b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch" +b799e757a22a61ac283adbd7a8df1ad4eccce0bb6cac38a0c962ba8438bba3cf6637a65bb64859e7b32399fca672283a49960207e186c271ba574580de360d09 fix-musl-arm.patch +1deae020ffd7e3ea91d8d3d8118dbb80c5d08308d9a253deaa3afc42f93ff13d1a93d3aaca7acce5d45213dee9c072a15c3ed385432bc833f403e7c8472e9fd6 support-coffeelake.patch" diff --git a/user/xorg-server/support-coffeelake.patch b/user/xorg-server/support-coffeelake.patch new file mode 100644 index 000000000..99f12aada --- /dev/null +++ b/user/xorg-server/support-coffeelake.patch @@ -0,0 +1,14 @@ +This PCI ID has been seen in the wild on the i7-9700K. + +diff --git a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h +index 82e4a549e..1ef1a0edf 100644 +--- a/hw/xfree86/dri2/pci_ids/i965_pci_ids.h ++++ b/hw/xfree86/dri2/pci_ids/i965_pci_ids.h +@@ -174,6 +174,7 @@ CHIPSET(0x3EA4, cfl_gt1, "Intel(R) HD Graphics (Coffeelake 2x6 GT1)") + CHIPSET(0x3E91, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E92, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E96, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") ++CHIPSET(0x3E98, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E9A, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") + CHIPSET(0x3E9B, cfl_gt2, "Intel(R) UHD Graphics 630 (Coffeelake 3x8 GT2)") + CHIPSET(0x3E94, cfl_gt2, "Intel(R) HD Graphics (Coffeelake 3x8 GT2)") diff --git a/user/xpr/APKBUILD b/user/xpr/APKBUILD new file mode 100644 index 000000000..a8980c5c4 --- /dev/null +++ b/user/xpr/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xpr +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Format an X11 window dump from xwd(1) for printing" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libx11-dev libxmu-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xpr-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d5dfb936ec4ad0067d02654dec8e862fe337ff6a2c2f974b2b3a612a829c2e728a0d51e7aba00ed2a94dc96dc50cc69f2c59f522e0635013f5f4f5bb3f4ab967 xpr-1.0.5.tar.bz2" diff --git a/user/xrefresh/APKBUILD b/user/xrefresh/APKBUILD new file mode 100644 index 000000000..e942b954b --- /dev/null +++ b/user/xrefresh/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xrefresh +pkgver=1.0.6 +pkgrel=0 +pkgdesc="Refresh an X11 screen" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libx11-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xrefresh-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="361e97fecfc2706d5eeab69df0d4dd4baa55b6783cfddabf51d8561b7c930d71ce6c217e0512c6564208d69b04f89c69ea8c0bfb2e4f6cc25b062b55e4db3674 xrefresh-1.0.6.tar.bz2" diff --git a/user/xrx/APKBUILD b/user/xrx/APKBUILD new file mode 100644 index 000000000..97e71a06d --- /dev/null +++ b/user/xrx/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xrx +pkgver=1.0.4 +pkgrel=0 +pkgdesc="X11 Remote eXecution system" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="xtrans" +makedepends="libice-dev libx11-dev libxau-dev libxaw-dev libxext-dev libxt-dev + xorgproto-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="beb505555604a18651f77dee7579d928fa0f529c45ccf77e870fc066f5d0a181e265b96b6a4a4423bd3f76b46c9eed70d513919fe1c936e0671e89ffbfa2a81e xrx-1.0.4.tar.bz2" diff --git a/user/xscope/APKBUILD b/user/xscope/APKBUILD new file mode 100644 index 000000000..9b4ce4205 --- /dev/null +++ b/user/xscope/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xscope +pkgver=1.4.1 +pkgrel=0 +pkgdesc="Monitor communication between an X11 client and server" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xscope-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="0b35bd51ed3118bde72359280a610f6f3f7d5e62f1673e493f13d2118ce07bfe4ae7ccc4231556d1c24f4bd7add88c46a4ea478d825fc9cf3fd723dc662d2874 xscope-1.4.1.tar.bz2" diff --git a/user/xsetmode/APKBUILD b/user/xsetmode/APKBUILD new file mode 100644 index 000000000..37615c3f3 --- /dev/null +++ b/user/xsetmode/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xsetmode +pkgver=1.0.0 +pkgrel=0 +pkgdesc="Set the mode on an XInput device" +url="https://www.X.Org/" +arch="all" +license="MIT" +depends="" +makedepends="libx11-dev libxi-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="a3c1c5e85a0cec35a7db10a57eece07691c0bec79b93987ec4417ebf71544ddffbb4832f78ef524bfcd149beb9852295a2de6a2ccec481cd6eea5633e090abfb xsetmode-1.0.0.tar.bz2" diff --git a/user/xsetpointer/APKBUILD b/user/xsetpointer/APKBUILD new file mode 100644 index 000000000..0e0d5f697 --- /dev/null +++ b/user/xsetpointer/APKBUILD @@ -0,0 +1,43 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xsetpointer +pkgver=1.0.1 +pkgrel=0 +pkgdesc="Set the active pointer device on an X11 display" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxi-dev xorgproto-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="1a462f70dde10c6ce92432440a9e718ba231c49ecbf68f0c2fd2276862edc4e9cd0dd5b6d71ad169b30e4cac7110278e4c8ed48eedd1d6cc0d1bd5e322bbcf58 xsetpointer-1.0.1.tar.bz2" diff --git a/user/xsm/APKBUILD b/user/xsm/APKBUILD new file mode 100644 index 000000000..f3e42cd18 --- /dev/null +++ b/user/xsm/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xsm +pkgver=1.0.4 +pkgrel=0 +pkgdesc="Session manager for X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="iceauth smproxy twm" +makedepends="libice-dev libsm-dev libxaw-dev libxt-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xsm-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="d4e4da7c309a4eae126d2b58a13684f4dbc06b09f76dde9c89c707375df2843614f3d83bc44f9cd02f239200db3397abd86796dca0dbafc69f60482b0af5a176 xsm-1.0.4.tar.bz2" diff --git a/user/xstdcmap/APKBUILD b/user/xstdcmap/APKBUILD new file mode 100644 index 000000000..5c2622cf3 --- /dev/null +++ b/user/xstdcmap/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xstdcmap +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Define standard X11 colour map properties" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev libxmu-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xstdcmap-$pkgver.tar.bz2" + +prepare() { + cd "$builddir" + default_prepare + chmod a+w config.sub + update_config_sub +} + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="8037ddb9c6b8f3a65d35637a1fca2b1b6c7e76afce5c13b1947cf72c3ca87679aa2ed05caf308d90549432b7fe029a522a99f32701bd0087c140bf4fafdb4d49 xstdcmap-1.0.3.tar.bz2" diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD index edec39639..5466d1c55 100644 --- a/user/xterm/APKBUILD +++ b/user/xterm/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com> pkgname=xterm -pkgver=340 +pkgver=344 pkgrel=0 pkgdesc="An X-based terminal emulator" url="https://invisible-island.net/xterm/" @@ -11,11 +11,13 @@ license="X11" makedepends="libx11-dev libsm-dev libice-dev libxt-dev utmps-dev libxaw-dev libxext-dev freetype-dev ncurses-dev pcre-dev" subpackages="$pkgname-doc" -source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz" +source="ftp://ftp.invisible-island.net/xterm/xterm-$pkgver.tgz + posix-ptmx.patch + " build() { cd "$builddir" - LIBS="-lutmps -lskarnet -ltinfow" ./configure \ + LIBS="-ltinfow" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -23,7 +25,18 @@ build() { --mandir=/usr/share/man \ --localstatedir=/var \ --with-pcre - make + # This is NOT A TYPO! + # + # XTerm does not use ld(1) as a linker. It uses a shell script + # called 'plink.sh' which tries to Be Smart, but is actually + # Quite Dumb. + # + # It determines that the utmp symbols are in musl, and decides + # -lutmps really isn't necessary. However! There is some solace. + # + # -k is like -l, but is forced, even if it isn't "really needed". + # So we use -k for utmps. + make EXTRA_LOADFLAGS="-kutmps -lskarnet" } package() { @@ -31,4 +44,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="9a150741868fb681e71f4e3644748ea62fd73f9babbbe0baaca24f8c65d96c2ca434abcca713c2d337ec83e2264903b0f98fa6c9dbc3e3ac19c69a98d4c0a033 xterm-340.tgz" +sha512sums="872f69e13ad8e26de355f7611dabc7a66e2f6b00313b440b8054cc4fa0fbde936dd8d54ec09c892e8760080acaccbd8b7e72cdcbebb291dd92e01593eb14e91a xterm-344.tgz +e29ef756243faa6f5ced3c74d6879b4fc8f9839501becae49af4f458d0f499bcda40a0eb66dada9cae8bf9789256daf3d1605ac1b5b4301654d8b5ac6eaca81d posix-ptmx.patch" diff --git a/user/xterm/posix-ptmx.patch b/user/xterm/posix-ptmx.patch new file mode 100644 index 000000000..351aba9ab --- /dev/null +++ b/user/xterm/posix-ptmx.patch @@ -0,0 +1,21 @@ +--- xterm/main.c.old ++++ xterm/main.c +@@ -2654,7 +2654,7 @@ get_pty(int *pty, char *from GCC_UNUSED) + close(opened_tty); + opened_tty = -1; + } +-#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) && defined(HAVE_GRANTPT_PTY_ISATTY) ++#elif defined(HAVE_POSIX_OPENPT) && defined(HAVE_PTSNAME) + if ((*pty = posix_openpt(O_RDWR)) >= 0) { + char *name = ptsname(*pty); + if (name != 0) { +@@ -3735,7 +3735,7 @@ spawnXTerm(XtermWidget xw) + /* + * now in child process + */ +-#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) ++#if defined(_POSIX_VERSION) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) + int pgrp = setsid(); /* variable may not be used... */ + #else + int pgrp = getpid(); + diff --git a/user/xvidtune/APKBUILD b/user/xvidtune/APKBUILD new file mode 100644 index 000000000..4c4e9d8b7 --- /dev/null +++ b/user/xvidtune/APKBUILD @@ -0,0 +1,44 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xvidtune +pkgver=1.0.3 +pkgrel=0 +pkgdesc="Tune video modes on an X11 display" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxaw-dev libxmu-dev libxxf86vm-dev" +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 \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352 xvidtune-1.0.3.tar.bz2" diff --git a/user/xvinfo/APKBUILD b/user/xvinfo/APKBUILD new file mode 100644 index 000000000..82d0e29ad --- /dev/null +++ b/user/xvinfo/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xvinfo +pkgver=1.1.3 +pkgrel=0 +pkgdesc="View information about video adaptors attached to X11" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libxv-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xvinfo-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="df8356898390d2aec4fbd15cee1627bb86b57ff8af41a527d4f6f6703a81f399a3098da342b94af6d4cf4a817d9fda1946a206bfbe3995e87ceb9910bb8b51bc xvinfo-1.1.3.tar.bz2" diff --git a/user/xwd/APKBUILD b/user/xwd/APKBUILD new file mode 100644 index 000000000..c7bd606be --- /dev/null +++ b/user/xwd/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xwd +pkgver=1.0.7 +pkgrel=0 +pkgdesc="Dump the contents of an X11 window to a file" +url="https://www.X.Org/" +arch="all" +license="X11 AND MIT" +depends="" +makedepends="libx11-dev libxkbfile-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xwd-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="6fdb0a115ae505169bbc7fcc45580daf26bced2e26e0bf9a877636016038931a8386e8edcbe015f4024be508d0461906adef4834cf22a445e3c282f0b8fad17e xwd-1.0.7.tar.bz2" diff --git a/user/xwud/APKBUILD b/user/xwud/APKBUILD new file mode 100644 index 000000000..72f7e9e50 --- /dev/null +++ b/user/xwud/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: A. Wilcox <awilfox@adelielinux.org> +# Maintainer: A. Wilcox <awilfox@adelielinux.org> +pkgname=xwud +pkgver=1.0.5 +pkgrel=0 +pkgdesc="Display the contents of an X11 window dumped by xwd(1)" +url="https://www.X.Org/" +arch="all" +license="X11" +depends="" +makedepends="libx11-dev util-macros xorgproto-dev" +subpackages="$pkgname-doc" +source="https://www.x.org/releases/individual/app/xwud-$pkgver.tar.bz2" + +build() { + cd "$builddir" + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var + make +} + +check() { + cd "$builddir" + make check +} + +package() { + cd "$builddir" + make DESTDIR="$pkgdir" install +} + +sha512sums="27a0ce7481978ae6cd94b0d94374af72185e270d68f2496620e148bb00945427c4827138d9efc48745e6382e3da3390ed0cdff7dbd02dcf9706e8ecccae97184 xwud-1.0.5.tar.bz2" |