summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD23
-rw-r--r--gerbv-git.install17
3 files changed, 12 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 32f427c45cc9..f5658911488f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = gerbv-git
pkgdesc = An open source Gerber file (RS-274X only) viewer
- pkgver = r1310.9ef643e
+ pkgver = r1544.b5f1eac
pkgrel = 1
url = http://gerbv.geda-project.org/
- install = gerbv-git.install
- arch = i686
arch = x86_64
license = GPL
- makedepends = git
+ makedepends = cvs
makedepends = gettext
+ makedepends = git
depends = gtk2
+ depends = dconf
optdepends = cairo: for better graphics
provides = gerbv
conflicts = gerbv
@@ -17,4 +17,3 @@ pkgbase = gerbv-git
md5sums = SKIP
pkgname = gerbv-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 0507b37e8a3a..70106556f58b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,18 @@
-# Maintainer: Thomas Krug <t.krug@elektronenpumpe.de>
# Contributor: Thomas Krug <t.krug@elektronenpumpe.de>
pkgname=gerbv-git
_pkgname=gerbv
-pkgver=r1310.9ef643e
+pkgver=r1544.b5f1eac
pkgrel=1
pkgdesc="An open source Gerber file (RS-274X only) viewer"
url="http://gerbv.geda-project.org/"
license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gtk2')
+arch=('x86_64')
+depends=('gtk2' 'dconf')
+optdepends=('cairo: for better graphics')
+makedepends=('cvs' 'gettext' 'git')
provides=('gerbv')
conflicts=('gerbv')
-optdepends=('cairo: for better graphics')
-makedepends=('git' 'gettext')
-install=$pkgname.install
source=("$_pkgname"::'git://git.geda-project.org/gerbv.git')
md5sums=('SKIP')
@@ -23,17 +21,12 @@ pkgver() {
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-prepare() {
- cd "$srcdir/$_pkgname"
-
- ./autogen.sh
- sed -i 's|am_aux_dir=`cd $ac_aux_dir|am_aux_dir=`cd $srcdir|' configure
-}
-
build ()
{
cd "$srcdir/$_pkgname"
-
+ CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+ ./autogen.sh
+ sed -i 's|am_aux_dir=`cd $ac_aux_dir|am_aux_dir=`cd $srcdir|' configure
./configure --prefix=/usr \
--disable-update-desktop-database
make
diff --git a/gerbv-git.install b/gerbv-git.install
deleted file mode 100644
index fd07f0807e8c..000000000000
--- a/gerbv-git.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-fi
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database /usr/share/applications
-fi
-}
-
-post_upgrade() {
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- /usr/bin/gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
-fi
-if [ -x /usr/bin/update-desktop-database ]; then
- /usr/bin/update-desktop-database /usr/share/applications
-fi
-}