From 39ee03ec59a7850bef390e15148a8c32d3ab49c8 Mon Sep 17 00:00:00 2001 From: Kai Date: Mon, 14 Aug 2023 18:01:52 -0400 Subject: [PATCH 01/13] Add sill package (#719) --- package/sill/package | 31 +++++++++++++++++++++++++++++++ package/sill/sill.draft | 7 +++++++ 2 files changed, 38 insertions(+) create mode 100644 package/sill/package create mode 100644 package/sill/sill.draft diff --git a/package/sill/package b/package/sill/package new file mode 100644 index 000000000..773f1e33a --- /dev/null +++ b/package/sill/package @@ -0,0 +1,31 @@ +#!/usr/bin/env bash +# Copyright (c) 2020 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(sill) +pkgdesc="Gesture-based text editor (and shell) for the reMarkable tablet" +url=https://github.com/bkirwi/sill +pkgver=0.1.1-alpha +section="writing" +timestamp=2023-08-12T00:00Z +maintainer="Kai " +license="Apache-2.0" + +image=rust:v3.0 +source=( + https://github.com/bkirwi/sill/archive/refs/tags/v0.1.1.tar.gz + sill.draft +) +sha256sums=( + ed3ef2f7ff37101db16f7020e6af86da6c32e78d76247c91a1676b72ce87e3df + SKIP +) + +build() { + cargo build --release +} + +package() { + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/target/armv7-unknown-linux-gnueabihf/release/sill + install -D -m 644 "$srcdir"/sill.draft "$pkgdir"/opt/etc/draft/sill.draft +} diff --git a/package/sill/sill.draft b/package/sill/sill.draft new file mode 100644 index 000000000..58349bed1 --- /dev/null +++ b/package/sill/sill.draft @@ -0,0 +1,7 @@ +# Copyright (c) 2021 The Toltec Contributors +# SPDX-License-Identifier: MIT + +name=Sill +desc= Gesture-based text editor (and shell) for the reMarkable tablet +call=/opt/bin/sill +term=: From e7141224967e90dd7e5dcfa4ba120a3162d443d2 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Mon, 14 Aug 2023 21:57:16 -0600 Subject: [PATCH 02/13] =?UTF-8?q?Add=20terminfo=20dependency=20to=20yaft?= =?UTF-8?q?=20and=20add=20/opt/etc/profile=20to=20/etc/prof=E2=80=A6=20(#7?= =?UTF-8?q?15)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add terminfo dependency to yaft and add /opt/etc/profile to /etc/profile.d * Don't override TERM if it's already set, and run bash with profile includes from yaft --- package/toltec-base/package | 7 ++++++- package/yaft/bash-l.patch | 13 +++++++++++++ package/yaft/package | 7 +++++-- 3 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 package/yaft/bash-l.patch diff --git a/package/toltec-base/package b/package/toltec-base/package index be161fc8a..87dd4aa26 100644 --- a/package/toltec-base/package +++ b/package/toltec-base/package @@ -6,7 +6,7 @@ archs=(rm1 rm2) pkgnames=(toltec-base) pkgdesc="Metapackage defining the base set of packages in a Toltec install" url=https://toltec-dev.org/ -pkgver=1.2-1 +pkgver=1.2-2 timestamp=2023-05-08T19:31Z section="utils" maintainer="Eeems " @@ -24,6 +24,11 @@ package() { } configure() { + ln -sf /opt/etc/profile /etc/profile.d/toltec.sh + # shellcheck disable=SC2016 + sed -i \ + -e 's|^export TERM=xterm|if \[ -z "$TERM" \];then export TERM=xterm;fi|' \ + /opt/etc/profile if is-enabled "update-engine.service"; then echo "Disabling automatic update" systemctl disable --now update-engine diff --git a/package/yaft/bash-l.patch b/package/yaft/bash-l.patch new file mode 100644 index 000000000..ad6d27be7 --- /dev/null +++ b/package/yaft/bash-l.patch @@ -0,0 +1,13 @@ +diff --git a/apps/yaft/main.cpp b/apps/yaft/main.cpp +index baa1f56..1d4ee6a 100755 +--- a/apps/yaft/main.cpp ++++ b/apps/yaft/main.cpp +@@ -200,7 +200,7 @@ main(int argc, const char* argv[]) { + extern volatile sig_atomic_t need_redraw; + extern volatile sig_atomic_t child_alive; + extern struct termios termios_orig; +- static const char* shell_args[2] = { shell_cmd, NULL }; ++ static const char* shell_args[3] = { shell_cmd, "-l", NULL }; + + Keyboard keyboard; + diff --git a/package/yaft/package b/package/yaft/package index a79d95d26..8bc4e5154 100644 --- a/package/yaft/package +++ b/package/yaft/package @@ -6,26 +6,29 @@ pkgnames=(yaft) pkgdesc="Yet another framebuffer terminal" url=https://github.com/timower/rM2-stuff/tree/master/apps/yaft _tag=0.0.8 -pkgver=${_tag}-1 +pkgver=${_tag}-2 timestamp=2021-05-02T09:23Z maintainer="Mattéo Delabre " license=GPL-3.0 section="admin" image=base:v2.3 -installdepends=(display) +installdepends=(display terminfo) source=( "https://github.com/timower/rM2-stuff/archive/refs/tags/v${_tag}.zip" input.patch + bash-l.patch ) sha256sums=( 718a9fc7a8e26d587bac790fd83ad8242978b59745269b2ff213e04820bf45b8 SKIP + SKIP ) build() { patch -u libs/rMlib/Device.cpp -i input.patch + patch -u apps/yaft/main.cpp -i bash-l.patch mkdir build mkdir install cd build From 728e57bebf8aee6682ac80025bc1f52160c15b27 Mon Sep 17 00:00:00 2001 From: pr0fsmith <54153368+pr0fsmith@users.noreply.github.com> Date: Tue, 15 Aug 2023 19:51:02 -0400 Subject: [PATCH 03/13] rMscreens (#571) * Add changescrn package --------- Co-authored-by: Nathaniel van Diepen --- package/rmscreens/package | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 package/rmscreens/package diff --git a/package/rmscreens/package b/package/rmscreens/package new file mode 100644 index 000000000..a2670ea70 --- /dev/null +++ b/package/rmscreens/package @@ -0,0 +1,19 @@ +#!/usr/bin/env bash +# Copyright (c) 2020 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(changescrn) +pkgdesc="Change sleep/suspend/poweroff/reboot screens" +url=https://github.com/pr0fsmith/rMscreens/ +pkgver=1.0.0-1 +timestamp=2022-03-15T01:28:33Z +section="utils" +maintainer="pr0fsmith " +license=GPL-3.0 + +source=(https://github.com/pr0fsmith/rMscreens/archive/6d04e97b3997873f0f8b1bd50283ae7ed9be7abd.zip) +sha256sums=(3c2e8b0952d848d7326c0a4ce45da625dd7fd0fbc6b564a2d40c3b97015138e3) + +package() { + install -Dm755 "$srcdir"/changescrn "$pkgdir/opt/bin/changescrn" +} From 4f874ca44a593c6b2303bd18493f6ec7a040a4e4 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 16 Aug 2023 13:14:55 -0400 Subject: [PATCH 04/13] package/linux-mainline: Bump to 6.2 (#657) * package/linux-mainline: Bump to 6.1 Signed-off-by: Alistair Francis * package/linux-mainline: Bump to 6.2 Signed-off-by: Alistair Francis --------- Signed-off-by: Alistair Francis Co-authored-by: Nathaniel van Diepen --- package/linux-mainline/package | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/package/linux-mainline/package b/package/linux-mainline/package index fe964dfc6..6787f77ca 100644 --- a/package/linux-mainline/package +++ b/package/linux-mainline/package @@ -6,7 +6,7 @@ archs=(rm2) pkgnames=(linux-mainline) pkgdesc="reMarkable 2 kernel based on the mainline kernel" url=https://www.kernel.org -pkgver=6.0.0-1 +pkgver=6.2.0-1 timestamp=2022-05-22T21:50:09Z section=kernel maintainer="Alistair Francis " @@ -15,8 +15,8 @@ license=GPL-2.0-only flags=(nostrip) image=base:v2.3 -source=("https://github.com/alistair23/linux/archive/4c2ef4e3bba89a8d767eccb85a242b2cd8850146.tar.gz") -sha256sums=(1583d553380a656ecaac8dab89558051e9165983381adc9c3d52fb8ac0ce19fd) +source=("https://github.com/alistair23/linux/archive/8241218883331bfdc0800f30eb337ff97b7c648c.tar.gz") +sha256sums=(de69fc74f1d25f447da170967eeea13b24354e9b8aa1927addcaa88c2ea9cd7c) build() { ARCH=arm make imx_v6_v7_defconfig @@ -48,8 +48,9 @@ configure() { echo echo "Known issues with the mainline kernel:" echo " - No support for low power mode (suspend uses more power then it should)" - echo " - WiFi sometimes is off on boot (can be turned on again though)" + echo " - Device doesn't always resume from suspend, a reboot is required" echo " - GUI shutdown in Oxide doesn't work" - echo " - Wacom stylus doesn't work in Xochitl (works everywhere else though)" + echo " - Wacom stylus doesn't work in Xochitl (https://github.com/reMarkable/linux/issues/15)" + echo " - Finger input doesn't work in Koreader (https://github.com/koreader/koreader/issues/10012)" echo " - No OTG control support" } From 5ca1fc5e57a858499dd8f0c6fe08d25a3eca2c52 Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 16 Aug 2023 21:57:36 -0600 Subject: [PATCH 05/13] Add issue templates (#711) --- .github/ISSUE_TEMPLATE/documentation-issue.md | 20 +++++++++++ .../ISSUE_TEMPLATE/documentation-request.md | 20 +++++++++++ .github/ISSUE_TEMPLATE/installation-issue.md | 31 ++++++++++++++++ .github/ISSUE_TEMPLATE/package-issue.md | 35 +++++++++++++++++++ .github/ISSUE_TEMPLATE/package-request.md | 14 ++++++++ 5 files changed, 120 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/documentation-issue.md create mode 100644 .github/ISSUE_TEMPLATE/documentation-request.md create mode 100644 .github/ISSUE_TEMPLATE/installation-issue.md create mode 100644 .github/ISSUE_TEMPLATE/package-issue.md create mode 100644 .github/ISSUE_TEMPLATE/package-request.md diff --git a/.github/ISSUE_TEMPLATE/documentation-issue.md b/.github/ISSUE_TEMPLATE/documentation-issue.md new file mode 100644 index 000000000..90a044823 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/documentation-issue.md @@ -0,0 +1,20 @@ +--- +name: Documentation Issue +about: Report an issue with the documentation +title: '' +labels: bug, documentation +assignees: '' + +--- + +**Describe the issue** +A clear and concise description of what the issue with the documentation is. + +**Potential resolution** +A clear and concise description of what you expected to happen. + +**Links** +If applicable, add links to the documentation in question. + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/documentation-request.md b/.github/ISSUE_TEMPLATE/documentation-request.md new file mode 100644 index 000000000..93afde795 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/documentation-request.md @@ -0,0 +1,20 @@ +--- +name: Documentation request +about: Request changes to the documentation +title: '' +labels: documentation +assignees: '' + +--- + +**Is your documentation request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/installation-issue.md b/.github/ISSUE_TEMPLATE/installation-issue.md new file mode 100644 index 000000000..9ac89311b --- /dev/null +++ b/.github/ISSUE_TEMPLATE/installation-issue.md @@ -0,0 +1,31 @@ +--- +name: Installation issue +about: Report an issue with the installation process +title: '' +labels: bug, install +assignees: '' + +--- + +**Describe the issue** +A clear and concise description of what the issue is. + +**To Reproduce** +Steps to reproduce the behaviour: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behaviour** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Device information (please complete the following information):** + - Device: [e.g. reMarkable 2] + - OS version: [e.g. 2.15] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/package-issue.md b/.github/ISSUE_TEMPLATE/package-issue.md new file mode 100644 index 000000000..eae009fe4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/package-issue.md @@ -0,0 +1,35 @@ +--- +name: Package Issue +about: Create a report to help us improve +title: '' +labels: bug, packages +assignees: '' + +--- + +**Describe the issue** +A clear and concise description of what the issue is. + +**To Reproduce** +Steps to reproduce the behaviour: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behaviour** +A clear and concise description of what you expected to happen. + +**Upstream issue** +If applicable, add the link to the upstream issue here. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Device/Package information (please complete the following information):** + - Device: [e.g. reMarkable 2] + - OS version: [e.g. 2.15] + - Package: [e.g. toltec-base 0.0.1-1] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/package-request.md b/.github/ISSUE_TEMPLATE/package-request.md new file mode 100644 index 000000000..9c00eae55 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/package-request.md @@ -0,0 +1,14 @@ +--- +name: Package request +about: Request a package be added to toltec +title: Add [package] to toltec +labels: packages +assignees: '' + +--- + +**Package information** +Add the name of the package, and a link to where the source can be found. + +**Reason for addition** +Provide some basic information about why you'd need this package, and what it provides that existing packages don't. From 2d12d1516d72094aea058cd79e10cb937648aff7 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Thu, 24 Aug 2023 15:59:48 -0400 Subject: [PATCH 06/13] package/linux-mainline: Use a custom defconfig (#723) * package/linux-mainline: Use a custom defconfig Use a reMarkable specific defconfig that is checked into toltec. Currently this is an exact copy of the mainline defconfig (so no functional changes) but in the future this can be patched to enable/disable features as required. Signed-off-by: Alistair Francis Co-authored-by: Nathaniel van Diepen --- package/linux-mainline/package | 15 +- package/linux-mainline/remarkable_defconfig | 487 ++++++++++++++++++++ 2 files changed, 498 insertions(+), 4 deletions(-) create mode 100644 package/linux-mainline/remarkable_defconfig diff --git a/package/linux-mainline/package b/package/linux-mainline/package index 6787f77ca..9838b9ead 100644 --- a/package/linux-mainline/package +++ b/package/linux-mainline/package @@ -6,7 +6,7 @@ archs=(rm2) pkgnames=(linux-mainline) pkgdesc="reMarkable 2 kernel based on the mainline kernel" url=https://www.kernel.org -pkgver=6.2.0-1 +pkgver=6.2.0-2 timestamp=2022-05-22T21:50:09Z section=kernel maintainer="Alistair Francis " @@ -15,11 +15,18 @@ license=GPL-2.0-only flags=(nostrip) image=base:v2.3 -source=("https://github.com/alistair23/linux/archive/8241218883331bfdc0800f30eb337ff97b7c648c.tar.gz") -sha256sums=(de69fc74f1d25f447da170967eeea13b24354e9b8aa1927addcaa88c2ea9cd7c) +source=( + https://github.com/alistair23/linux/archive/8241218883331bfdc0800f30eb337ff97b7c648c.tar.gz + remarkable_defconfig +) +sha256sums=( + de69fc74f1d25f447da170967eeea13b24354e9b8aa1927addcaa88c2ea9cd7c + f4d8cbb2c0e7bff5b151729b45064eb9e95005cb91899f0a9df038343d95ebf2 +) build() { - ARCH=arm make imx_v6_v7_defconfig + cp remarkable_defconfig arch/arm/configs/ + ARCH=arm make remarkable_defconfig ARCH=arm make -j8 } diff --git a/package/linux-mainline/remarkable_defconfig b/package/linux-mainline/remarkable_defconfig new file mode 100644 index 000000000..00af8d735 --- /dev/null +++ b/package/linux-mainline/remarkable_defconfig @@ -0,0 +1,487 @@ +CONFIG_KERNEL_LZO=y +CONFIG_SYSVIPC=y +CONFIG_NO_HZ_IDLE=y +CONFIG_HIGH_RES_TIMERS=y +CONFIG_BPF_SYSCALL=y +CONFIG_PREEMPT_VOLUNTARY=y +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_CGROUPS=y +CONFIG_CGROUP_BPF=y +CONFIG_RELAY=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_EXPERT=y +CONFIG_PERF_EVENTS=y +CONFIG_ARCH_MULTI_V6=y +CONFIG_ARCH_MXC=y +CONFIG_SOC_IMX31=y +CONFIG_SOC_IMX35=y +CONFIG_SOC_IMX50=y +CONFIG_SOC_IMX51=y +CONFIG_SOC_IMX53=y +CONFIG_SOC_IMX6Q=y +CONFIG_SOC_IMX6SL=y +CONFIG_SOC_IMX6SLL=y +CONFIG_SOC_IMX6SX=y +CONFIG_SOC_IMX6UL=y +CONFIG_SOC_IMX7D=y +CONFIG_SOC_IMX7ULP=y +CONFIG_SOC_VF610=y +CONFIG_SMP=y +CONFIG_ARM_PSCI=y +CONFIG_HIGHMEM=y +CONFIG_ARCH_FORCE_MAX_ORDER=14 +CONFIG_CMDLINE="noinitrd console=ttymxc0,115200" +CONFIG_KEXEC=y +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPUFREQ_DT=y +CONFIG_ARM_IMX6Q_CPUFREQ=y +CONFIG_ARM_IMX_CPUFREQ_DT=y +CONFIG_CPU_IDLE=y +CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_VFP=y +CONFIG_NEON=y +CONFIG_PM_DEBUG=y +CONFIG_PM_TEST_SUSPEND=y +CONFIG_KPROBES=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODVERSIONS=y +CONFIG_MODULE_SRCVERSION_ALL=y +CONFIG_BINFMT_MISC=m +# CONFIG_COMPAT_BRK is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_NETFILTER=y +CONFIG_CAN=y +CONFIG_BT=y +CONFIG_BT_BNEP=m +CONFIG_BT_HCIUART=y +CONFIG_BT_HCIUART_LL=y +CONFIG_CFG80211=y +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=y +CONFIG_RFKILL=y +CONFIG_RFKILL_INPUT=y +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_IMX6=y +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +CONFIG_IMX_WEIM=y +CONFIG_CONNECTOR=y +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_INTELEXT=y +CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_CFI_STAA=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_DATAFLASH=y +CONFIG_MTD_SST25L=y +CONFIG_MTD_RAW_NAND=y +CONFIG_MTD_NAND_GPMI_NAND=y +CONFIG_MTD_NAND_VF610_NFC=y +CONFIG_MTD_NAND_MXC=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_FASTMAP=y +CONFIG_MTD_UBI_BLOCK=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_SIZE=65536 +CONFIG_EEPROM_AT24=y +CONFIG_EEPROM_AT25=y +# CONFIG_SCSI_PROC_FS is not set +CONFIG_BLK_DEV_SD=y +# CONFIG_BLK_DEV_BSG is not set +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y +CONFIG_SCSI_SCAN_ASYNC=y +CONFIG_ATA=y +CONFIG_SATA_AHCI_PLATFORM=y +CONFIG_AHCI_IMX=y +CONFIG_PATA_IMX=y +CONFIG_NETDEVICES=y +# CONFIG_NET_VENDOR_BROADCOM is not set +CONFIG_CS89x0_PLATFORM=y +# CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_SEEQ is not set +CONFIG_SMC91X=y +CONFIG_SMC911X=y +CONFIG_SMSC911X=y +# CONFIG_NET_VENDOR_STMICRO is not set +CONFIG_MICREL_PHY=y +CONFIG_AT803X_PHY=y +CONFIG_CAN_FLEXCAN=y +CONFIG_USB_PEGASUS=m +CONFIG_USB_RTL8150=m +CONFIG_USB_RTL8152=y +CONFIG_USB_LAN78XX=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_CDC_EEM=m +CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_MCS7830=y +CONFIG_ATH10K=m +CONFIG_ATH10K_SDIO=m +CONFIG_BRCMFMAC=m +CONFIG_MWIFIEX=m +CONFIG_MWIFIEX_SDIO=m +CONFIG_MWIFIEX_PCIE=m +CONFIG_WL12XX=m +CONFIG_WL18XX=m +CONFIG_WLCORE_SDIO=m +# CONFIG_WILINK_PLATFORM_DATA is not set +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_EVBUG=m +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_SNVS_PWRKEY=y +CONFIG_KEYBOARD_IMX=y +CONFIG_MOUSE_PS2=m +CONFIG_MOUSE_PS2_ELANTECH=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ADS7846=y +CONFIG_TOUCHSCREEN_AD7879=y +CONFIG_TOUCHSCREEN_AD7879_I2C=y +CONFIG_TOUCHSCREEN_ATMEL_MXT=y +CONFIG_TOUCHSCREEN_CYTTSP5=y +CONFIG_TOUCHSCREEN_DA9052=y +CONFIG_TOUCHSCREEN_EGALAX=y +CONFIG_TOUCHSCREEN_GOODIX=y +CONFIG_TOUCHSCREEN_ILI210X=y +CONFIG_TOUCHSCREEN_MAX11801=y +CONFIG_TOUCHSCREEN_IMX6UL_TSC=y +CONFIG_TOUCHSCREEN_EDT_FT5X06=y +CONFIG_TOUCHSCREEN_MC13783=y +CONFIG_TOUCHSCREEN_TSC2004=y +CONFIG_TOUCHSCREEN_TSC2007=y +CONFIG_TOUCHSCREEN_STMPE=y +CONFIG_TOUCHSCREEN_SX8654=y +CONFIG_TOUCHSCREEN_COLIBRI_VF50=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_MMA8450=y +CONFIG_SERIO_SERPORT=m +# CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_IMX=y +CONFIG_SERIAL_IMX_CONSOLE=y +CONFIG_SERIAL_FSL_LPUART=y +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +CONFIG_SERIAL_DEV_BUS=y +# CONFIG_I2C_COMPAT is not set +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_GPIO=y +# CONFIG_I2C_HELPER_AUTO is not set +CONFIG_I2C_ALGOPCF=m +CONFIG_I2C_ALGOPCA=m +CONFIG_I2C_GPIO=y +CONFIG_I2C_IMX=y +CONFIG_SPI=y +CONFIG_SPI_FSL_QUADSPI=y +CONFIG_SPI_GPIO=y +CONFIG_SPI_IMX=y +CONFIG_SPI_FSL_DSPI=y +CONFIG_PINCTRL_IMX8MM=y +CONFIG_PINCTRL_IMX8MN=y +CONFIG_PINCTRL_IMX8MP=y +CONFIG_PINCTRL_IMX8MQ=y +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_MXC=y +CONFIG_GPIO_SIOX=m +CONFIG_GPIO_MAX732X=y +CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCF857X=y +CONFIG_GPIO_BD71815=y +CONFIG_GPIO_STMPE=y +CONFIG_GPIO_74X164=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_SYSCON=y +CONFIG_POWER_RESET_SYSCON_POWEROFF=y +CONFIG_POWER_SUPPLY=y +CONFIG_BATTERY_MAX77818=y +CONFIG_CHARGER_MAX77818=y +CONFIG_RN5T618_POWER=m +CONFIG_SENSORS_MC13783_ADC=y +CONFIG_SENSORS_GPIO_FAN=y +CONFIG_SENSORS_IIO_HWMON=y +CONFIG_SENSORS_SY7636A=y +CONFIG_THERMAL_STATISTICS=y +CONFIG_THERMAL_WRITABLE_TRIPS=y +CONFIG_CPU_THERMAL=y +CONFIG_IMX_THERMAL=y +CONFIG_WATCHDOG=y +CONFIG_DA9063_WATCHDOG=m +CONFIG_DA9062_WATCHDOG=y +CONFIG_RN5T618_WATCHDOG=y +CONFIG_IMX2_WDT=y +CONFIG_IMX7ULP_WDT=y +CONFIG_MFD_DA9052_I2C=y +CONFIG_MFD_DA9062=y +CONFIG_MFD_DA9063=y +CONFIG_MFD_MC13XXX_SPI=y +CONFIG_MFD_MC13XXX_I2C=y +CONFIG_MFD_SY7636A=y +CONFIG_MFD_MAX77818=y +CONFIG_MFD_RN5T618=y +CONFIG_MFD_STMPE=y +CONFIG_MFD_ROHM_BD71828=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_REGULATOR_ANATOP=y +CONFIG_REGULATOR_BD71815=y +CONFIG_REGULATOR_DA9052=y +CONFIG_REGULATOR_DA9062=y +CONFIG_REGULATOR_DA9063=y +CONFIG_REGULATOR_GPIO=y +CONFIG_REGULATOR_LTC3676=y +CONFIG_REGULATOR_MAX77818=y +CONFIG_REGULATOR_MC13783=y +CONFIG_REGULATOR_MC13892=y +CONFIG_REGULATOR_PFUZE100=y +CONFIG_REGULATOR_RN5T618=y +CONFIG_REGULATOR_SY7636A=y +CONFIG_RC_CORE=y +CONFIG_RC_DEVICES=y +CONFIG_IR_GPIO_CIR=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_MUX=y +CONFIG_VIDEO_CODA=m +CONFIG_VIDEO_IMX_PXP=y +CONFIG_VIDEO_OV2680=m +CONFIG_VIDEO_OV5640=m +CONFIG_VIDEO_OV5645=m +CONFIG_VIDEO_ADV7180=m +CONFIG_IMX_IPUV3_CORE=y +CONFIG_DRM=y +CONFIG_DRM_MSM=y +CONFIG_DRM_PANEL_LVDS=y +CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_PANEL_EDP=y +CONFIG_DRM_PANEL_SEIKO_43WVF1G=y +CONFIG_DRM_TI_TFP410=y +CONFIG_DRM_DW_HDMI_AHB_AUDIO=m +CONFIG_DRM_DW_HDMI_CEC=y +CONFIG_DRM_IMX=y +CONFIG_DRM_IMX_PARALLEL_DISPLAY=y +CONFIG_DRM_IMX_TVE=y +CONFIG_DRM_IMX_LDB=y +CONFIG_DRM_IMX_HDMI=y +CONFIG_DRM_ETNAVIV=y +CONFIG_DRM_MXSFB=y +CONFIG_FB=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_MXS=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_L4F00242T03=y +CONFIG_LCD_PLATFORM=y +CONFIG_BACKLIGHT_PWM=y +CONFIG_BACKLIGHT_GPIO=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_USB_AUDIO=m +CONFIG_SND_SOC=y +CONFIG_SND_SOC_FSL_ASRC=y +CONFIG_SND_IMX_SOC=y +CONFIG_SND_SOC_EUKREA_TLV320=y +CONFIG_SND_SOC_IMX_ES8328=y +CONFIG_SND_SOC_IMX_SGTL5000=y +CONFIG_SND_SOC_IMX_SPDIF=y +CONFIG_SND_SOC_FSL_ASOC_CARD=y +CONFIG_SND_SOC_AC97_CODEC=y +CONFIG_SND_SOC_CS42XX8_I2C=y +CONFIG_SND_SOC_TLV320AIC3X_I2C=y +CONFIG_SND_SOC_WM8960=y +CONFIG_SND_SOC_WM8962=y +CONFIG_SND_SIMPLE_CARD=y +CONFIG_HID_MULTITOUCH=y +CONFIG_HID_WACOM=y +CONFIG_I2C_HID_OF=y +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_ACM=m +CONFIG_USB_STORAGE=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y +CONFIG_USB_SERIAL=m +CONFIG_USB_SERIAL_GENERIC=y +CONFIG_USB_SERIAL_FTDI_SIO=m +CONFIG_USB_SERIAL_OPTION=m +CONFIG_USB_TEST=m +CONFIG_USB_EHSET_TEST_FIXTURE=m +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_MXS_PHY=y +CONFIG_USB_GADGET=y +CONFIG_USB_CONFIGFS=y +CONFIG_USB_CONFIGFS_SERIAL=y +CONFIG_USB_CONFIGFS_ACM=y +CONFIG_USB_CONFIGFS_OBEX=y +CONFIG_USB_CONFIGFS_NCM=y +CONFIG_USB_CONFIGFS_ECM=y +CONFIG_USB_CONFIGFS_ECM_SUBSET=y +CONFIG_USB_CONFIGFS_RNDIS=y +CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_MASS_STORAGE=y +CONFIG_USB_CONFIGFS_F_LB_SS=y +CONFIG_USB_CONFIGFS_F_FS=y +CONFIG_USB_CONFIGFS_F_UAC1=y +CONFIG_USB_CONFIGFS_F_UAC2=y +CONFIG_USB_CONFIGFS_F_MIDI=y +CONFIG_USB_CONFIGFS_F_HID=y +CONFIG_USB_CONFIGFS_F_UVC=y +CONFIG_USB_CONFIGFS_F_PRINTER=y +CONFIG_USB_ZERO=m +CONFIG_USB_AUDIO=m +CONFIG_USB_ETH=y +CONFIG_USB_G_NCM=m +CONFIG_USB_GADGETFS=y +CONFIG_USB_FUNCTIONFS=y +CONFIG_USB_FUNCTIONFS_ETH=y +CONFIG_USB_FUNCTIONFS_RNDIS=y +CONFIG_USB_FUNCTIONFS_GENERIC=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_USB_G_SERIAL=m +CONFIG_USB_CDC_COMPOSITE=y +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_ESDHC_IMX=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_ONESHOT=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_BACKLIGHT=y +CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_INTF_DEV_UIE_EMUL=y +CONFIG_RTC_DRV_DS1307=y +CONFIG_RTC_DRV_ISL1208=y +CONFIG_RTC_DRV_PCF8523=y +CONFIG_RTC_DRV_PCF8563=y +CONFIG_RTC_DRV_M41T80=y +CONFIG_RTC_DRV_BD70528=y +CONFIG_RTC_DRV_RC5T619=y +CONFIG_RTC_DRV_RV3029C2=y +CONFIG_RTC_DRV_DA9063=y +CONFIG_RTC_DRV_MC13XXX=y +CONFIG_RTC_DRV_MXC=y +CONFIG_RTC_DRV_MXC_V2=y +CONFIG_RTC_DRV_SNVS=y +CONFIG_DMADEVICES=y +CONFIG_FSL_EDMA=y +CONFIG_IMX_SDMA=m +CONFIG_MXS_DMA=y +CONFIG_DMATEST=m +CONFIG_STAGING=y +CONFIG_STAGING_MEDIA=y +CONFIG_VIDEO_IMX_MEDIA=y +CONFIG_COMMON_CLK_PWM=y +CONFIG_COMMON_CLK_BD718XX=y +CONFIG_CLK_IMX8MM=y +CONFIG_CLK_IMX8MN=y +CONFIG_CLK_IMX8MP=y +CONFIG_CLK_IMX8MQ=y +CONFIG_SOC_IMX8M=y +CONFIG_EXTCON_USB_GPIO=y +CONFIG_IIO=y +CONFIG_MMA8452=y +CONFIG_IMX7D_ADC=y +CONFIG_RN5T618_ADC=y +CONFIG_STMPE_ADC=y +CONFIG_VF610_ADC=y +CONFIG_SENSORS_ISL29018=y +CONFIG_MAG3110=y +CONFIG_MPL3115=y +CONFIG_PWM=y +CONFIG_PWM_FSL_FTM=y +CONFIG_PWM_IMX27=y +CONFIG_PWM_IMX_TPM=y +CONFIG_NVMEM_IMX_OCOTP=y +CONFIG_NVMEM_SNVS_LPGPR=y +CONFIG_NVMEM_VF610_OCOTP=y +CONFIG_TEE=y +CONFIG_OPTEE=y +CONFIG_MUX_MMIO=y +CONFIG_SIOX=m +CONFIG_SIOX_BUS_GPIO=m +CONFIG_EXT2_FS=y +CONFIG_EXT2_FS_XATTR=y +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y +CONFIG_EXT3_FS=y +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y +CONFIG_QUOTA=y +CONFIG_QUOTA_NETLINK_INTERFACE=y +# CONFIG_PRINT_QUOTA_WARNING is not set +CONFIG_AUTOFS4_FS=y +CONFIG_FUSE_FS=y +CONFIG_ISO9660_FS=m +CONFIG_JOLIET=y +CONFIG_ZISOFS=y +CONFIG_UDF_FS=m +CONFIG_MSDOS_FS=m +CONFIG_VFAT_FS=y +CONFIG_TMPFS_POSIX_ACL=y +CONFIG_JFFS2_FS=y +CONFIG_UBIFS_FS=y +CONFIG_NFS_FS=y +CONFIG_NFS_V3_ACL=y +CONFIG_NFS_V4=y +CONFIG_NFS_V4_1=y +CONFIG_NFS_V4_2=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_DEFAULT="cp437" +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_UTF8=y +CONFIG_SECURITYFS=y +CONFIG_CRYPTO_DEV_FSL_CAAM=y +CONFIG_CRYPTO_DEV_SAHARA=y +CONFIG_CRYPTO_DEV_MXS_DCP=y +CONFIG_CRC_CCITT=m +CONFIG_CRC_T10DIF=y +CONFIG_CRC7=m +CONFIG_LIBCRC32C=m +CONFIG_CMA_SIZE_MBYTES=0 +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_PRINTK_TIME=y +# CONFIG_DEBUG_BUGVERBOSE is not set +CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y +# CONFIG_SLUB_DEBUG is not set +# CONFIG_SCHED_DEBUG is not set +# CONFIG_FTRACE is not set From 123b649cbc5b026bdd6238221de9ee1db0ab953d Mon Sep 17 00:00:00 2001 From: tenJirka Date: Thu, 24 Aug 2023 22:44:08 +0200 Subject: [PATCH 07/13] Added reGenda (#725) * Added reGenda --------- Co-authored-by: Nathaniel van Diepen --- package/regenda/package | 55 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 package/regenda/package diff --git a/package/regenda/package b/package/regenda/package new file mode 100644 index 000000000..726080d61 --- /dev/null +++ b/package/regenda/package @@ -0,0 +1,55 @@ +#!/usr/bin/env bash +# Copyright (c) 2023 The Toltec Contributors +# SPDX-License-Identifier: MIT + +pkgnames=(regenda) +pkgdesc="Caldav agenda app" +url=https://github.com/tenJirka/reGenda +pkgver=0.0.1-1 +timestamp=2023-08-23T19:40Z +section="utils" +maintainer="tenJirka " +license=GPL3 +makedepends=(build:python3-venv) +installdepends=(python3 python3-lxml python3-pytz python3-yaml python3-requests python3-dateutil python3-six python3-urllib3 python3-idna) +flags=(patch_rm2fb) +source=(https://github.com/tenJirka/reGenda/archive/refs/tags/0.0.1.zip) +sha256sums=(00d6a1e2f6b59f86ba47ea5c3444f24e112d24eb62082802653fe4649153da01) +image=python + +build() { + python3 -m venv venv + # shellcheck disable=SC1091 + source venv/bin/activate + mkdir "$srcdir"/python_modules + pip install caldav rm_pysas -t "$srcdir"/python_modules +} + +package() { + install -D -m 644 -t "$pkgdir"/opt/etc/draft/ "$srcdir"/regenda.draft + install -D -m 644 -t "$pkgdir"/opt/etc/reGenda/ "$srcdir"/config.yml.example + install -D -m 644 "$srcdir"/icon.png "$pkgdir"/opt/etc/draft/icons/reGenda.png + install -D -m 755 -t "$pkgdir"/opt/usr/lib/reGenda/ "$srcdir"/run.py + install -D -m 644 -t "$pkgdir"/opt/usr/lib/reGenda/ "$srcdir"/languages.py + install -D -m 644 -t "$pkgdir"/opt/usr/lib/reGenda/ "$srcdir"/calendar_caldav.py + mkdir "$pkgdir"/opt/bin/ + ln -s /opt/usr/lib/reGenda/run.py "$pkgdir"/opt/bin/reGenda + cp -r "$srcdir"/python_modules/caldav* "$pkgdir"/opt/usr/lib/reGenda/ + cp -r "$srcdir"/python_modules/icalendar* "$pkgdir"/opt/usr/lib/reGenda/ + cp -r "$srcdir"/python_modules/rm_pySAS* "$pkgdir"/opt/usr/lib/reGenda/ + cp -r "$srcdir"/python_modules/recurring_ical_events* "$pkgdir"/opt/usr/lib/reGenda/ + cp -r "$srcdir"/python_modules/tzlocal* "$pkgdir"/opt/usr/lib/reGenda/ + cp -r "$srcdir"/python_modules/vobject* "$pkgdir"/opt/usr/lib/reGenda/ + cp -r "$srcdir"/python_modules/x_wr_timezone* "$pkgdir"/opt/usr/lib/reGenda/ +} + +configure() { + if [ ! -f /opt/etc/reGenda/config.yml ]; then + cp /opt/etc/reGenda/config.yml.example /opt/etc/reGenda/config.yml + echo -e "\033[33mYou have to config server in /opt/etc/reGenda/config.yml, see https://github.com/tenJirka/reGenda for help.\033[0;39m" + fi +} + +postremove() { + rm -f /opt/usr/lib/reGenda/**/*.cpython-*.pyc +} From e83a04ad6ca9792575f6c6f7ee98d32a211dacf9 Mon Sep 17 00:00:00 2001 From: tenJirka Date: Fri, 25 Aug 2023 17:41:10 +0200 Subject: [PATCH 08/13] Package regenda - added simple as install dependency (#728) --- package/regenda/package | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/regenda/package b/package/regenda/package index 726080d61..131f03abe 100644 --- a/package/regenda/package +++ b/package/regenda/package @@ -5,13 +5,13 @@ pkgnames=(regenda) pkgdesc="Caldav agenda app" url=https://github.com/tenJirka/reGenda -pkgver=0.0.1-1 +pkgver=0.0.1-2 timestamp=2023-08-23T19:40Z section="utils" maintainer="tenJirka " license=GPL3 makedepends=(build:python3-venv) -installdepends=(python3 python3-lxml python3-pytz python3-yaml python3-requests python3-dateutil python3-six python3-urllib3 python3-idna) +installdepends=(python3 python3-lxml python3-pytz python3-yaml python3-requests python3-dateutil python3-six python3-urllib3 python3-idna simple) flags=(patch_rm2fb) source=(https://github.com/tenJirka/reGenda/archive/refs/tags/0.0.1.zip) sha256sums=(00d6a1e2f6b59f86ba47ea5c3444f24e112d24eb62082802653fe4649153da01) From 80690ec0564bc88d534daea7066617d3d452473d Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Sat, 26 Aug 2023 14:25:19 -0600 Subject: [PATCH 09/13] Update oxide to v2.6 (#698) * Update oxide to v2.6 --- package/oxide/package | 104 ++++++++++++++++++++++++++++-------------- 1 file changed, 70 insertions(+), 34 deletions(-) diff --git a/package/oxide/package b/package/oxide/package index a9b7a4010..c4e25b486 100644 --- a/package/oxide/package +++ b/package/oxide/package @@ -2,21 +2,22 @@ # Copyright (c) 2021 The Toltec Contributors # SPDX-License-Identifier: MIT -pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety liboxide libsentry notify-send) -pkgver=2.5-2 +pkgnames=(erode fret oxide rot tarnish decay corrupt anxiety oxide-utils inject_evdev liboxide libsentry) +_oxidever=2.6 +pkgver=$_oxidever-1 _sentryver=0.5.0 -timestamp=2023-01-26T22:52:14Z +timestamp=2023-06-05T23:27:53Z maintainer="Eeems " url=https://oxide.eeems.codes license=MIT flags=(patch_rm2fb) image=qt:v2.3 source=( - "https://github.com/Eeems-Org/oxide/archive/refs/tags/v2.5.zip" + "https://github.com/Eeems-Org/oxide/archive/refs/tags/v$_oxidever.zip" toltec-rm2-override.conf ) sha256sums=( - 07bfb84e5adaebdebd2ce55b22f3764a1d4887c2b18364f5ec1053f171e3ecbe + bbcf83302f530afe069974121496be6f8118eadba3c00633f834db026e41ae95 SKIP ) @@ -33,8 +34,8 @@ erode() { package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/erode - install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/erode.svg - install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/erode-splash.png + install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/48x48/apps "$srcdir"/release/opt/usr/share/icons/oxide/48x48/apps/erode.png + install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/erode.png install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.erode.oxide } } @@ -42,32 +43,31 @@ erode() { fret() { pkgdesc="Take screenshots" section="utils" - installdepends=("tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=("tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/fret install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.fret.oxide } + + configure() { + update-desktop-database + } } oxide() { pkgdesc="Launcher application" section="launchers" - installdepends=("erode=$pkgver" "fret=$pkgver" "tarnish=$pkgver" "rot=$pkgver" "decay=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=("erode=$pkgver" "fret=$pkgver" "tarnish=$pkgver" "rot=$pkgver" "decay=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/oxide install -D -m 644 -t "$pkgdir"/opt/etc "$srcdir"/release/opt/etc/oxide.conf - install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/oxide-splash.png install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.oxide.oxide + install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/oxide.png } configure() { - if ! is-enabled "tarnish.service"; then - echo "" - echo "Run the following command(s) to use $pkgname as your launcher" - how-to-enable "tarnish.service" - echo "" - fi + update-desktop-database } } @@ -97,6 +97,12 @@ tarnish() { } configure() { systemctl daemon-reload + if ! is-enabled "tarnish.service"; then + echo "" + echo "Run the following command(s) to use $pkgname as your launcher" + how-to-enable "tarnish.service" + echo "" + fi } preremove() { if is-active tarnish; then @@ -116,49 +122,89 @@ tarnish() { decay() { pkgdesc="Lockscreen application" section="utils" - installdepends=(display "tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=(display "tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/decay install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.decay.oxide } + + configure() { + update-desktop-database + } } corrupt() { pkgdesc="Task Switcher for Oxide" section="utils" - installdepends=(display "tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=(display "tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/corrupt install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.corrupt.oxide } + + configure() { + update-desktop-database + } } anxiety() { pkgdesc="Screenshot viewer for Oxide" section="utils" - installdepends=(display "tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + installdepends=(display "tarnish=$pkgver" "oxide-utils=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") package() { install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/anxiety install -D -m 644 -t "$pkgdir"/opt/usr/share/applications "$srcdir"/release/opt/usr/share/applications/codes.eeems.anxiety.oxide - install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/image.svg - install -D -m 644 -t "$pkgdir"/opt/etc/draft/icons "$srcdir"/release/opt/etc/draft/icons/anxiety-splash.png + install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/48x48/apps "$srcdir"/release/opt/usr/share/icons/oxide/48x48/apps/image.png + install -D -m 644 -t "$pkgdir"/opt/usr/share/icons/oxide/702x702/splash "$srcdir"/release/opt/usr/share/icons/oxide/702x702/splash/anxiety.png + } + + configure() { + update-desktop-database + } +} + +oxide-utils() { + pkgdesc="Command line tools for Oxide" + section="admin" + installdepends=("tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") + replaces=(notify-send) + conflicts=(notify-send) + + package() { + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/notify-send + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/update-desktop-database + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/desktop-file-validate + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-menu + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-desktop-icon + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/xdg-open + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/gio + } +} + +inject_evdev() { + pkgdesc="Inject input events" + section="utils" + installdepends=("liboxide=$pkgver" "libsentry=$_sentryver") + + package() { + install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/inject_evdev } } liboxide() { pkgdesc="Shared library for oxide applications" - section=devel + section="devel" package() { - install -D -m 755 -t "$pkgdir"/opt/usr/lib "$srcdir"/release/opt/usr/lib/libliboxide.so* + install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libliboxide.so* } } libsentry() { pkgdesc="Sentry SDK for C, C++ and native applications." - section=devel + section="devel" url=https://github.com/getsentry/sentry-native pkgver="$_sentryver" timestamp="2022-08-02T14:40:22Z" @@ -167,13 +213,3 @@ libsentry() { install -D -m 755 -t "$pkgdir"/opt/lib "$srcdir"/release/opt/lib/libsentry.so } } - -notify-send() { - pkgdesc="A program to send desktop notifications for Oxide" - section=utils - installdepends=("tarnish=$pkgver" "liboxide=$pkgver" "libsentry=$_sentryver") - - package() { - install -D -m 755 -t "$pkgdir"/opt/bin "$srcdir"/release/opt/bin/notify-send - } -} From ea694273e8663d454318b275dbfe50e1932b834f Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Tue, 29 Aug 2023 20:27:22 -0600 Subject: [PATCH 10/13] Update KOReader to v2023.08 (#733) --- package/koreader/package | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/koreader/package b/package/koreader/package index d98e24233..09a02d6e2 100644 --- a/package/koreader/package +++ b/package/koreader/package @@ -5,8 +5,8 @@ pkgnames=(koreader) pkgdesc="Ebook reader supporting PDF, DjVu, EPUB, FB2 and many more formats" url=https://github.com/koreader/koreader -pkgver=2023.06.1-1 -timestamp=2023-07-09T08:17:26Z +pkgver=2023.08-1 +timestamp=2023-08-29T16:21:01Z section="readers" maintainer="raisjn " license=AGPL-3.0-or-later @@ -21,7 +21,7 @@ source=( koreader ) sha256sums=( - a24f334983060b5cfee7b87484529b77fe4adffd646e8fd55447750e73309ef0 + 8cc9fad1cbcda5519c20afe6e33c4f80a51587daed7b959ef7284ce8b0c41ec0 SKIP SKIP SKIP From 555ab68890124b7a9023d66fc44febf85058c51c Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Wed, 30 Aug 2023 16:33:19 -0600 Subject: [PATCH 11/13] Add note about toltecmk to docs/building.md (#734) --- docs/building.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/building.md b/docs/building.md index 6696d363a..b6cb816b4 100644 --- a/docs/building.md +++ b/docs/building.md @@ -1,7 +1,7 @@ ## Building the Repository from Source The Toltec repository is automatically built for each commit on the `stable` and `testing` branches. -You may want to build the repository locally when working with a new package recipe or to make sure that nobody tampered with the automated build system. +You may want to build the repository locally when working with a new package recipe or to make sure that nobody tampered with the automated build system. [Toltecmk](https://github.com/toltec-dev/build) could also be used instead, if you just need to compile a single standalone package. To proceed, create a local clone of the Git repository. From b8a60d36e76b861d400505083ab5f751ec153d9a Mon Sep 17 00:00:00 2001 From: tenJirka Date: Fri, 8 Sep 2023 22:34:34 +0200 Subject: [PATCH 12/13] Update regenda to 0.0.2 (#737) --- package/regenda/package | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/regenda/package b/package/regenda/package index 131f03abe..e899d531e 100644 --- a/package/regenda/package +++ b/package/regenda/package @@ -5,16 +5,16 @@ pkgnames=(regenda) pkgdesc="Caldav agenda app" url=https://github.com/tenJirka/reGenda -pkgver=0.0.1-2 -timestamp=2023-08-23T19:40Z +pkgver=0.0.2-1 +timestamp=2023-09-06T06:45Z section="utils" maintainer="tenJirka " license=GPL3 makedepends=(build:python3-venv) installdepends=(python3 python3-lxml python3-pytz python3-yaml python3-requests python3-dateutil python3-six python3-urllib3 python3-idna simple) flags=(patch_rm2fb) -source=(https://github.com/tenJirka/reGenda/archive/refs/tags/0.0.1.zip) -sha256sums=(00d6a1e2f6b59f86ba47ea5c3444f24e112d24eb62082802653fe4649153da01) +source=(https://github.com/tenJirka/reGenda/archive/refs/tags/0.0.2.zip) +sha256sums=(4f51de514945f9cfc6a1852181baab4bb0f4daadb222e8ddb05929f17e2044d9) image=python build() { From 1c42c05f850184b16ace6ce58c209853ed8cf999 Mon Sep 17 00:00:00 2001 From: Jayy001 <56607897+Jayy001@users.noreply.github.com> Date: Mon, 25 Sep 2023 19:20:35 +0100 Subject: [PATCH 13/13] Update toltecctl to fix uninstalling error (#740) * Update toltecctl to fix uninstalling error --------- Co-authored-by: Nathaniel van Diepen --- package/toltec-bootstrap/package | 4 ++-- package/toltec-bootstrap/toltecctl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/toltec-bootstrap/package b/package/toltec-bootstrap/package index a07acf822..1b033cc4a 100644 --- a/package/toltec-bootstrap/package +++ b/package/toltec-bootstrap/package @@ -5,8 +5,8 @@ pkgnames=(toltec-bootstrap) pkgdesc="Manage your Toltec install" url=https://toltec-dev.org/ -pkgver=0.2.2-1 -timestamp=2022-02-28T00:12Z +pkgver=0.2.3-1 +timestamp=2023-09-17T17:35Z section="utils" maintainer="Eeems " license=MIT diff --git a/package/toltec-bootstrap/toltecctl b/package/toltec-bootstrap/toltecctl index 2480d6eee..b9ea0bcb3 100644 --- a/package/toltec-bootstrap/toltecctl +++ b/package/toltec-bootstrap/toltecctl @@ -338,7 +338,7 @@ uninstall() { # Remove installed packages in reverse dependency order list-installed-ordered | while read -r pkgname; do - "$opkg_path" remove --force-depends --force-remove "$pkgname" + "$opkg_path" remove --force-removal-of-essential-packages --force-depends --force-remove "$pkgname" done systemctl daemon-reload