summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Teibes2014-06-03 07:18:29 +0200
committerCarsten Teibes2014-06-03 07:18:29 +0200
commitdc0a44ceb2670c55c4a9316712c8a1aa42eff833 (patch)
treeabfc4a3d266b74f0d511775a5f0d503121ed6ced
parent28126ab625e7059a943d7c496fa2b867039eb962 (diff)
downloadaur-dc0a44ceb2670c55c4a9316712c8a1aa42eff833.tar.gz
Make it a split package
-rw-r--r--.SRCINFO22
-rw-r--r--PKGBUILD39
-rw-r--r--redshift-git.install13
-rw-r--r--redshift-gtk-git.install12
4 files changed, 50 insertions, 36 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cc997dca627..e03578ca63c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,31 @@
pkgbase = redshift-git
pkgdesc = Adjusts the color temperature of your screen according to your surroundings (development version)
- pkgver = 1.9.r10.gf436cf6
+ pkgver = 1.9.1.r24.g4697c37
pkgrel = 1
url = http://jonls.dk/redshift/
- install = redshift-git.install
arch = i686
arch = x86_64
license = GPL3
makedepends = git
+ makedepends = intltool
makedepends = python
depends = libxxf86vm
depends = libdrm
depends = libxcb
depends = geoclue
- optdepends = gtk3: for redshift-gtk
- optdepends = python-xdg: for redshift-gtk
- optdepends = python-gobject: for redshift-gtk
- optdepends = librsvg: for redshift-gtk
- optdepends = hicolor-icon-theme: for redshift-gtk
- provides = redshift
- conflicts = redshift
source = redshift::git+https://github.com/jonls/redshift.git
md5sums = SKIP
pkgname = redshift-git
+ provides = redshift
+ conflicts = redshift
+
+pkgname = redshift-gtk-git
+ install = redshift-gtk-git.install
+ depends = redshift-git=1.9.1.r24.g4697c37
+ depends = gtk3
+ depends = python-xdg
+ depends = python-gobject
+ depends = librsvg
+ depends = hicolor-icon-theme
diff --git a/PKGBUILD b/PKGBUILD
index 348227a3154..58b64d6dd5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,17 @@
-# Maintainer: carstene1ns <url/mail: arch carsten-teibes de>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
# Contributor: Lara Maia <lara@craft.net.br>
# Contributor: Mattias Andrée <`base64 -d`(bWFhbmRyZWUK)@member.fsf.org>
-pkgname=redshift-git
-pkgver=1.9.r10.gf436cf6
+pkgbase=redshift-git
+pkgname=('redshift-git' 'redshift-gtk-git')
+pkgver=1.9.1.r24.g4697c37
pkgrel=1
pkgdesc='Adjusts the color temperature of your screen according to your surroundings (development version)'
arch=('i686' 'x86_64')
url='http://jonls.dk/redshift/'
license=('GPL3')
depends=('libxxf86vm' 'libdrm' 'libxcb' 'geoclue')
-provides=('redshift')
-conflicts=('redshift')
-optdepends=('gtk3: for redshift-gtk'
- 'python-xdg: for redshift-gtk'
- 'python-gobject: for redshift-gtk'
- 'librsvg: for redshift-gtk'
- 'hicolor-icon-theme: for redshift-gtk')
-makedepends=('git' 'python') # python needed for redshift-gtk
-install=$pkgname.install
+makedepends=('git' 'intltool' 'python') # python needed for redshift-gtk
source=(redshift::"git+https://github.com/jonls/redshift.git")
md5sums=('SKIP')
@@ -31,10 +24,28 @@ build() {
cd redshift
./bootstrap
- ./configure --prefix=/usr
+ ./configure --prefix=/usr --enable-randr --enable-drm
make
}
-package() {
+package_redshift-git() {
+ provides=('redshift')
+ conflicts=('redshift')
+
make -C redshift DESTDIR="$pkgdir" install
+
+ # remove duplicate redshift-gtk stuff
+ rm -rf "$pkgdir"/usr/{bin/redshift-gtk,lib/{python*,systemd/user/redshift-gtk.service}}
+ rm -rf "$pkgdir"/usr/share/{applications,icons}
+}
+
+package_redshift-gtk-git() {
+ depends=("redshift-git=$pkgver" 'gtk3' 'python-xdg' 'python-gobject' 'librsvg'
+ 'hicolor-icon-theme')
+ install=redshift-gtk-git.install
+
+ make -C redshift DESTDIR="$pkgdir" install
+
+ # remove duplicate redshift stuff
+ rm -rf "$pkgdir"/usr/{bin/redshift,lib/systemd/user/redshift.service,share/{locale,man}}
}
diff --git a/redshift-git.install b/redshift-git.install
deleted file mode 100644
index b0d35d2f7f5..00000000000
--- a/redshift-git.install
+++ /dev/null
@@ -1,13 +0,0 @@
-
-post_install() {
- # redirect output, because command might not be available
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor > /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/redshift-gtk-git.install b/redshift-gtk-git.install
new file mode 100644
index 00000000000..5bf59891755
--- /dev/null
+++ b/redshift-gtk-git.install
@@ -0,0 +1,12 @@
+
+post_install() {
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}