summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--0001-Added-cstdint-to-fix-error-when-compiling-on-Linux.patch24
-rw-r--r--PKGBUILD12
3 files changed, 6 insertions, 34 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a5e5e6fad63f..92314c5b3b41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = openixcard
pkgdesc = Open Source Version of Allwinner PhoenixCard on Linux
pkgver = 1.1.8
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/YuzukiTsuru/OpenixCard
arch = x86_64
license = GPL
@@ -14,13 +14,11 @@ pkgbase = openixcard
source = git+https://github.com/arun11299/cpp-subprocess.git
source = git+https://github.com/ArthurSonzogni/FTXUI.git
source = git+https://github.com/SemaiCZE/inicpp.git
- source = 0001-Added-cstdint-to-fix-error-when-compiling-on-Linux.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = 5ef6d78c5e98bf7ca87911ef7609b9192a9a88411741a971d565401b8fd85523
pkgname = openixcard
diff --git a/0001-Added-cstdint-to-fix-error-when-compiling-on-Linux.patch b/0001-Added-cstdint-to-fix-error-when-compiling-on-Linux.patch
deleted file mode 100644
index 8187f56d9594..000000000000
--- a/0001-Added-cstdint-to-fix-error-when-compiling-on-Linux.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From af102f6f4137ae4cb814a8c0a423b4bbde21b89e Mon Sep 17 00:00:00 2001
-From: Christopher Bero <bigbero@gmail.com>
-Date: Sat, 4 Nov 2023 10:53:14 -0500
-Subject: [PATCH] Added cstdint to fix error when compiling on Linux
-
----
- includes/ColorCout.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/includes/ColorCout.hpp b/includes/ColorCout.hpp
-index b73d928..0064999 100644
---- a/includes/ColorCout.hpp
-+++ b/includes/ColorCout.hpp
-@@ -21,6 +21,7 @@ Copyright (C) 2020 GloomyGhost <GloomyGhost@foxmail.com>
- #define COLORBOX_COLORCOUT_H
-
- #include <iostream>
-+#include <cstdint>
-
- #ifdef WIN32
- #ifndef WIN32_LEAN_AND_MEAN
---
-2.42.0
-
diff --git a/PKGBUILD b/PKGBUILD
index fe0772e8063a..06308bb9f66f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Camber Huang <camber@poi.science>
pkgname=openixcard
pkgver=1.1.8
-pkgrel=1
+pkgrel=2
pkgdesc="Open Source Version of Allwinner PhoenixCard on Linux"
arch=("x86_64")
url="https://github.com/YuzukiTsuru/OpenixCard"
@@ -24,7 +24,6 @@ source=("${pkgname}-${pkgver}::git+https://github.com/YuzukiTsuru/OpenixCard.git
"git+https://github.com/arun11299/cpp-subprocess.git"
"git+https://github.com/ArthurSonzogni/FTXUI.git"
"git+https://github.com/SemaiCZE/inicpp.git"
- "0001-Added-cstdint-to-fix-error-when-compiling-on-Linux.patch"
)
noextract=()
sha256sums=('SKIP'
@@ -32,8 +31,7 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
- '5ef6d78c5e98bf7ca87911ef7609b9192a9a88411741a971d565401b8fd85523')
+ 'SKIP')
prepare() {
pushd $pkgname-$pkgver
@@ -51,9 +49,9 @@ prepare() {
git fetch
git checkout 0f7bd53
popd
- # Temporary workaround until ColorCout and OpenixCard/submodule are both updated.
- pushd lib/ColorCout
- git apply --verbose $srcdir/0001-Added-cstdint-to-fix-error-when-compiling-on-Linux.patch
+ pushd lib/ColorCout
+ git fetch
+ git checkout 3bed851
popd
popd