diff options
| author | Jan Hambrecht | 2023-01-07 23:33:21 +0100 |
|---|---|---|
| committer | Jan Hambrecht | 2023-01-07 23:33:21 +0100 |
| commit | 7daaa4a5ca4a10ea6d7e3067c556f57bd6370133 (patch) | |
| tree | 17e13ac3b391230f441c5f3d2c1d97e9053b9dc6 | |
| parent | f0afe87fb79e63e38577a15ef3ec22daab4966da (diff) | |
| download | aur-7daaa4a5ca4a10ea6d7e3067c556f57bd6370133.tar.gz | |
Fix linker problem caused by duplicate object file
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | Makefile.in.diff | 11 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
3 files changed, 19 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = spnavcfg pkgdesc = The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc). pkgver = 1.1 - pkgrel = 0 + pkgrel = 1 url = https://github.com/FreeSpacenav/spnavcfg arch = i686 arch = x86_64 @@ -13,6 +13,8 @@ pkgbase = spnavcfg depends = spacenavd>=1.0 provides = spnavcfg source = https://github.com/FreeSpacenav/spnavcfg/releases/download/v1.1/spnavcfg-1.1.tar.gz + source = Makefile.in.diff md5sums = b0eef2c1cd1af54012635d5435c9bdd5 + md5sums = bc0bc835a733fd92b2ae0ba2fd1ab208 pkgname = spnavcfg diff --git a/Makefile.in.diff b/Makefile.in.diff new file mode 100644 index 000000000000..75e1b176b426 --- /dev/null +++ b/Makefile.in.diff @@ -0,0 +1,11 @@ +--- Makefile.in 2023-01-07 23:12:31.119156934 +0100 ++++ Makefile.in.new 2023-01-07 23:10:08.151195830 +0100 +@@ -2,7 +2,7 @@ + ccsrc = $(wildcard src/*.cc) + mochdr = src/ui.h + mocsrc = $(mochdr:.h=.moc.cc) +-obj = $(csrc:.c=.o) $(ccsrc:.cc=.o) $(mocsrc:.cc=.o) res.cc ++obj = $(sort $(csrc:.c=.o) $(ccsrc:.cc=.o) $(mocsrc:.cc=.o)) res.cc + dep = $(csrc:.c=.d) $(ccsrc:.cc=.d) + bin = spnavcfg + @@ -2,7 +2,7 @@ pkgname=spnavcfg pkgver=1.1 -pkgrel=0 +pkgrel=1 pkgdesc="The spacenav project provides a free, compatible alternative, to the proprietary 3Dconnexion device driver and SDK, for their 3D input devices (called 'space navigator', 'space pilot', 'space traveller', etc)." arch=('i686' 'x86_64') url="https://github.com/FreeSpacenav/spnavcfg" @@ -12,11 +12,13 @@ makedepends=('gcc' 'make') provides=('spnavcfg') options=() install= -source=(https://github.com/FreeSpacenav/spnavcfg/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('b0eef2c1cd1af54012635d5435c9bdd5') +source=(https://github.com/FreeSpacenav/spnavcfg/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz Makefile.in.diff) +md5sums=('b0eef2c1cd1af54012635d5435c9bdd5' + 'bc0bc835a733fd92b2ae0ba2fd1ab208') build() { cd ${pkgname}-${pkgver} + patch -p0 < $startdir/Makefile.in.diff ./configure --prefix=/usr make || return 1 } |