summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Vihrov2017-02-09 20:16:14 +0200
committerAndrey Vihrov2017-02-09 20:16:14 +0200
commit52dbcc918e49745c792ddafdc8cc3784a27df134 (patch)
tree53fcf6002db5c503474476bc1faab56c27138f4c
parente477375fb952e8441dbb323d4ec52188b9649522 (diff)
downloadaur-52dbcc918e49745c792ddafdc8cc3784a27df134.tar.gz
Clean up style, version, URLs. Remove unneeded intltools dep. Do not run ./configure twice.
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD72
2 files changed, 35 insertions, 46 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 998dbcc1587..397f0a9478b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,15 @@
# Generated by mksrcinfo v8
-# Wed Feb 8 20:13:49 UTC 2017
+# Thu Feb 9 18:10:03 UTC 2017
pkgbase = xfwm4-git
- pkgdesc = Xfce window manager - git checkout
- pkgver = 4.12.0.r237.g03c4b509
+ pkgdesc = Xfce window manager (git version)
+ pkgver = 4.12.0+237+g03c4b509
pkgrel = 1
- url = http://git.xfce.org/xfce/xfwm4
+ url = https://git.xfce.org/xfce/xfwm4
arch = i686
arch = x86_64
groups = xfce4
license = GPL2
makedepends = git
- makedepends = intltool
makedepends = xfce4-dev-tools
makedepends = exo
depends = libxfce4ui
diff --git a/PKGBUILD b/PKGBUILD
index dde16903712..78eff72becd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,67 +4,57 @@
# Contributor: cute.tec@gmail.com
pkgname=xfwm4-git
-pkgver=4.12.0.r237.g03c4b509
+pkgver=4.12.0+237+g03c4b509
pkgrel=1
-pkgdesc='Xfce window manager - git checkout'
+pkgdesc="Xfce window manager (git version)"
arch=('i686' 'x86_64')
+url="https://git.xfce.org/xfce/xfwm4"
license=('GPL2')
-url='http://git.xfce.org/xfce/xfwm4'
groups=('xfce4')
depends=('libxfce4ui' 'libwnck' 'libxpresent')
-makedepends=('git' 'intltool' 'xfce4-dev-tools' 'exo')
+makedepends=('git' 'xfce4-dev-tools' 'exo')
provides=('xfwm4')
conflicts=('xfwm4')
-source=('git://git.xfce.org/xfce/xfwm4')
+source=("git://git.xfce.org/xfce/xfwm4") # TODO: https
sha256sums=('SKIP')
pkgver() {
- cd xfwm4/
-
- if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then
- printf '%s.r%s.g%s' \
- "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG})" \
- "$(git rev-list --count ${GITTAG}..)" \
- "$(git log -1 --format='%h')"
- else
- printf '0.r%s.g%s' \
- "$(git rev-list --count master)" \
- "$(git log -1 --format='%h')"
- fi
+ cd xfwm4
+ git describe --long | sed 's/xfwm4-//;s/-/+/g'
}
prepare() {
- cd xfwm4
+ cd xfwm4
- # https://bugzilla.xfce.org/show_bug.cgi?id=12534
- git revert --no-commit 0dfb55407a830572f03297b3c118fac1f3c5b80d
+ # https://bugzilla.xfce.org/show_bug.cgi?id=12534
+ git revert --no-commit 0dfb55407a830572f03297b3c118fac1f3c5b80d
}
build() {
- cd xfwm4/
-
- ./autogen.sh
- ./configure \
- --enable-maintainer-mode \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --disable-static \
- --enable-startup-notification \
- --enable-render \
- --enable-randr \
- --enable-epoxy \
- --enable-xpresent \
- --enable-compositor \
- --enable-xsync \
- --disable-debug
- make
+ cd xfwm4
+
+ ./autogen.sh \
+ --prefix=/usr \
+ --libexecdir=/usr/lib \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-dependency-tracking \
+ --disable-static \
+ --enable-epoxy \
+ --enable-startup-notification \
+ --enable-xsync \
+ --enable-render \
+ --enable-randr \
+ --enable-xpresent \
+ --enable-compositor \
+ --disable-debug
+ make
}
package() {
- cd xfwm4/
+ cd xfwm4
- make DESTDIR=${pkgdir} install
+ make DESTDIR="${pkgdir}" install
}
+# vim:set ts=2 sw=2 et: