diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/firefox/PKGBUILD | 7 | ||||
| -rw-r--r-- | extra/firefox/mozconfig.patch | 20 | ||||
| -rw-r--r-- | extra/lightdm/PKGBUILD | 7 | ||||
| -rw-r--r-- | extra/linux-pae/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/linux-pae/config | 2 | ||||
| -rw-r--r-- | extra/linux-zen/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/linux-zen/config | 13 | ||||
| -rw-r--r-- | extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch | 27 | ||||
| -rw-r--r-- | extra/nasm/PKGBUILD | 8 |
9 files changed, 47 insertions, 49 deletions
diff --git a/extra/firefox/PKGBUILD b/extra/firefox/PKGBUILD index 81c26086..f886c6af 100644 --- a/extra/firefox/PKGBUILD +++ b/extra/firefox/PKGBUILD @@ -1,12 +1,15 @@ +source+=('mozconfig.patch') +sha256sums+=('a9f99789801106d82ec48839d25c0b3358f6641a55d20b4d686f10197b14322d') eval "$( declare -f build | \ sed ' - /cd mozilla-unified/a sed -i "s/\\(cargo_rustc_flags += -C lto\\)/#\\1/" config/rules.mk + 2 a export RUSTFLAGS+=" -Cdebuginfo=0 -Clto=off" + 2 a export LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" ' declare -f prepare | \ sed ' $ i export MOZ_SOURCE_CHANGESET="DEVEDITION_${pkgver//./_}_RELEASE" - $ i LDFLAGS+=" -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" + $ i patch -p1 -i "$srcdir/mozconfig.patch" ' )" for ((i=0; i<${#source[@]}; i++)); do diff --git a/extra/firefox/mozconfig.patch b/extra/firefox/mozconfig.patch new file mode 100644 index 00000000..d36e5532 --- /dev/null +++ b/extra/firefox/mozconfig.patch @@ -0,0 +1,20 @@ +--- a/.mozconfig 2019-01-21 09:21:00.221010326 +0100 ++++ b/.mozconfig 2019-01-21 09:22:02.477911431 +0100 +@@ -6,12 +6,11 @@ + ac_add_options --enable-optimize + ac_add_options --enable-rust-simd + ac_add_options --enable-lto +-export MOZ_PGO=1 +-export CC=clang +-export CXX=clang++ +-export AR=llvm-ar +-export NM=llvm-nm +-export RANLIB=llvm-ranlib ++export CC=gcc ++export CXX=g++ ++export AR=gcc-ar ++export NM=gcc-nm ++export RANLIB=gcc-ranlib + + # Branding + ac_add_options --enable-official-branding diff --git a/extra/lightdm/PKGBUILD b/extra/lightdm/PKGBUILD new file mode 100644 index 00000000..415ddd35 --- /dev/null +++ b/extra/lightdm/PKGBUILD @@ -0,0 +1,7 @@ +eval "$( + declare -f package_lightdm | \ + sed ' + /install.*lightdm.service/ a \ + sed -i \"/.*Service.*/ a LimitMEMLOCK=infinity\" "${pkgdir}"/usr/lib/systemd/system/lightdm.service + ' +)" diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD index 2fc41268..7fae9527 100644 --- a/extra/linux-pae/PKGBUILD +++ b/extra/linux-pae/PKGBUILD @@ -4,7 +4,7 @@ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgbase=linux-pae # Build stock -ARCH kernel -pkgver='4.20.1' +pkgver='4.20.3' _srcname=linux-${pkgver} pkgrel='1' arch=('i686') @@ -24,9 +24,9 @@ validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman ) -sha256sums=('45096f1ffbfbb4cdeef6eecfa6ca7eabbf534f04645fd0d849564a58ddd2198f' +sha256sums=('b9c1bd128404a8e73b57f764256fcaca8eb09f9a892e292856dbeffafa187f45' 'SKIP' - 'b5f3d1a14dce62f52c6cf4efb67751cc6080515b2c969912f724e280b9b78060' + 'a0ee4ea4736117b4e2e4c47edbfe5870777d3b543ccf7040d8b7a1a7ecc08419' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' diff --git a/extra/linux-pae/config b/extra/linux-pae/config index e09adaad..4084a268 100644 --- a/extra/linux-pae/config +++ b/extra/linux-pae/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.20.1-1 Kernel Configuration +# Linux/x86 4.20.3-1 Kernel Configuration # # diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD index 6bb4429f..70b1e143 100644 --- a/extra/linux-zen/PKGBUILD +++ b/extra/linux-zen/PKGBUILD @@ -1,9 +1,9 @@ -# upstream git revision: fb4c47a088b60d47933a0ca736a856a3ed6b80a2 +# upstream git revision: 409fb3f6d729c6bb78d9df1238165c800ba2eaba # fail if upstream's .config changes for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = '071bdc3d814a56a80c4e40301bcd518662bd9374d6f73b1c9a97b705c5c82bc0' ]; then - sha256sums[${i}]='d71c3aed22dca41b2398d187e2f30427b6f8643fcc16006bac46c11e9ff8f6f1' + if [ "${sha256sums[${i}]}" = 'bdf972dad118e0dd2ee1bb92f2a009d4c81eb11ff7f54b069d4331a23531af1d' ]; then + sha256sums[${i}]='e845b79f1110f1a6fc29b04d0cb6b3248eb0ef4765dbd97341bbe23744bdea3d' fi done diff --git a/extra/linux-zen/config b/extra/linux-zen/config index c5cbfe9c..b8566dda 100644 --- a/extra/linux-zen/config +++ b/extra/linux-zen/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.20.0-zen1 Kernel Configuration +# Linux/x86 4.20.3-zen1 Kernel Configuration # # @@ -17,6 +17,7 @@ CONFIG_THREAD_INFO_IN_TASK=y # General setup # CONFIG_ZEN_INTERACTIVE=y +# CONFIG_SCHED_MUQSS is not set CONFIG_INIT_ENV_ARG_LIMIT=32 # CONFIG_COMPILE_TEST is not set CONFIG_LOCALVERSION="-zen" @@ -65,6 +66,7 @@ CONFIG_GENERIC_MSI_IRQ_DOMAIN=y CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y CONFIG_GENERIC_IRQ_RESERVATION_MODE=y CONFIG_IRQ_FORCED_THREADING=y +CONFIG_IRQ_FORCED_THREADING_DEFAULT=y CONFIG_SPARSE_IRQ=y # CONFIG_GENERIC_IRQ_DEBUGFS is not set CONFIG_CLOCKSOURCE_WATCHDOG=y @@ -379,6 +381,8 @@ CONFIG_NR_CPUS=8 CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y CONFIG_SCHED_MC_PRIO=y +CONFIG_RQ_NONE=y +CONFIG_SHARERQ=0 CONFIG_X86_LOCAL_APIC=y CONFIG_X86_IO_APIC=y CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y @@ -915,7 +919,7 @@ CONFIG_MODULES=y CONFIG_MODULE_FORCE_LOAD=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_MODVERSIONS=y +# CONFIG_MODVERSIONS is not set CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_MODULE_SIG=y # CONFIG_MODULE_SIG_FORCE is not set @@ -2413,7 +2417,6 @@ CONFIG_RAID_ATTRS=m CONFIG_SCSI=m CONFIG_SCSI_DMA=y CONFIG_SCSI_NETLINK=y -CONFIG_SCSI_MQ_DEFAULT=y CONFIG_SCSI_PROC_FS=y # @@ -7313,10 +7316,10 @@ CONFIG_TYPEC_MUX_PI3USB30532=m # USB Type-C Alternate Mode drivers # CONFIG_TYPEC_DP_ALTMODE=m +CONFIG_USB_ROLE_SWITCH=m CONFIG_USB_ROLES_INTEL_XHCI=m CONFIG_USB_LED_TRIG=y CONFIG_USB_ULPI_BUS=m -CONFIG_USB_ROLE_SWITCH=m CONFIG_UWB=m CONFIG_UWB_HWA=m CONFIG_UWB_WHCI=m @@ -9372,7 +9375,7 @@ CONFIG_CRYPTO_CBC=m CONFIG_CRYPTO_CFB=m CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_CTS=m -CONFIG_CRYPTO_ECB=y +CONFIG_CRYPTO_ECB=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PCBC=m diff --git a/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch b/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch deleted file mode 100644 index 87ec601c..00000000 --- a/extra/nasm/0001-Remove-invalid-pure_func-qualifiers.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d0dabb46a821b2506681f882af0d5696d2c2bade Mon Sep 17 00:00:00 2001 -From: Michael Simacek <msimacek@redhat.com> -Date: Thu, 8 Feb 2018 14:47:08 +0100 -Subject: [PATCH] Remove invalid pure_func qualifiers - ---- - include/nasmlib.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/include/nasmlib.h b/include/nasmlib.h -index 79e866b..c93cef0 100644 ---- a/include/nasmlib.h -+++ b/include/nasmlib.h -@@ -191,8 +191,8 @@ int64_t readstrnum(char *str, int length, bool *warn); - * seg_init: Initialise the segment-number allocator. - * seg_alloc: allocate a hitherto unused segment number. - */ --void pure_func seg_init(void); --int32_t pure_func seg_alloc(void); -+void seg_init(void); -+int32_t seg_alloc(void); - - /* - * many output formats will be able to make use of this: a standard --- -2.14.3 - diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 7af19efd..f1a34d1a 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,11 +1,3 @@ -# see FS#60380 -source+=('0001-Remove-invalid-pure_func-qualifiers.patch') -sha512sums+=('3bf974c067d16144d1457c0ef4d63bab511e6949923338cc7555169b297617ed0ec3de5825faf85afd5da735aa46f7d2e603319badead7e8bc1f6a4d58f1bd2d') -prepare() { - cd $pkgname-$pkgver - patch -Np1 -i "$srcdir/0001-Remove-invalid-pure_func-qualifiers.patch" -} - # remove ttf-liberation on i486 (X packages missing for installing the font) makedepends=(${makedepends[@]//ttf-liberation/}) makedepends_i686+=(ttf-liberation) |