[arch-commits] Commit in gtk3/repos (26 files)
Jan Steffens
heftig at archlinux.org
Fri May 20 23:13:04 UTC 2016
Date: Saturday, May 21, 2016 @ 01:13:03
Author: heftig
Revision: 268454
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gtk3/repos/extra-i686/PKGBUILD
(from rev 268453, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-i686/gtk-query-immodules-3.0.hook
(from rev 268453, gtk3/trunk/gtk-query-immodules-3.0.hook)
gtk3/repos/extra-i686/gtk-update-icon-cache.hook
(from rev 268453, gtk3/trunk/gtk-update-icon-cache.hook)
gtk3/repos/extra-i686/gtk-update-icon-cache.script
(from rev 268453, gtk3/trunk/gtk-update-icon-cache.script)
gtk3/repos/extra-i686/gtk3.install
(from rev 268453, gtk3/trunk/gtk3.install)
gtk3/repos/extra-i686/scrolledwindow.patch
(from rev 268453, gtk3/trunk/scrolledwindow.patch)
gtk3/repos/extra-i686/settings.ini
(from rev 268453, gtk3/trunk/settings.ini)
gtk3/repos/extra-x86_64/PKGBUILD
(from rev 268453, gtk3/trunk/PKGBUILD)
gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
(from rev 268453, gtk3/trunk/gtk-query-immodules-3.0.hook)
gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
(from rev 268453, gtk3/trunk/gtk-update-icon-cache.hook)
gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
(from rev 268453, gtk3/trunk/gtk-update-icon-cache.script)
gtk3/repos/extra-x86_64/gtk3.install
(from rev 268453, gtk3/trunk/gtk3.install)
gtk3/repos/extra-x86_64/scrolledwindow.patch
(from rev 268453, gtk3/trunk/scrolledwindow.patch)
gtk3/repos/extra-x86_64/settings.ini
(from rev 268453, gtk3/trunk/settings.ini)
Deleted:
gtk3/repos/extra-i686/PKGBUILD
gtk3/repos/extra-i686/gtk-query-immodules-3.0.hook
gtk3/repos/extra-i686/gtk-update-icon-cache.hook
gtk3/repos/extra-i686/gtk-update-icon-cache.script
gtk3/repos/extra-i686/gtk3.install
gtk3/repos/extra-i686/settings.ini
gtk3/repos/extra-x86_64/PKGBUILD
gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
gtk3/repos/extra-x86_64/gtk3.install
gtk3/repos/extra-x86_64/settings.ini
-------------------------------------------+
/PKGBUILD | 156 ++++++++++++++++++++++++++++
/gtk-query-immodules-3.0.hook | 22 +++
/gtk-update-icon-cache.hook | 26 ++++
/gtk-update-icon-cache.script | 20 +++
/gtk3.install | 6 +
/settings.ini | 8 +
extra-i686/PKGBUILD | 75 -------------
extra-i686/gtk-query-immodules-3.0.hook | 11 -
extra-i686/gtk-update-icon-cache.hook | 13 --
extra-i686/gtk-update-icon-cache.script | 10 -
extra-i686/gtk3.install | 3
extra-i686/scrolledwindow.patch | 33 +++++
extra-i686/settings.ini | 4
extra-x86_64/PKGBUILD | 75 -------------
extra-x86_64/gtk-query-immodules-3.0.hook | 11 -
extra-x86_64/gtk-update-icon-cache.hook | 13 --
extra-x86_64/gtk-update-icon-cache.script | 10 -
extra-x86_64/gtk3.install | 3
extra-x86_64/scrolledwindow.patch | 33 +++++
extra-x86_64/settings.ini | 4
20 files changed, 304 insertions(+), 232 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-i686/PKGBUILD 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.20.5
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-depends=(atk cairo libcups libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
- libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon
- adwaita-icon-theme json-glib rest librsvg wayland-protocols desktop-file-utils)
-makedepends=(gobject-introspection libcanberra gtk-doc)
-license=(LGPL)
-source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
- settings.ini
- gtk-query-immodules-3.0.hook
- gtk-update-icon-cache.hook
- gtk-update-icon-cache.script)
-sha256sums=('9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
- '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
- 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
-
-prepare() {
- cd gtk+-$pkgver
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd "gtk+-$pkgver"
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-schemas-compile \
- --enable-x11-backend \
- --enable-broadway-backend \
- --enable-wayland-backend
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_gtk3() {
- depends+=(gtk-update-icon-cache)
- optdepends=('libcanberra: gtk3-widget-factory demo')
- install=gtk3.install
-
- cd "gtk+-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
- install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
-
- # split this out to use with gtk2 too
- rm "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
-
-package_gtk-update-icon-cache() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 hicolor-icon-theme)
-
- cd gtk+-$pkgver
- install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
- install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
- install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
-}
-
-# vim:set et sw=4:
Copied: gtk3/repos/extra-i686/PKGBUILD (from rev 268453, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache)
+pkgver=3.20.5
+pkgrel=2
+pkgdesc="GObject-based multi-platform GUI toolkit"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+depends=(atk cairo libcups libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
+ libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon
+ adwaita-icon-theme json-glib rest librsvg wayland-protocols desktop-file-utils)
+makedepends=(gobject-introspection libcanberra gtk-doc)
+license=(LGPL)
+source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
+ scrolledwindow.patch
+ settings.ini
+ gtk-query-immodules-3.0.hook
+ gtk-update-icon-cache.hook
+ gtk-update-icon-cache.script)
+sha256sums=('9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564'
+ '806be66e612c313d42d3f9384cb1bb986f89d1b9c680ab86f9e1032534fb0c09'
+ '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+ 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+ '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
+ 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
+
+prepare() {
+ cd gtk+-$pkgver
+ patch -Np1 -i ../scrolledwindow.patch
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd "gtk+-$pkgver"
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-schemas-compile \
+ --enable-x11-backend \
+ --enable-broadway-backend \
+ --enable-wayland-backend
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package_gtk3() {
+ depends+=(gtk-update-icon-cache)
+ optdepends=('libcanberra: gtk3-widget-factory demo')
+ install=gtk3.install
+
+ cd "gtk+-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
+ install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
+
+ # split this out to use with gtk2 too
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+}
+
+package_gtk-update-icon-cache() {
+ pkgdesc="GTK+ icon cache updater"
+ depends=(gdk-pixbuf2 hicolor-icon-theme)
+
+ cd gtk+-$pkgver
+ install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+ install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
+ install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
+}
+
+# vim:set et sw=4:
Deleted: extra-i686/gtk-query-immodules-3.0.hook
===================================================================
--- extra-i686/gtk-query-immodules-3.0.hook 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-i686/gtk-query-immodules-3.0.hook 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
-
-[Action]
-Description = Probing GTK3 input method modules...
-When = PostTransaction
-Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Copied: gtk3/repos/extra-i686/gtk-query-immodules-3.0.hook (from rev 268453, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- extra-i686/gtk-query-immodules-3.0.hook (rev 0)
+++ extra-i686/gtk-query-immodules-3.0.hook 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Deleted: extra-i686/gtk-update-icon-cache.hook
===================================================================
--- extra-i686/gtk-update-icon-cache.hook 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-i686/gtk-update-icon-cache.hook 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/icons/*/
-Target = !usr/share/icons/*/?*
-
-[Action]
-Description = Updating icon theme caches...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
-NeedsTargets
Copied: gtk3/repos/extra-i686/gtk-update-icon-cache.hook (from rev 268453, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- extra-i686/gtk-update-icon-cache.hook (rev 0)
+++ extra-i686/gtk-update-icon-cache.hook 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/icons/*/
+Target = !usr/share/icons/*/?*
+
+[Action]
+Description = Updating icon theme caches...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
+NeedsTargets
Deleted: extra-i686/gtk-update-icon-cache.script
===================================================================
--- extra-i686/gtk-update-icon-cache.script 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-i686/gtk-update-icon-cache.script 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-while read -r f; do
- if [[ -e ${f}index.theme ]]; then
- gtk-update-icon-cache -q "$f"
- elif [[ -d $f ]]; then
- rm -f "${f}icon-theme.cache"
- rmdir --ignore-fail-on-non-empty "$f"
- fi
-done
Copied: gtk3/repos/extra-i686/gtk-update-icon-cache.script (from rev 268453, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- extra-i686/gtk-update-icon-cache.script (rev 0)
+++ extra-i686/gtk-update-icon-cache.script 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read -r f; do
+ if [[ -e ${f}index.theme ]]; then
+ gtk-update-icon-cache -q "$f"
+ elif [[ -d $f ]]; then
+ rm -f "${f}icon-theme.cache"
+ rmdir --ignore-fail-on-non-empty "$f"
+ fi
+done
Deleted: extra-i686/gtk3.install
===================================================================
--- extra-i686/gtk3.install 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-i686/gtk3.install 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,3 +0,0 @@
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
Copied: gtk3/repos/extra-i686/gtk3.install (from rev 268453, gtk3/trunk/gtk3.install)
===================================================================
--- extra-i686/gtk3.install (rev 0)
+++ extra-i686/gtk3.install 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
Copied: gtk3/repos/extra-i686/scrolledwindow.patch (from rev 268453, gtk3/trunk/scrolledwindow.patch)
===================================================================
--- extra-i686/scrolledwindow.patch (rev 0)
+++ extra-i686/scrolledwindow.patch 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,33 @@
+From ca8d51e6d0f78cc170cc212dd7ef6664d2e662f4 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Fri, 20 May 2016 09:16:35 -0400
+Subject: Revert "scrolledwindow: Remove child before destroying self"
+
+This reverts commit dcb4b48b29559ca632bb020a3b8eb2b9188b02e7.
+
+This was causing crashes in the filechooser in some applications.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=766694
+---
+ gtk/gtkscrolledwindow.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
+index 0918d72..1b52082 100644
+--- a/gtk/gtkscrolledwindow.c
++++ b/gtk/gtkscrolledwindow.c
+@@ -2672,11 +2672,6 @@ gtk_scrolled_window_destroy (GtkWidget *widget)
+ {
+ GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
+ GtkScrolledWindowPrivate *priv = scrolled_window->priv;
+- GtkWidget *child;
+-
+- child = gtk_bin_get_child (GTK_BIN (widget));
+- if (child)
+- gtk_container_remove (GTK_CONTAINER (widget), child);
+
+ remove_indicator (scrolled_window, &priv->hindicator);
+ remove_indicator (scrolled_window, &priv->vindicator);
+--
+cgit v0.12
+
Deleted: extra-i686/settings.ini
===================================================================
--- extra-i686/settings.ini 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-i686/settings.ini 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
Copied: gtk3/repos/extra-i686/settings.ini (from rev 268453, gtk3/trunk/settings.ini)
===================================================================
--- extra-i686/settings.ini (rev 0)
+++ extra-i686/settings.ini 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-x86_64/PKGBUILD 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,75 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.20.5
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-depends=(atk cairo libcups libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
- libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon
- adwaita-icon-theme json-glib rest librsvg wayland-protocols desktop-file-utils)
-makedepends=(gobject-introspection libcanberra gtk-doc)
-license=(LGPL)
-source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
- settings.ini
- gtk-query-immodules-3.0.hook
- gtk-update-icon-cache.hook
- gtk-update-icon-cache.script)
-sha256sums=('9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
- '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
- 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
-
-prepare() {
- cd gtk+-$pkgver
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd "gtk+-$pkgver"
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-schemas-compile \
- --enable-x11-backend \
- --enable-broadway-backend \
- --enable-wayland-backend
-
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_gtk3() {
- depends+=(gtk-update-icon-cache)
- optdepends=('libcanberra: gtk3-widget-factory demo')
- install=gtk3.install
-
- cd "gtk+-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
- install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
-
- # split this out to use with gtk2 too
- rm "$pkgdir/usr/bin/gtk-update-icon-cache"
-}
-
-package_gtk-update-icon-cache() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 hicolor-icon-theme)
-
- cd gtk+-$pkgver
- install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
- install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
- install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
-}
-
-# vim:set et sw=4:
Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 268453, gtk3/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,78 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache)
+pkgver=3.20.5
+pkgrel=2
+pkgdesc="GObject-based multi-platform GUI toolkit"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+depends=(atk cairo libcups libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2
+ libxcomposite libxdamage pango shared-mime-info colord at-spi2-atk wayland libxkbcommon
+ adwaita-icon-theme json-glib rest librsvg wayland-protocols desktop-file-utils)
+makedepends=(gobject-introspection libcanberra gtk-doc)
+license=(LGPL)
+source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
+ scrolledwindow.patch
+ settings.ini
+ gtk-query-immodules-3.0.hook
+ gtk-update-icon-cache.hook
+ gtk-update-icon-cache.script)
+sha256sums=('9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564'
+ '806be66e612c313d42d3f9384cb1bb986f89d1b9c680ab86f9e1032534fb0c09'
+ '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+ 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+ '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
+ 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
+
+prepare() {
+ cd gtk+-$pkgver
+ patch -Np1 -i ../scrolledwindow.patch
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd "gtk+-$pkgver"
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-schemas-compile \
+ --enable-x11-backend \
+ --enable-broadway-backend \
+ --enable-wayland-backend
+
+ #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+ make
+}
+
+package_gtk3() {
+ depends+=(gtk-update-icon-cache)
+ optdepends=('libcanberra: gtk3-widget-factory demo')
+ install=gtk3.install
+
+ cd "gtk+-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
+ install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
+
+ # split this out to use with gtk2 too
+ rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+}
+
+package_gtk-update-icon-cache() {
+ pkgdesc="GTK+ icon cache updater"
+ depends=(gdk-pixbuf2 hicolor-icon-theme)
+
+ cd gtk+-$pkgver
+ install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+ install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
+ install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
+}
+
+# vim:set et sw=4:
Deleted: extra-x86_64/gtk-query-immodules-3.0.hook
===================================================================
--- extra-x86_64/gtk-query-immodules-3.0.hook 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-x86_64/gtk-query-immodules-3.0.hook 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
-
-[Action]
-Description = Probing GTK3 input method modules...
-When = PostTransaction
-Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Copied: gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook (from rev 268453, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- extra-x86_64/gtk-query-immodules-3.0.hook (rev 0)
+++ extra-x86_64/gtk-query-immodules-3.0.hook 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache
Deleted: extra-x86_64/gtk-update-icon-cache.hook
===================================================================
--- extra-x86_64/gtk-update-icon-cache.hook 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-x86_64/gtk-update-icon-cache.hook 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/icons/*/
-Target = !usr/share/icons/*/?*
-
-[Action]
-Description = Updating icon theme caches...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
-NeedsTargets
Copied: gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook (from rev 268453, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- extra-x86_64/gtk-update-icon-cache.hook (rev 0)
+++ extra-x86_64/gtk-update-icon-cache.hook 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/icons/*/
+Target = !usr/share/icons/*/?*
+
+[Action]
+Description = Updating icon theme caches...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
+NeedsTargets
Deleted: extra-x86_64/gtk-update-icon-cache.script
===================================================================
--- extra-x86_64/gtk-update-icon-cache.script 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-x86_64/gtk-update-icon-cache.script 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-while read -r f; do
- if [[ -e ${f}index.theme ]]; then
- gtk-update-icon-cache -q "$f"
- elif [[ -d $f ]]; then
- rm -f "${f}icon-theme.cache"
- rmdir --ignore-fail-on-non-empty "$f"
- fi
-done
Copied: gtk3/repos/extra-x86_64/gtk-update-icon-cache.script (from rev 268453, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- extra-x86_64/gtk-update-icon-cache.script (rev 0)
+++ extra-x86_64/gtk-update-icon-cache.script 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read -r f; do
+ if [[ -e ${f}index.theme ]]; then
+ gtk-update-icon-cache -q "$f"
+ elif [[ -d $f ]]; then
+ rm -f "${f}icon-theme.cache"
+ rmdir --ignore-fail-on-non-empty "$f"
+ fi
+done
Deleted: extra-x86_64/gtk3.install
===================================================================
--- extra-x86_64/gtk3.install 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-x86_64/gtk3.install 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,3 +0,0 @@
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 268453, gtk3/trunk/gtk3.install)
===================================================================
--- extra-x86_64/gtk3.install (rev 0)
+++ extra-x86_64/gtk3.install 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
Copied: gtk3/repos/extra-x86_64/scrolledwindow.patch (from rev 268453, gtk3/trunk/scrolledwindow.patch)
===================================================================
--- extra-x86_64/scrolledwindow.patch (rev 0)
+++ extra-x86_64/scrolledwindow.patch 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,33 @@
+From ca8d51e6d0f78cc170cc212dd7ef6664d2e662f4 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Fri, 20 May 2016 09:16:35 -0400
+Subject: Revert "scrolledwindow: Remove child before destroying self"
+
+This reverts commit dcb4b48b29559ca632bb020a3b8eb2b9188b02e7.
+
+This was causing crashes in the filechooser in some applications.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=766694
+---
+ gtk/gtkscrolledwindow.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
+index 0918d72..1b52082 100644
+--- a/gtk/gtkscrolledwindow.c
++++ b/gtk/gtkscrolledwindow.c
+@@ -2672,11 +2672,6 @@ gtk_scrolled_window_destroy (GtkWidget *widget)
+ {
+ GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
+ GtkScrolledWindowPrivate *priv = scrolled_window->priv;
+- GtkWidget *child;
+-
+- child = gtk_bin_get_child (GTK_BIN (widget));
+- if (child)
+- gtk_container_remove (GTK_CONTAINER (widget), child);
+
+ remove_indicator (scrolled_window, &priv->hindicator);
+ remove_indicator (scrolled_window, &priv->vindicator);
+--
+cgit v0.12
+
Deleted: extra-x86_64/settings.ini
===================================================================
--- extra-x86_64/settings.ini 2016-05-20 22:38:39 UTC (rev 268453)
+++ extra-x86_64/settings.ini 2016-05-20 23:13:03 UTC (rev 268454)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
Copied: gtk3/repos/extra-x86_64/settings.ini (from rev 268453, gtk3/trunk/settings.ini)
===================================================================
--- extra-x86_64/settings.ini (rev 0)
+++ extra-x86_64/settings.ini 2016-05-20 23:13:03 UTC (rev 268454)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
More information about the arch-commits
mailing list