diff options
| -rw-r--r-- | .SRCINFO | 36 | ||||
| -rw-r--r-- | 010-ardesia-gcc10-fix.patch | 22 | ||||
| -rw-r--r-- | PKGBUILD | 39 | ||||
| -rw-r--r-- | ardesia.install | 7 |
4 files changed, 53 insertions, 51 deletions
@@ -1,37 +1,23 @@ pkgbase = ardesia - pkgdesc = Free digital sketchpad to draw on the X11 session + pkgdesc = Tool for drawing on the screen of a X11 session pkgver = 1.1 - pkgrel = 1 - url = https://code.google.com/p/ardesia/ - install = ardesia.install - arch = i686 + pkgrel = 2 + url = https://code.google.com/archive/p/ardesia/ arch = x86_64 license = GPL3 - makedepends = gcc - makedepends = make - makedepends = automake - makedepends = autoconf makedepends = intltool - makedepends = libtool - makedepends = gtk3 - makedepends = atk - makedepends = libx11 - makedepends = libpng - makedepends = glib2 - makedepends = gconf - makedepends = fontconfig - makedepends = freetype2 - makedepends = gsl - makedepends = libxml2 makedepends = xdg-utils - makedepends = libgsf depends = gtk3 + depends = cairo + depends = gdk-pixbuf2 + depends = glib2 depends = gsl depends = libgsf - depends = desktop-file-utils - source = https://ardesia.googlecode.com/files/ardesia-1.1.tar.gz - md5sums = b0abe145ce4ade50ab897ec658d2d664 - sha1sums = 2c0603cefe7bb33909787d030df5cd60cfee009f + depends = libxml2 + source = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ardesia/ardesia-1.1.tar.gz + source = 010-ardesia-gcc10-fix.patch + sha256sums = b65e0153f5239c270bb1734d1cd257738339ba163081509ee42499da8dd6ee18 + sha256sums = 212984a4d9c8654f2e111125e6034bbf06f0d687f110f3b5451789119af34fc9 pkgname = ardesia diff --git a/010-ardesia-gcc10-fix.patch b/010-ardesia-gcc10-fix.patch new file mode 100644 index 000000000000..c422990195f8 --- /dev/null +++ b/010-ardesia-gcc10-fix.patch @@ -0,0 +1,22 @@ +--- a/src/bar.c ++++ b/src/bar.c +@@ -26,6 +26,8 @@ + #include <utils.h> + #include <bar.h> + ++GtkBuilder *bar_gtk_builder = NULL; ++ + /* + * Calculate the better position where put the bar. + */ +--- a/src/utils.h ++++ b/src/utils.h +@@ -62,7 +62,7 @@ + + + /* The gtk builder object of the bar window */ +-GtkBuilder *bar_gtk_builder; ++extern GtkBuilder *bar_gtk_builder; + + + #define PROGRAM_NAME "Ardesia" @@ -1,29 +1,30 @@ -# Maintainer: Moritz Patelscheck <moritz(at)patelscheck.de> +# Maintainer : Daniel Bermond <dbermond@archlinux.org> +# Contributor: Moritz Patelscheck <moritz(at)patelscheck.de> pkgname=ardesia pkgver=1.1 -pkgrel=1 -pkgdesc="Free digital sketchpad to draw on the X11 session" -arch=('i686' 'x86_64') -url="https://code.google.com/p/ardesia/" -install="ardesia.install" -depends=('gtk3' 'gsl' 'libgsf' 'desktop-file-utils') -makedepends=('gcc' 'make' 'automake' 'autoconf' 'intltool' 'libtool' 'gtk3' 'atk' 'libx11' 'libpng' 'glib2' 'gconf' 'fontconfig' 'freetype2' 'gsl' 'libxml2' 'xdg-utils' 'libgsf') +pkgrel=2 +pkgdesc='Tool for drawing on the screen of a X11 session' +arch=('x86_64') +url='https://code.google.com/archive/p/ardesia/' +depends=('gtk3' 'cairo' 'gdk-pixbuf2' 'glib2' 'gsl' 'libgsf' 'libxml2') +makedepends=('intltool' 'xdg-utils') license=('GPL3') -source=("https://ardesia.googlecode.com/files/ardesia-1.1.tar.gz") -md5sums=('b0abe145ce4ade50ab897ec658d2d664') -sha1sums=('2c0603cefe7bb33909787d030df5cd60cfee009f') +source=("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/ardesia/${pkgname}-${pkgver}.tar.gz" + '010-ardesia-gcc10-fix.patch') +sha256sums=('b65e0153f5239c270bb1734d1cd257738339ba163081509ee42499da8dd6ee18' + '212984a4d9c8654f2e111125e6034bbf06f0d687f110f3b5451789119af34fc9') -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./autogen.sh - #./configure +prepare() { + patch -d "${pkgname}-${pkgver}" -Np1 -i "${srcdir}/010-ardesia-gcc10-fix.patch" +} - make +build() { + cd "${pkgname}-${pkgver}" + ./configure + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make -C "${pkgname}-${pkgver}" DESTDIR="$pkgdir" install } diff --git a/ardesia.install b/ardesia.install deleted file mode 100644 index 811dc0996a36..000000000000 --- a/ardesia.install +++ /dev/null @@ -1,7 +0,0 @@ -install() { - update-desktop-database -q -} - -uninstall() { - update-desktop-database -q -} |