diff options
| author | uli | 2023-04-18 12:59:49 +0200 |
|---|---|---|
| committer | uli | 2023-04-18 12:59:49 +0200 |
| commit | 5b68778d0479472e46f12a20bc26fa97ba246ed4 (patch) | |
| tree | c79f9bf476c63db3a35658463f97a9f2e8ac2cb3 | |
| parent | 95b89c00fdd6c5ce636b187ef1277598adde4a0d (diff) | |
| download | aur-5b68778d0479472e46f12a20bc26fa97ba246ed4.tar.gz | |
v1.0.34.0
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | wx_workaround.patch | 13 |
3 files changed, 9 insertions, 29 deletions
@@ -1,6 +1,6 @@ pkgbase = opencpn-plugin-o_charts pkgdesc = use charts from o-charts.org in opencpn - pkgver = 1.0.29.0 + pkgver = 1.0.34.0 pkgrel = 1 url = https://opencpn.org/OpenCPN/plugins/ocharts.html arch = x86_64 @@ -11,11 +11,9 @@ pkgbase = opencpn-plugin-o_charts makedepends = lsb-release depends = opencpn depends = libusb-compat - source = opencpn-plugin-o_charts::git+https://github.com/bdbcat/o-charts_pi.git#commit=49dee9c5a98635a13f418eddc52dda3666296835 - source = wx_workaround.patch + source = opencpn-plugin-o_charts-1.0.34.0.tar.gz::https://github.com/bdbcat/o-charts_pi/archive/refs/tags/1.0.34.0.tar.gz source = LICENSE - b2sums = SKIP - b2sums = e72db7fb9af2fa05c93a412f3ea0a8b3a58f77e1e1347c3110b646d9c9558dde35f00422a4e70ebb4a0f07840b09d8a236ddb6c283015127b64d9ef4648b465f + b2sums = 98593b46bcc000d494328cbbef25f1ec5f4aa9e56c243e8f3e5cd44a0c88e204fa1b665007fe7935ce66c7c69918d5a61ff7a236d6d942393b196d5f803b8b61 b2sums = 2d09f9bc4f793b03977d05607f065fbd85e8c257edb70d27b8846f620f920d23803e320045ae3e6cc23e862d0c52336b8e334580d946518f86f4260c0a886deb pkgname = opencpn-plugin-o_charts @@ -1,24 +1,19 @@ # Maintainer: uli <cybuzuma at vnxs dot de> pkgname=opencpn-plugin-o_charts -pkgver=1.0.29.0 +pkgver=1.0.34.0 pkgrel=1 pkgdesc="use charts from o-charts.org in opencpn" arch=('x86_64' 'aarch64') license=("GPL2" "custom") depends=('opencpn' 'libusb-compat') -makedepends=('cmake' 'lsb-release' 'git') +makedepends=('cmake' 'lsb-release') url="https://opencpn.org/OpenCPN/plugins/ocharts.html" -source=("$pkgname::git+https://github.com/bdbcat/o-charts_pi.git#commit=49dee9c5a98635a13f418eddc52dda3666296835" "wx_workaround.patch" "LICENSE") -b2sums=('SKIP' 'e72db7fb9af2fa05c93a412f3ea0a8b3a58f77e1e1347c3110b646d9c9558dde35f00422a4e70ebb4a0f07840b09d8a236ddb6c283015127b64d9ef4648b465f' '2d09f9bc4f793b03977d05607f065fbd85e8c257edb70d27b8846f620f920d23803e320045ae3e6cc23e862d0c52336b8e334580d946518f86f4260c0a886deb') - -prepare() { - cd $pkgname - patch --strip=1 --input=../wx_workaround.patch -} +source=("$pkgname-$pkgver.tar.gz::https://github.com/bdbcat/o-charts_pi/archive/refs/tags/${pkgver}.tar.gz" "LICENSE") +b2sums=('98593b46bcc000d494328cbbef25f1ec5f4aa9e56c243e8f3e5cd44a0c88e204fa1b665007fe7935ce66c7c69918d5a61ff7a236d6d942393b196d5f803b8b61' '2d09f9bc4f793b03977d05607f065fbd85e8c257edb70d27b8846f620f920d23803e320045ae3e6cc23e862d0c52336b8e334580d946518f86f4260c0a886deb') build() { - cd $pkgname + cd o-charts_pi-${pkgver} mkdir -p build cd build cmake -DCMAKE_BUILD_TYPE=Release .. @@ -28,7 +23,7 @@ build() { package() { install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # upstream is using make install for their packaging so we need to copy the files manually - cd "$pkgname"/build/app/o-charts-1.0.29.0-arch-rolling/ + cd o-charts_pi-${pkgver}/build/app/o-charts-1.0-arch-rolling/ cp -r ./* $pkgdir/usr/ rm $pkgdir/usr/metadata.xml } diff --git a/wx_workaround.patch b/wx_workaround.patch deleted file mode 100644 index 496b1fd2277c..000000000000 --- a/wx_workaround.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff a/src/bbox.h b/src/bbox.h ---- a/src/bbox.h -+++ b/src/bbox.h -@@ -6,7 +6,9 @@ - #include "wx/wx.h" - #endif - -+#define WXBUILDING - #include "wx/matrix.h" -+#undef WXBUILDING - #include "wx/geometry.h" - - enum OVERLAP { _IN, _ON, _OUT }; |