summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Weißschuh2020-10-30 15:20:04 +0100
committerThomas Weißschuh2020-10-30 15:20:04 +0100
commitf0c988463a9c0a8e90b71d9529d7e498c6ccb9d6 (patch)
treef312c821f347ae6699987ac8165eb9fdccae77f8
parent60d8a8bb9874c8f00ae50a40eb6250b326710a60 (diff)
downloadaur-f0c988463a9c0a8e90b71d9529d7e498c6ccb9d6.tar.gz
upgpkg: palm-novacom-git 20201030-1
-rw-r--r--.SRCINFO4
-rw-r--r--0004-avoid-duplicate-symbols.patch22
-rw-r--r--PKGBUILD9
3 files changed, 31 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4e6970ea4719..8b36a3933ae8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = palm-novacom-git
pkgdesc = WebOS <-> PC connection, open source version
- pkgver = 20130426
+ pkgver = 20201030
pkgrel = 1
url = http://openwebosproject.org/
arch = x86_64
@@ -17,12 +17,14 @@ pkgbase = palm-novacom-git
source = 0001-Use-usb_bulk_-read-write-instead-of-homemade-handler.patch
source = 0002-Fix-makefile-so-it-respects-environmental-CFLAGS.patch
source = 0003-Remove-unused-err-variable.patch
+ source = 0004-avoid-duplicate-symbols.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 9d4ed1bc1f0a8d091394e0273353384962b8276c0f72f7341138daa87bc6d6e5
sha256sums = 971f634077384bb53dcd679f59a76a5d98a9f3cc6ef2efd167c65a58003d3890
sha256sums = cc7eff6b70b7b953b39f4f918718836bdf543e64b77137fadeee3d875434ef21
sha256sums = 065d8b2976700d2ed6861d8fd9c6cf8b621be13ba16e9dd8c01c0e250b0d4415
+ sha256sums = a86ef9a1c08f4b23b93b0052770be3f8a4023ca020c52456953c021e7441e5a3
pkgname = palm-novacom-git
diff --git a/0004-avoid-duplicate-symbols.patch b/0004-avoid-duplicate-symbols.patch
new file mode 100644
index 000000000000..027a7bb9bbe5
--- /dev/null
+++ b/0004-avoid-duplicate-symbols.patch
@@ -0,0 +1,22 @@
+--- a/src/host/recovery.c
++++ b/src/host/recovery.c
+@@ -42,7 +42,7 @@
+ } recovery_entry_t;
+
+ /* list of recovery tokens */
+-TAILQ_HEAD(recovery_queue_s, recovery_entry_s) t_recovery_queue;
++static TAILQ_HEAD(recovery_queue_s, recovery_entry_s) t_recovery_queue;
+ static platform_mutex_t recovery_lock;
+
+
+--- a/src/host/usb-linux.c
++++ b/src/host/usb-linux.c
+@@ -79,7 +79,7 @@
+ static platform_thread_t findandattach_thread;
+ volatile int novacom_shutdown = 0;
+ /* list of recovery tokens */
+-TAILQ_HEAD(recovery_queue_s, recovery_entry_s) t_recovery_queue;
++static TAILQ_HEAD(recovery_queue_s, recovery_entry_s) t_recovery_queue;
+ static platform_mutex_t recovery_lock;
+
+
diff --git a/PKGBUILD b/PKGBUILD
index 8d0d8abb4083..5f987f7e50c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Carl George <cwgtex gmail.com>
pkgname=palm-novacom-git
-pkgver=20130426
+pkgver=20201030
pkgrel=1
pkgdesc="WebOS <-> PC connection, open source version"
arch=('x86_64' 'i686')
@@ -18,7 +18,8 @@ source=(
'novacomd.service'
'0001-Use-usb_bulk_-read-write-instead-of-homemade-handler.patch'
'0002-Fix-makefile-so-it-respects-environmental-CFLAGS.patch'
- '0003-Remove-unused-err-variable.patch')
+ '0003-Remove-unused-err-variable.patch'
+ '0004-avoid-duplicate-symbols.patch')
build() {
cd "$srcdir"
@@ -40,6 +41,7 @@ build() {
patch -Np1 -i "${srcdir}/0001-Use-usb_bulk_-read-write-instead-of-homemade-handler.patch"
# patch -Np1 -i "${srcdir}/0002-Fix-makefile-so-it-respects-environmental-CFLAGS.patch"
# patch -Np1 -i "${srcdir}/0003-Remove-unused-err-variable.patch"
+ patch -Np1 -i "${srcdir}/0004-avoid-duplicate-symbols.patch"
cd "$srcdir"
rm -rf server-build
@@ -70,4 +72,5 @@ sha256sums=('SKIP'
'9d4ed1bc1f0a8d091394e0273353384962b8276c0f72f7341138daa87bc6d6e5'
'971f634077384bb53dcd679f59a76a5d98a9f3cc6ef2efd167c65a58003d3890'
'cc7eff6b70b7b953b39f4f918718836bdf543e64b77137fadeee3d875434ef21'
- '065d8b2976700d2ed6861d8fd9c6cf8b621be13ba16e9dd8c01c0e250b0d4415')
+ '065d8b2976700d2ed6861d8fd9c6cf8b621be13ba16e9dd8c01c0e250b0d4415'
+ 'a86ef9a1c08f4b23b93b0052770be3f8a4023ca020c52456953c021e7441e5a3')