diff options
| author | Elmar Klausmeier | 2016-10-03 12:42:15 +0200 |
|---|---|---|
| committer | Elmar Klausmeier | 2016-10-03 12:42:15 +0200 |
| commit | 8160b2aad25edf6af4f1a173949391ef8799d156 (patch) | |
| tree | 1b1ab721e4a2146db9e696a332cc42316223d998 | |
| parent | e76b759d2f89142ceee5c571a5d8703840310791 (diff) | |
| download | aur-8160b2aad25edf6af4f1a173949391ef8799d156.tar.gz | |
git-merge did not start, so this program is patched
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 41 |
2 files changed, 28 insertions, 19 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Sun Jul 3 10:47:26 UTC 2016 pkgbase = jpilot - pkgdesc = A desktop organizer application for the palm pilot + pkgdesc = A desktop organizer application for the Palm Pilot pkgver = 1.8.2 - pkgrel = 1 + pkgrel = 2 url = http://www.jpilot.org/ arch = i686 arch = x86_64 @@ -1,12 +1,12 @@ -# Maintainer: +# Maintainer: Elmar Klausmeier <Elmar.Klausmeier@gmail.com> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: yugrotavele <yugrotavele at archlinux dot us> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=jpilot pkgver=1.8.2 -pkgrel=1 -pkgdesc="A desktop organizer application for the palm pilot" +pkgrel=2 +pkgdesc="A desktop organizer application for the Palm Pilot" arch=('i686' 'x86_64') url="http://www.jpilot.org/" license=('GPL2') @@ -15,23 +15,34 @@ makedepends=('intltool') source=(http://jpilot.org/$pkgname-$pkgver.tar.gz) sha256sums=('2c28ed7acea27ae3d541036f2e2ca5ed7e0121badf477e3cfa5ec8d282337e23') +prepare() { + cd "${srcdir}"/$pkgname-$pkgver + patch jpilot-merge.c <<-EOF + 290c290 + < if (argc != 3) { + --- + > if (argc != 4) { + EOF +} + build() { - cd "${srcdir}"/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - ./configure --prefix=/usr --disable-pl-test --disable-gtktest - make + ./configure --prefix=/usr --disable-pl-test --disable-gtktest + make } package() { - cd "${srcdir}"/$pkgname-$pkgver + cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install - install -d "${pkgdir}"/usr/share/pixmaps - cd "${pkgdir}"/usr/share/pixmaps - ln -s /usr/share/doc/jpilot/icons/jpilot-icon1.xpm jpilot-icon1.xpm - ln -s /usr/share/doc/jpilot/icons/jpilot-icon2.xpm jpilot-icon2.xpm - ln -s /usr/share/doc/jpilot/icons/jpilot-icon3.xpm jpilot-icon3.xpm - ln -s /usr/share/doc/jpilot/icons/jpilot-icon4.xpm jpilot-icon4.xpm - ln -s /usr/share/doc/jpilot/icons/jpilot-icon1.xpm jpilot.xpm + install -d "${pkgdir}"/usr/share/pixmaps + cd "${pkgdir}"/usr/share/pixmaps + ln -s /usr/share/doc/jpilot/icons/jpilot-icon1.xpm jpilot-icon1.xpm + ln -s /usr/share/doc/jpilot/icons/jpilot-icon2.xpm jpilot-icon2.xpm + ln -s /usr/share/doc/jpilot/icons/jpilot-icon3.xpm jpilot-icon3.xpm + ln -s /usr/share/doc/jpilot/icons/jpilot-icon4.xpm jpilot-icon4.xpm + ln -s /usr/share/doc/jpilot/icons/jpilot-icon1.xpm jpilot.xpm } + |