[arch-commits] Commit in lib32-gtk3/repos/multilib-x86_64 (5 files)
Maxime Gauduin
alucryd at archlinux.org
Mon May 30 18:30:36 UTC 2016
Date: Monday, May 30, 2016 @ 20:30:35
Author: alucryd
Revision: 177475
archrelease: copy trunk to multilib-x86_64
Added:
lib32-gtk3/repos/multilib-x86_64/PKGBUILD
(from rev 177474, lib32-gtk3/trunk/PKGBUILD)
lib32-gtk3/repos/multilib-x86_64/gtk-query-immodules-3.0-32.hook
(from rev 177474, lib32-gtk3/trunk/gtk-query-immodules-3.0-32.hook)
Deleted:
lib32-gtk3/repos/multilib-x86_64/PKGBUILD
lib32-gtk3/repos/multilib-x86_64/gtk-query-immodules-3.0-32.hook
lib32-gtk3/repos/multilib-x86_64/gtk3-scrolledwindow.patch
---------------------------------+
PKGBUILD | 125 ++++++++++++++++++--------------------
gtk-query-immodules-3.0-32.hook | 22 +++---
gtk3-scrolledwindow.patch | 33 ----------
3 files changed, 72 insertions(+), 108 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-05-30 18:23:50 UTC (rev 177474)
+++ PKGBUILD 2016-05-30 18:30:35 UTC (rev 177475)
@@ -1,64 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: josephgbr <rafael.f.f1 at gmail.com>
-# Contributor: GordonGR <ntheo1979 at gmail.com>
-
-pkgname=lib32-gtk3
-pkgver=3.20.5
-pkgrel=1
-pkgdesc='GObject-based multi-platform GUI toolkit'
-arch=('x86_64')
-license=('LGPL')
-url='http://www.gtk.org/'
-depends=('gtk3' 'lib32-at-spi2-atk' 'lib32-colord' 'lib32-gdk-pixbuf2'
- 'lib32-json-glib' 'lib32-libcups' 'lib32-libepoxy' 'lib32-librsvg'
- 'lib32-libxcomposite' 'lib32-libxcursor' 'lib32-libxinerama'
- 'lib32-libxkbcommon' 'lib32-libxrandr' 'lib32-pango' 'lib32-rest')
-makedepends=('gcc-multilib' 'gobject-introspection' 'gtk-doc')
-source=("https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz"
- 'gtk-query-immodules-3.0-32.hook'
- 'gtk3-scrolledwindow.patch')
-sha256sums=('9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564'
- '6b786bbcb83ba850675339b42690eedba110dcd8d0c3cdb5cfef333d8f9c320b'
- '806be66e612c313d42d3f9384cb1bb986f89d1b9c680ab86f9e1032534fb0c09')
-
-prepare() {
- cd gtk+-${pkgver}
-
- patch -Np1 -i ../gtk3-scrolledwindow.patch
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd gtk+-${pkgver}
-
- export CC='gcc -m32'
- export CXX='/bin/false'
- export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
-
- ./configure \
- --prefix='/usr' \
- --libdir='/usr/lib32' \
- --localstatedir='/var' \
- --sysconfdir='/etc' \
- --enable-{broadway,wayland,x11}-backend \
- --disable-libcanberra \
- --disable-schemas-compile
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd gtk+-${pkgver}
-
- make DESTDIR="${pkgdir}" install
- mv "${pkgdir}"/usr/bin/gtk-query-immodules-3.0{,-32}
- mv "${pkgdir}"/usr/bin/gtk-query-settings{,-32}
- rm "${pkgdir}"/usr/bin/{broadwayd,gtk-{builder-tool,encode-symbolic-svg,launch,update-icon-cache},gtk3-{demo,demo-application,icon-browser,widget-factory}}
- rm -rf "${pkgdir}"/{etc,usr/{include,share}}
-
- install -dm 755 "${pkgdir}"/usr/share/libalpm/hooks
- install -m 644 ../gtk-query-immodules-3.0-32.hook "${pkgdir}"/usr/share/libalpm/hooks/
-}
-
-# vim: ts=2 sw=2 et:
Copied: lib32-gtk3/repos/multilib-x86_64/PKGBUILD (from rev 177474, lib32-gtk3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-05-30 18:30:35 UTC (rev 177475)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: josephgbr <rafael.f.f1 at gmail.com>
+# Contributor: GordonGR <ntheo1979 at gmail.com>
+
+pkgname=lib32-gtk3
+pkgver=3.20.6
+pkgrel=1
+pkgdesc='GObject-based multi-platform GUI toolkit'
+arch=('x86_64')
+license=('LGPL')
+url='http://www.gtk.org/'
+depends=('gtk3' 'lib32-at-spi2-atk' 'lib32-colord' 'lib32-gdk-pixbuf2'
+ 'lib32-json-glib' 'lib32-libcups' 'lib32-libepoxy' 'lib32-librsvg'
+ 'lib32-libxcomposite' 'lib32-libxcursor' 'lib32-libxinerama'
+ 'lib32-libxkbcommon' 'lib32-libxrandr' 'lib32-pango' 'lib32-rest')
+makedepends=('gcc-multilib' 'gobject-introspection' 'gtk-doc')
+source=("https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz"
+ 'gtk-query-immodules-3.0-32.hook')
+sha256sums=('3f8016563a96b1cfef4ac9e795647f6316deb2978ff939b19e4e4f8f936fa4b2'
+ '6b786bbcb83ba850675339b42690eedba110dcd8d0c3cdb5cfef333d8f9c320b')
+
+prepare() {
+ cd gtk+-${pkgver}
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd gtk+-${pkgver}
+
+ export CC='gcc -m32'
+ export CXX='/bin/false'
+ export PKG_CONFIG_PATH='/usr/lib32/pkgconfig'
+
+ ./configure \
+ --prefix='/usr' \
+ --libdir='/usr/lib32' \
+ --localstatedir='/var' \
+ --sysconfdir='/etc' \
+ --enable-{broadway,wayland,x11}-backend \
+ --disable-libcanberra \
+ --disable-schemas-compile
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package() {
+ cd gtk+-${pkgver}
+
+ make DESTDIR="${pkgdir}" install
+ mv "${pkgdir}"/usr/bin/gtk-query-immodules-3.0{,-32}
+ mv "${pkgdir}"/usr/bin/gtk-query-settings{,-32}
+ rm "${pkgdir}"/usr/bin/{broadwayd,gtk-{builder-tool,encode-symbolic-svg,launch,update-icon-cache},gtk3-{demo,demo-application,icon-browser,widget-factory}}
+ rm -rf "${pkgdir}"/{etc,usr/{include,share}}
+
+ install -dm 755 "${pkgdir}"/usr/share/libalpm/hooks
+ install -m 644 ../gtk-query-immodules-3.0-32.hook "${pkgdir}"/usr/share/libalpm/hooks/
+}
+
+# vim: ts=2 sw=2 et:
Deleted: gtk-query-immodules-3.0-32.hook
===================================================================
--- gtk-query-immodules-3.0-32.hook 2016-05-30 18:23:50 UTC (rev 177474)
+++ gtk-query-immodules-3.0-32.hook 2016-05-30 18:30:35 UTC (rev 177475)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib32/gtk-3.0/3.0.0/immodules/*.so
-
-[Action]
-Description = Probing GTK3 input method modules (multilib)...
-When = PostTransaction
-Exec = /bin/sh -c "GTK_PATH=/usr/lib32/gtk-3.0 /usr/bin/gtk-query-immodules-3.0-32 --update-cache"
Copied: lib32-gtk3/repos/multilib-x86_64/gtk-query-immodules-3.0-32.hook (from rev 177474, lib32-gtk3/trunk/gtk-query-immodules-3.0-32.hook)
===================================================================
--- gtk-query-immodules-3.0-32.hook (rev 0)
+++ gtk-query-immodules-3.0-32.hook 2016-05-30 18:30:35 UTC (rev 177475)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib32/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules (multilib)...
+When = PostTransaction
+Exec = /bin/sh -c "GTK_PATH=/usr/lib32/gtk-3.0 /usr/bin/gtk-query-immodules-3.0-32 --update-cache"
Deleted: gtk3-scrolledwindow.patch
===================================================================
--- gtk3-scrolledwindow.patch 2016-05-30 18:23:50 UTC (rev 177474)
+++ gtk3-scrolledwindow.patch 2016-05-30 18:30:35 UTC (rev 177475)
@@ -1,33 +0,0 @@
-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
-
More information about the arch-commits
mailing list