summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlks2015-07-30 13:14:33 +0200
committerlks2015-07-30 13:14:33 +0200
commit60034bd3c8ff2552d9266cddb67c15e6a29b2ab9 (patch)
treed92d02fd3f184d9a2a762a3c7986c158dceff649
parent96c0206139c29a01dab796ab63dbe35d132b9f07 (diff)
downloadaur-60034bd3c8ff2552d9266cddb67c15e6a29b2ab9.tar.gz
Update to 2.24.28-1
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD17
-rw-r--r--gtk2-dfb.install12
-rw-r--r--gtkrc2
4 files changed, 27 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d1a6af971d1..fc958e8852f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
-# Generated by makepkg 4.2.1
-# Sun Mar 15 11:53:28 UTC 2015
pkgbase = gtk2-dfb
- pkgver = 2.24.27
+ pkgver = 2.24.28
pkgrel = 1
url = http://www.gtk.org/
arch = i686
arch = x86_64
+ arch = armv7h
license = LGPL
makedepends = atk
makedepends = pango
@@ -20,17 +19,18 @@ pkgbase = gtk2-dfb
makedepends = libcups
makedepends = gdk-pixbuf2
makedepends = gobject-introspection
- source = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.27.tar.xz
+ makedepends = python2
+ source = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.28.tar.xz
source = gtkrc
source = xid-collision-debug.patch
- sha256sums = 20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4
- sha256sums = b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2
+ sha256sums = b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656
+ sha256sums = bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805
sha256sums = d758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558
pkgname = gtk2-dfb
pkgdesc = directfb backend for GTK+
install = gtk2-dfb.install
- depends = gtk2>=2.24.27
+ depends = gtk2>=2.24.28
depends = cairo-dfb
depends = directfb
diff --git a/PKGBUILD b/PKGBUILD
index cd6b74f1f8d..e6ec6c3c195 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,17 +8,17 @@ pkgname=('gtk2-dfb')
if [ $multi_build ]
then pkgname=('gtk2-dfb' 'gtk2' 'gtk-update-icon-cache')
fi
-pkgver=2.24.27
+pkgver=2.24.28
pkgrel=1
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'armv7h')
url="http://www.gtk.org/"
makedepends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
- 'shared-mime-info' 'cairo-dfb' 'libcups' 'gdk-pixbuf2' 'gobject-introspection')
+ 'shared-mime-info' 'cairo-dfb' 'libcups' 'gdk-pixbuf2' 'gobject-introspection' 'python2')
license=('LGPL')
source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
gtkrc xid-collision-debug.patch)
-sha256sums=('20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4'
- 'b77a427df55a14182c10ad7e683b4d662df2846fcd38df2aa8918159d6be3ae2'
+sha256sums=('b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656'
+ 'bc968e3e4f57e818430130338e5f85a5025e21d7e31a3293b8f5a0e58362b805'
'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
prepare() {
@@ -86,13 +86,12 @@ package_gtk2-dfb() {
}
package_gtk2() {
- pkgdesc="GTK+ is a multi-platform toolkit (v2)"
+ pkgdesc="GObject-based multi-platform GUI toolkit (legacy)"
install=gtk2.install
depends=('atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage'
- 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache')
+ 'shared-mime-info' 'cairo' 'libcups' 'gtk-update-icon-cache' 'librsvg')
optdepends=('gnome-themes-standard: Default widget theme'
- 'gnome-icon-theme: Default icon theme')
- replaces=('gtk2-docs')
+ 'adwaita-icon-theme: Default icon theme')
cd gtk2-build
make DESTDIR="$pkgdir" install
diff --git a/gtk2-dfb.install b/gtk2-dfb.install
index c8a5d5588ee..f14e648d38b 100644
--- a/gtk2-dfb.install
+++ b/gtk2-dfb.install
@@ -2,6 +2,16 @@ post_install() {
/usr/bin/gtk-query-immodules-2.0 --update-cache
}
-post_update() {
+pre_upgrade() {
+ if (( $(vercmp $2 2.24.20) < 0 )); then
+ rm -f /etc/gtk-2.0/gtk.immodules
+ fi
+}
+
+post_upgrade() {
post_install
}
+
+pre_remove() {
+ rm -f /usr/lib/gtk-2.0/2.10.0/immodules.cache
+}
diff --git a/gtkrc b/gtkrc
index d2282ac36e5..1ee9497d946 100644
--- a/gtkrc
+++ b/gtkrc
@@ -1,3 +1,3 @@
-gtk-icon-theme-name = "gnome"
+gtk-icon-theme-name = "Adwaita"
gtk-theme-name = "Adwaita"
gtk-font-name = "Cantarell 11"