[arch-commits] Commit in gtk3/trunk (3 files)

2020-02-20 Thread Jan Steffens via arch-commits 
Date: Thursday, February 20, 2020 @ 14:22:17
  Author: heftig
Revision: 375919

3.24.14+9+g429a6287e0-1

Modified:
  gtk3/trunk/PKGBUILD
  gtk3/trunk/gtk-query-immodules-3.0.hook
  gtk3/trunk/gtk-update-icon-cache.hook

--+
 PKGBUILD |8 
 gtk-query-immodules-3.0.hook |2 +-
 gtk-update-icon-cache.hook   |2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-02-20 13:27:11 UTC (rev 375918)
+++ PKGBUILD2020-02-20 14:22:17 UTC (rev 375919)
@@ -3,7 +3,7 @@
 
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.24.14
+pkgver=3.24.14+9+g429a6287e0
 pkgrel=1
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
@@ -15,7 +15,7 @@
  cantarell-fonts colord rest libcups libcanberra fribidi iso-codes)
 makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
 license=(LGPL)
-_commit=fab213a5f93c5624ed62a949ea6f93c8f2a3a591  # tags/3.24.14^0
+_commit=429a6287e0ceae7b67e82d882652e86fa12f0ad4  # gtk-3-24
 source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit;
 settings.ini
 gtk-query-immodules-3.0.hook
@@ -23,8 +23,8 @@
 gtk-update-icon-cache.script)
 sha256sums=('SKIP'
 '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
-'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
-'496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
+'a0319b6795410f06d38de1e8695a9bf9636ff2169f40701671580e60a108e229'
+'2d435e3bec8b79b533f00f6d04decb1d7c299c6e89b5b175f20be0459f003fe8'
 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
 
 pkgver() {

Modified: gtk-query-immodules-3.0.hook
===
--- gtk-query-immodules-3.0.hook2020-02-20 13:27:11 UTC (rev 375918)
+++ gtk-query-immodules-3.0.hook2020-02-20 14:22:17 UTC (rev 375919)
@@ -1,5 +1,5 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Install
 Operation = Upgrade
 Operation = Remove

Modified: gtk-update-icon-cache.hook
===
--- gtk-update-icon-cache.hook  2020-02-20 13:27:11 UTC (rev 375918)
+++ gtk-update-icon-cache.hook  2020-02-20 14:22:17 UTC (rev 375919)
@@ -1,5 +1,5 @@
 [Trigger]
-Type = File
+Type = Path
 Operation = Install
 Operation = Upgrade
 Operation = Remove

[arch-commits] Commit in gtk3/trunk (3 files)

2016-05-19 Thread Jan Steffens 
Date: Thursday, May 19, 2016 @ 21:10:46
  Author: heftig
Revision: 268320

3.20.5-1

Modified:
  gtk3/trunk/PKGBUILD
  gtk3/trunk/gtk-update-icon-cache.script
Deleted:
  gtk3/trunk/trap_possible_X_error.diff

--+
 PKGBUILD |   17 +
 gtk-update-icon-cache.script |2 +-
 trap_possible_X_error.diff   |   30 --
 3 files changed, 6 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-19 19:06:06 UTC (rev 268319)
+++ PKGBUILD2016-05-19 19:10:46 UTC (rev 268320)
@@ -4,8 +4,8 @@
 
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.20.4
-pkgrel=2
+pkgver=3.20.5
+pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(i686 x86_64)
 url="http://www.gtk.org/;
@@ -18,23 +18,16 @@
 settings.ini
 gtk-query-immodules-3.0.hook
 gtk-update-icon-cache.hook
-gtk-update-icon-cache.script
-trap_possible_X_error.diff)
-sha256sums=('e7e3aaf54a54dd1c1ca0588939254abe31329e0bcd280a12290d5306b41ea03f'
+gtk-update-icon-cache.script)
+sha256sums=('9790b0267384904ad8a08e7f16e5f9ff1c4037de57788d48d1eaf528355b1564'
 '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
 '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
-'bbe06e1b4e1ad5d61a4e703445a2bb93c6be918964d6dd76c0420c6667fa11eb'
-'1204b67e45938304ce8500c4b9de52af5d2d90bcb4a2e28bc665f5b29803f28d')
+'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
 
 prepare() {
 cd gtk+-$pkgver
 NOCONFIGURE=1 ./autogen.sh
-
-# upstream fix for crashes with X servers not supporting XI2
-# https://bugzilla.gnome.org/show_bug.cgi?id=766233
-# 
https://github.com/GNOME/gtk/commit/7e7d7991cc8e7c7a2b50ce6530a8ebafd673516b
-patch -Np1 -i ${srcdir}/trap_possible_X_error.diff
 }
 
 build() {

Modified: gtk-update-icon-cache.script
===
--- gtk-update-icon-cache.script2016-05-19 19:06:06 UTC (rev 268319)
+++ gtk-update-icon-cache.script2016-05-19 19:10:46 UTC (rev 268320)
@@ -3,7 +3,7 @@
 while read -r f; do
   if [[ -e ${f}index.theme ]]; then
 gtk-update-icon-cache -q "$f"
-  else
+  elif [[ -d $f ]]; then
 rm -f "${f}icon-theme.cache"
 rmdir --ignore-fail-on-non-empty "$f"
   fi

Deleted: trap_possible_X_error.diff
===
--- trap_possible_X_error.diff  2016-05-19 19:06:06 UTC (rev 268319)
+++ trap_possible_X_error.diff  2016-05-19 19:10:46 UTC (rev 268320)
@@ -1,30 +0,0 @@
-diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c
-index f7c79c4..ad65e29 100644
 a/gdk/x11/gdkdisplay-x11.c
-+++ b/gdk/x11/gdkdisplay-x11.c
-@@ -2881,10 +2881,14 @@ gdk_x11_display_get_default_seat (GdkDisplay *display)
- {
-   GList *seats, *l;
-   int device_id;
-+  gboolean result = FALSE;
- 
-   seats = gdk_display_list_seats (display);
--  XIGetClientPointer (GDK_DISPLAY_XDISPLAY (display),
--  None, _id);
-+
-+  gdk_x11_display_error_trap_push (display);
-+  result = XIGetClientPointer (GDK_DISPLAY_XDISPLAY (display),
-+   None, _id);
-+  gdk_x11_display_error_trap_pop_ignored (display);
- 
-   for (l = seats; l; l = l->next)
- {
-@@ -2892,7 +2896,7 @@ gdk_x11_display_get_default_seat (GdkDisplay *display)
- 
-   pointer = gdk_seat_get_pointer (l->data);
- 
--  if (gdk_x11_device_get_id (pointer) == device_id)
-+  if (gdk_x11_device_get_id (pointer) == device_id || !result)
- {
-   GdkSeat *seat = l->data;
-   g_list_free (seats);

[arch-commits] Commit in gtk3/trunk (3 files)

2016-04-27 Thread Allan McRae 
Date: Wednesday, April 27, 2016 @ 14:25:38
  Author: allan
Revision: 266211

upgpkg: gtk3 3.20.3-2

add gtk-update-icon-cache hook

Added:
  gtk3/trunk/gtk-update-icon-cache.hook
  gtk3/trunk/gtk-update-icon-cache.script
Modified:
  gtk3/trunk/PKGBUILD

--+
 PKGBUILD |   13 ++---
 gtk-update-icon-cache.hook   |   13 +
 gtk-update-icon-cache.script |   10 ++
 3 files changed, 33 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-27 12:18:24 UTC (rev 266210)
+++ PKGBUILD2016-04-27 12:25:38 UTC (rev 266211)
@@ -5,7 +5,7 @@
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
 pkgver=3.20.3
-pkgrel=1
+pkgrel=2
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(i686 x86_64)
 url="http://www.gtk.org/;
@@ -15,9 +15,13 @@
 makedepends=(gobject-introspection libcanberra gtk-doc)
 license=(LGPL)
 
source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
-settings.ini)
+settings.ini
+gtk-update-icon-cache.hook
+gtk-update-icon-cache.script)
 sha256sums=('3834f3bf23b260b3e5ebfea41102e2026a8af29e36c3620edf4a5cf05e82f694'
-'01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202')
+'01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+'496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
+'bbe06e1b4e1ad5d61a4e703445a2bb93c6be918964d6dd76c0420c6667fa11eb')
 
 prepare() {
 cd gtk+-$pkgver
@@ -61,6 +65,9 @@
 
 cd gtk+-$pkgver/gtk
 install -Dm755 gtk-update-icon-cache 
"$pkgdir/usr/bin/gtk-update-icon-cache"
+
+install -Dm644 "$srcdir"/gtk-update-icon-cache.hook 
"$pkgdir"/usr/share/libalpm/hooks/gtk-update-icon-cache.hook
+install -Dm644 "$srcdir"/gtk-update-icon-cache.script 
"$pkgdir"/usr/share/libalpm/scripts/gtk-update-icon-cache
 }
 
 # vim:set et sw=4:

Added: gtk-update-icon-cache.hook
===
--- gtk-update-icon-cache.hook  (rev 0)
+++ gtk-update-icon-cache.hook  2016-04-27 12:25:38 UTC (rev 266211)
@@ -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

Added: gtk-update-icon-cache.script
===
--- gtk-update-icon-cache.script(rev 0)
+++ gtk-update-icon-cache.script2016-04-27 12:25:38 UTC (rev 266211)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read -r f; do
+  if [[ -e ${f}index.theme ]]; then
+gtk-update-icon-cache -q "$f"
+  else
+rm -f "${f}icon-theme.cache"
+rmdir --ignore-fail-on-non-empty "$f"
+  fi
+done

[arch-commits] Commit in gtk3/trunk (3 files)

2016-02-24 Thread Jan Steffens 
Date: Wednesday, February 24, 2016 @ 19:12:28
  Author: heftig
Revision: 260226

3.18.8

Modified:
  gtk3/trunk/PKGBUILD
Deleted:
  gtk3/trunk/0001-file-chooser-Avoid-a-crash.patch
  gtk3/trunk/0001-file-chooser-Use-the-right-model-when-getting-the-se.patch

-+
 0001-file-chooser-Avoid-a-crash.patch   |   46 
--
 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch |   42 
-
 PKGBUILD|   16 ---
 3 files changed, 3 insertions(+), 101 deletions(-)

Deleted: 0001-file-chooser-Avoid-a-crash.patch
===
--- 0001-file-chooser-Avoid-a-crash.patch   2016-02-24 17:19:05 UTC (rev 
260225)
+++ 0001-file-chooser-Avoid-a-crash.patch   2016-02-24 18:12:28 UTC (rev 
260226)
@@ -1,46 +0,0 @@
-From f793da54a992d87da42c1f98e3cd5e9556c670ab Mon Sep 17 00:00:00 2001
-From: Matthias Clasen 
-Date: Sat, 30 Jan 2016 23:07:56 -0500
-Subject: [PATCH] file chooser: Avoid a crash
-
-Since 39c2d12330b6d4405ca8a5599c12017c58626fcf,
-priv->operation_mode == OPERATION_MODE_BROWSE no longer
-guarantees that priv->browse_files_model is the current
-model of the list - we are only switching the models after
-loading the new directory. Avoid triggering the assertion
-in show_and_select_files by checking if we have right model
-before calling it.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=761209

- gtk/gtkfilechooserwidget.c | 6 +-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
-index 127e18b..d1a2ed8 100644
 a/gtk/gtkfilechooserwidget.c
-+++ b/gtk/gtkfilechooserwidget.c
-@@ -5630,15 +5630,19 @@ gtk_file_chooser_widget_select_file (GtkFileChooser  
*chooser,
-   GtkFileChooserWidgetPrivate *priv = impl->priv;
-   GFile *parent_file;
-   gboolean same_path;
-+  GtkFileSystemModel *fsmodel;
- 
-   parent_file = g_file_get_parent (file);
- 
-   if (!parent_file)
- return gtk_file_chooser_set_current_folder_file (chooser, file, error);
- 
-+  fsmodel = GTK_FILE_SYSTEM_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW 
(priv->browse_files_tree_view)));
-+
-   if (priv->operation_mode == OPERATION_MODE_SEARCH ||
-   priv->operation_mode == OPERATION_MODE_RECENT ||
--  priv->load_state == LOAD_EMPTY)
-+  priv->load_state == LOAD_EMPTY ||
-+  priv->browse_files_model != fsmodel)
- {
-   same_path = FALSE;
- }
--- 
-2.7.1
-

Deleted: 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch
===
--- 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch 
2016-02-24 17:19:05 UTC (rev 260225)
+++ 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch 
2016-02-24 18:12:28 UTC (rev 260226)
@@ -1,42 +0,0 @@
-From 811a9b21c1bb226236d2a880f9cbbcbcf6028c2e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen 
-Date: Fri, 12 Feb 2016 20:35:26 -0500
-Subject: [PATCH] file chooser: Use the right model when getting the selection
-
-We don't need to make assumptions about which model is currently
-used since gtk_tree_selection_get_selection hands us the model.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=761757

- gtk/gtkfilechooserwidget.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
-index c77a8b7..6ef25b6 100644
 a/gtk/gtkfilechooserwidget.c
-+++ b/gtk/gtkfilechooserwidget.c
-@@ -6266,10 +6266,11 @@ get_selected_file_info_from_file_list 
(GtkFileChooserWidget *impl,
-   GtkTreeSelection *selection;
-   GtkTreeIter iter;
-   GFileInfo *info;
-+  GtkTreeModel *model;
- 
-   g_assert (!priv->select_multiple);
-   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW 
(priv->browse_files_tree_view));
--  if (!gtk_tree_selection_get_selected (selection, NULL, ))
-+  if (!gtk_tree_selection_get_selected (selection, , ))
- {
-   *had_selection = FALSE;
-   return NULL;
-@@ -6277,7 +6278,7 @@ get_selected_file_info_from_file_list 
(GtkFileChooserWidget *impl,
- 
-   *had_selection = TRUE;
- 
--  info = _gtk_file_system_model_get_info (priv->browse_files_model, );
-+  info = _gtk_file_system_model_get_info (GTK_FILE_SYSTEM_MODEL (model), 
);
-   return info;
- }
- 
--- 
-2.7.1
-

Modified: PKGBUILD
===
--- PKGBUILD2016-02-24 17:19:05 UTC (rev 260225)
+++ PKGBUILD2016-02-24 18:12:28 UTC (rev 260226)
@@ -4,8 +4,8 @@
 
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.18.7
-pkgrel=2
+pkgver=3.18.8
+pkgrel=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(i686 x86_64)
 url="http://www.gtk.org/;
@@ -15,23 +15,13 @@
 makedepends=(gobject-introspection libcanberra gtk-doc)
 license=(LGPL)

[arch-commits] Commit in gtk3/trunk (3 files)

2016-02-16 Thread Evangelos Foutras 
Date: Tuesday, February 16, 2016 @ 10:19:10
  Author: foutrelis
Revision: 259562

upgpkg: gtk3 3.18.7-2

Fix two crashes in the file chooser dialog (FS#48158).

Added:
  gtk3/trunk/0001-file-chooser-Avoid-a-crash.patch
  gtk3/trunk/0001-file-chooser-Use-the-right-model-when-getting-the-se.patch
Modified:
  gtk3/trunk/PKGBUILD

-+
 0001-file-chooser-Avoid-a-crash.patch   |   46 
++
 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch |   42 
+
 PKGBUILD|   12 ++
 3 files changed, 99 insertions(+), 1 deletion(-)

Added: 0001-file-chooser-Avoid-a-crash.patch
===
--- 0001-file-chooser-Avoid-a-crash.patch   (rev 0)
+++ 0001-file-chooser-Avoid-a-crash.patch   2016-02-16 09:19:10 UTC (rev 
259562)
@@ -0,0 +1,46 @@
+From f793da54a992d87da42c1f98e3cd5e9556c670ab Mon Sep 17 00:00:00 2001
+From: Matthias Clasen 
+Date: Sat, 30 Jan 2016 23:07:56 -0500
+Subject: [PATCH] file chooser: Avoid a crash
+
+Since 39c2d12330b6d4405ca8a5599c12017c58626fcf,
+priv->operation_mode == OPERATION_MODE_BROWSE no longer
+guarantees that priv->browse_files_model is the current
+model of the list - we are only switching the models after
+loading the new directory. Avoid triggering the assertion
+in show_and_select_files by checking if we have right model
+before calling it.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=761209
+---
+ gtk/gtkfilechooserwidget.c | 6 +-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
+index 127e18b..d1a2ed8 100644
+--- a/gtk/gtkfilechooserwidget.c
 b/gtk/gtkfilechooserwidget.c
+@@ -5630,15 +5630,19 @@ gtk_file_chooser_widget_select_file (GtkFileChooser  
*chooser,
+   GtkFileChooserWidgetPrivate *priv = impl->priv;
+   GFile *parent_file;
+   gboolean same_path;
++  GtkFileSystemModel *fsmodel;
+ 
+   parent_file = g_file_get_parent (file);
+ 
+   if (!parent_file)
+ return gtk_file_chooser_set_current_folder_file (chooser, file, error);
+ 
++  fsmodel = GTK_FILE_SYSTEM_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW 
(priv->browse_files_tree_view)));
++
+   if (priv->operation_mode == OPERATION_MODE_SEARCH ||
+   priv->operation_mode == OPERATION_MODE_RECENT ||
+-  priv->load_state == LOAD_EMPTY)
++  priv->load_state == LOAD_EMPTY ||
++  priv->browse_files_model != fsmodel)
+ {
+   same_path = FALSE;
+ }
+-- 
+2.7.1
+

Added: 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch
===
--- 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch 
(rev 0)
+++ 0001-file-chooser-Use-the-right-model-when-getting-the-se.patch 
2016-02-16 09:19:10 UTC (rev 259562)
@@ -0,0 +1,42 @@
+From 811a9b21c1bb226236d2a880f9cbbcbcf6028c2e Mon Sep 17 00:00:00 2001
+From: Matthias Clasen 
+Date: Fri, 12 Feb 2016 20:35:26 -0500
+Subject: [PATCH] file chooser: Use the right model when getting the selection
+
+We don't need to make assumptions about which model is currently
+used since gtk_tree_selection_get_selection hands us the model.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=761757
+---
+ gtk/gtkfilechooserwidget.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
+index c77a8b7..6ef25b6 100644
+--- a/gtk/gtkfilechooserwidget.c
 b/gtk/gtkfilechooserwidget.c
+@@ -6266,10 +6266,11 @@ get_selected_file_info_from_file_list 
(GtkFileChooserWidget *impl,
+   GtkTreeSelection *selection;
+   GtkTreeIter iter;
+   GFileInfo *info;
++  GtkTreeModel *model;
+ 
+   g_assert (!priv->select_multiple);
+   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW 
(priv->browse_files_tree_view));
+-  if (!gtk_tree_selection_get_selected (selection, NULL, ))
++  if (!gtk_tree_selection_get_selected (selection, , ))
+ {
+   *had_selection = FALSE;
+   return NULL;
+@@ -6277,7 +6278,7 @@ get_selected_file_info_from_file_list 
(GtkFileChooserWidget *impl,
+ 
+   *had_selection = TRUE;
+ 
+-  info = _gtk_file_system_model_get_info (priv->browse_files_model, );
++  info = _gtk_file_system_model_get_info (GTK_FILE_SYSTEM_MODEL (model), 
);
+   return info;
+ }
+ 
+-- 
+2.7.1
+

Modified: PKGBUILD
===
--- PKGBUILD2016-02-16 09:18:43 UTC (rev 259561)
+++ PKGBUILD2016-02-16 09:19:10 UTC (rev 259562)
@@ -5,7 +5,7 @@
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
 pkgver=3.18.7
-pkgrel=1
+pkgrel=2
 pkgdesc="GObject-based multi-platform GUI toolkit"
 arch=(i686 x86_64)
 url="http://www.gtk.org/;
@@ -15,13 +15,23 @@
 makedepends=(gobject-introspection

[arch-commits] Commit in gtk3/trunk (3 files)

2016-01-28 Thread Jan Steffens 
Date: Thursday, January 28, 2016 @ 16:24:22
  Author: heftig
Revision: 258669

3.18.7

Modified:
  gtk3/trunk/PKGBUILD
Deleted:
  gtk3/trunk/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
  gtk3/trunk/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch

-+
 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch  |   85 
-
 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch |   94 
--
 PKGBUILD|   18 -
 3 files changed, 5 insertions(+), 192 deletions(-)

Deleted: 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
===
--- 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch  
2016-01-28 09:27:42 UTC (rev 258668)
+++ 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch  
2016-01-28 15:24:22 UTC (rev 258669)
@@ -1,85 +0,0 @@
-From affd6e70734d7897324409d6fc0beb7b4eb7235a Mon Sep 17 00:00:00 2001
-From: Matthias Clasen 
-Date: Wed, 6 Jan 2016 14:54:33 -0500
-Subject: [PATCH 1/2] x11: Only do cursor name fallback for standard names
-
-Always returning a left_ptr if we can't find anything better
-broke firefox application-specific fallback for missing cursors.
-Keep that working by only doing the fallback for the CSS cursor
-names, not for things like hashes.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=760141

- gdk/x11/gdkcursor-x11.c | 24 
- 1 file changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
-index 540f48e..d619f58 100644
 a/gdk/x11/gdkcursor-x11.c
-+++ b/gdk/x11/gdkcursor-x11.c
-@@ -611,17 +611,23 @@ static const struct {
-   const gchar *css_name, *traditional_name;
- } name_map[] = {
-   { "default",  "left_ptr" },
-+  { "help", "left_ptr" },
-+  { "context-menu", "left_ptr" },
-   { "pointer",  "hand" },
-   { "progress", "left_ptr_watch" },
-   { "wait", "watch" },
-   { "cell", "crosshair" },
-   { "crosshair","cross" },
-   { "text", "xterm" },
-+  { "vertical-text","xterm" },
-   { "alias","dnd-link" },
-   { "copy", "dnd-copy" },
-+  { "move", "dnd-move" },
-   { "no-drop",  "dnd-none" },
-   { "not-allowed",  "crossed_circle" },
-   { "grab", "hand2" },
-+  { "grabbing", "hand2" },
-+  { "all-scroll",   "left_ptr" },
-   { "col-resize",   "h_double_arrow" },
-   { "row-resize",   "v_double_arrow" },
-   { "n-resize", "top_side" },
-@@ -636,6 +642,8 @@ static const struct {
-   { "ns-resize","v_double_arrow" },
-   { "nesw-resize",  "fd_double_arrow" },
-   { "nwse-resize",  "bd_double_arrow" },
-+  { "zoom-in",  "left_ptr" },
-+  { "zoom-out", "left_ptr" },
-   { NULL, NULL }
- };
- 
-@@ -650,7 +658,7 @@ name_fallback (const gchar *name)
- return name_map[i].traditional_name;
- }
- 
--  return "left_ptr";
-+  return NULL;
- }
- 
- GdkCursor*
-@@ -683,9 +691,17 @@ _gdk_x11_display_get_cursor_for_name (GdkDisplay  
*display,
-   xdisplay = GDK_DISPLAY_XDISPLAY (display);
-   xcursor = XcursorLibraryLoadCursor (xdisplay, name);
-   if (xcursor == None)
--xcursor = XcursorLibraryLoadCursor (xdisplay, name_fallback (name));
--  if (xcursor == None)
--xcursor = XcursorLibraryLoadCursor (xdisplay, "left_ptr");
-+{
-+  const char *fallback;
-+
-+  fallback = name_fallback (name);
-+  if (fallback)
-+{
-+  xcursor = XcursorLibraryLoadCursor (xdisplay, fallback);
-+  if (xcursor == None)
-+xcursor = XcursorLibraryLoadCursor (xdisplay, "left_ptr");
-+}
-+}
-   if (xcursor == None)
- return NULL;
- }
--- 
-2.7.0
-

Deleted: 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
===
--- 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch 
2016-01-28 09:27:42 UTC (rev 258668)
+++ 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch 
2016-01-28 15:24:22 UTC (rev 258669)
@@ -1,94 +0,0 @@
-From 81a287478a4db9ce650cc764474b9c173b137dee Mon Sep 17 00:00:00 2001
-From: Matthias Clasen 
-Date: Wed, 6 Jan 2016 14:56:06 -0500
-Subject: [PATCH 2/2] wayland: Only do cursor name fallback for standard names
-
-Always returning a left_ptr if we can't find anything better
-broke firefox application-specific fallback for missing cursors.
-Keep that working by only doing the fallback for the CSS cursor
-names, not for things like hashes.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=760141

- gdk/wayland/gdkcursor-wayland.c | 29 +
- 1 file changed, 21 insertions(+), 8 deletions(-)
-
-diff --git

[arch-commits] Commit in gtk3/trunk (3 files)

2016-01-07 Thread Evangelos Foutras 
Date: Friday, January 8, 2016 @ 03:35:57
  Author: foutrelis
Revision: 257627

upgpkg: gtk3 3.18.6-2

Fix zoom in/out cursors in GTK3 builds of Firefox (FS#47444).

Added:
  gtk3/trunk/0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
  gtk3/trunk/0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
Modified:
  gtk3/trunk/PKGBUILD

-+
 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch  |   85 
+
 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch |   94 
++
 PKGBUILD|   11 +
 3 files changed, 189 insertions(+), 1 deletion(-)

Added: 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch
===
--- 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch  
(rev 0)
+++ 0001-x11-Only-do-cursor-name-fallback-for-standard-names.patch  
2016-01-08 02:35:57 UTC (rev 257627)
@@ -0,0 +1,85 @@
+From affd6e70734d7897324409d6fc0beb7b4eb7235a Mon Sep 17 00:00:00 2001
+From: Matthias Clasen 
+Date: Wed, 6 Jan 2016 14:54:33 -0500
+Subject: [PATCH 1/2] x11: Only do cursor name fallback for standard names
+
+Always returning a left_ptr if we can't find anything better
+broke firefox application-specific fallback for missing cursors.
+Keep that working by only doing the fallback for the CSS cursor
+names, not for things like hashes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=760141
+---
+ gdk/x11/gdkcursor-x11.c | 24 
+ 1 file changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/gdk/x11/gdkcursor-x11.c b/gdk/x11/gdkcursor-x11.c
+index 540f48e..d619f58 100644
+--- a/gdk/x11/gdkcursor-x11.c
 b/gdk/x11/gdkcursor-x11.c
+@@ -611,17 +611,23 @@ static const struct {
+   const gchar *css_name, *traditional_name;
+ } name_map[] = {
+   { "default",  "left_ptr" },
++  { "help", "left_ptr" },
++  { "context-menu", "left_ptr" },
+   { "pointer",  "hand" },
+   { "progress", "left_ptr_watch" },
+   { "wait", "watch" },
+   { "cell", "crosshair" },
+   { "crosshair","cross" },
+   { "text", "xterm" },
++  { "vertical-text","xterm" },
+   { "alias","dnd-link" },
+   { "copy", "dnd-copy" },
++  { "move", "dnd-move" },
+   { "no-drop",  "dnd-none" },
+   { "not-allowed",  "crossed_circle" },
+   { "grab", "hand2" },
++  { "grabbing", "hand2" },
++  { "all-scroll",   "left_ptr" },
+   { "col-resize",   "h_double_arrow" },
+   { "row-resize",   "v_double_arrow" },
+   { "n-resize", "top_side" },
+@@ -636,6 +642,8 @@ static const struct {
+   { "ns-resize","v_double_arrow" },
+   { "nesw-resize",  "fd_double_arrow" },
+   { "nwse-resize",  "bd_double_arrow" },
++  { "zoom-in",  "left_ptr" },
++  { "zoom-out", "left_ptr" },
+   { NULL, NULL }
+ };
+ 
+@@ -650,7 +658,7 @@ name_fallback (const gchar *name)
+ return name_map[i].traditional_name;
+ }
+ 
+-  return "left_ptr";
++  return NULL;
+ }
+ 
+ GdkCursor*
+@@ -683,9 +691,17 @@ _gdk_x11_display_get_cursor_for_name (GdkDisplay  
*display,
+   xdisplay = GDK_DISPLAY_XDISPLAY (display);
+   xcursor = XcursorLibraryLoadCursor (xdisplay, name);
+   if (xcursor == None)
+-xcursor = XcursorLibraryLoadCursor (xdisplay, name_fallback (name));
+-  if (xcursor == None)
+-xcursor = XcursorLibraryLoadCursor (xdisplay, "left_ptr");
++{
++  const char *fallback;
++
++  fallback = name_fallback (name);
++  if (fallback)
++{
++  xcursor = XcursorLibraryLoadCursor (xdisplay, fallback);
++  if (xcursor == None)
++xcursor = XcursorLibraryLoadCursor (xdisplay, "left_ptr");
++}
++}
+   if (xcursor == None)
+ return NULL;
+ }
+-- 
+2.7.0
+

Added: 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch
===
--- 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch 
(rev 0)
+++ 0002-wayland-Only-do-cursor-name-fallback-for-standard-na.patch 
2016-01-08 02:35:57 UTC (rev 257627)
@@ -0,0 +1,94 @@
+From 81a287478a4db9ce650cc764474b9c173b137dee Mon Sep 17 00:00:00 2001
+From: Matthias Clasen 
+Date: Wed, 6 Jan 2016 14:56:06 -0500
+Subject: [PATCH 2/2] wayland: Only do cursor name fallback for standard names
+
+Always returning a left_ptr if we can't find anything better
+broke firefox application-specific fallback for missing cursors.
+Keep that working by only doing the fallback for the CSS cursor
+names, not for things like hashes.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=760141
+---
+ gdk/wayland/gdkcursor-wayland.c | 29 +
+ 1 file changed, 21

[arch-commits] Commit in gtk3/trunk (3 files)

2015-05-13 Thread Jan Steffens 
Date: Wednesday, May 13, 2015 @ 18:42:49
  Author: heftig
Revision: 239302

Add back settings.ini (mostly for default font) and move gtk-update-icon-cache 
from gtk2

Added:
  gtk3/trunk/gtk-update-icon-cache.install
Modified:
  gtk3/trunk/PKGBUILD
  gtk3/trunk/settings.ini

---+
 PKGBUILD  |   40 ++--
 gtk-update-icon-cache.install |3 +++
 settings.ini  |2 +-
 3 files changed, 34 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-05-13 16:37:42 UTC (rev 239301)
+++ PKGBUILD2015-05-13 16:42:49 UTC (rev 239302)
@@ -2,21 +2,22 @@
 # Maintainer: Ionut Biru ib...@archlinux.org
 # Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
 
-pkgname=gtk3
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache)
 pkgver=3.16.3
-pkgrel=1
-pkgdesc=GObject-based multi-platform GUI toolkit (v3)
+pkgrel=2
+pkgdesc=GObject-based multi-platform GUI toolkit
 arch=(i686 x86_64)
 url=http://www.gtk.org/;
-install=gtk3.install
-depends=(atk cairo gtk-update-icon-cache libcups libxcursor libxinerama 
libxrandr libxi libepoxy
+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)
 makedepends=(gobject-introspection libcanberra)
-optdepends=('libcanberra: gtk3-widget-factory demo')
 license=(LGPL)
-source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz)
-sha256sums=('2943fd4a6b02c2a9b2edd231c1d8f7a1d2f8d36996f14310d34f503dca9ebea4')
+source=(https://download.gnome.org/sources/gtk+/${pkgver:0:4}/gtk+-$pkgver.tar.xz
+settings.ini)
+sha256sums=('2943fd4a6b02c2a9b2edd231c1d8f7a1d2f8d36996f14310d34f503dca9ebea4'
+'01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202')
 
 prepare() {
 cd gtk+-$pkgver
@@ -39,8 +40,27 @@
 make
 }
 
-package() {
+package_gtk3() {
+depends+=(gtk-update-icon-cache)
+optdepends=('libcanberra: gtk3-widget-factory demo'
+'adwaita-icon-theme: Default icon theme')
+install=gtk3.install
+
 cd gtk+-$pkgver
 make DESTDIR=$pkgdir install
-rm -f $pkgdir/usr/bin/gtk-update-icon-cache
+install -Dm644 ../settings.ini $pkgdir/usr/share/gtk-3.0/settings.ini
+
+# 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)
+install=gtk-update-icon-cache.install
+
+cd gtk+-$pkgver/gtk
+install -Dm755 gtk-update-icon-cache 
$pkgdir/usr/bin/gtk-update-icon-cache
+}
+
+# vim:set noet sw=4:

Added: gtk-update-icon-cache.install
===
--- gtk-update-icon-cache.install   (rev 0)
+++ gtk-update-icon-cache.install   2015-05-13 16:42:49 UTC (rev 239302)
@@ -0,0 +1,3 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}

Modified: settings.ini
===
--- settings.ini2015-05-13 16:37:42 UTC (rev 239301)
+++ settings.ini2015-05-13 16:42:49 UTC (rev 239302)
@@ -1,4 +1,4 @@
 [Settings]
-gtk-icon-theme-name = gnome
+gtk-icon-theme-name = Adwaita
 gtk-theme-name = Adwaita
 gtk-font-name = Cantarell 11

[arch-commits] Commit in gtk3/trunk (3 files)

2015-04-13 Thread Jan Steffens 
Date: Tuesday, April 14, 2015 @ 04:00:32
  Author: heftig
Revision: 236459

3.16.2

Modified:
  gtk3/trunk/PKGBUILD
Deleted:
  gtk3/trunk/0001-Revert-image-Optimize-non-resize-changes.patch
  gtk3/trunk/0001-x11-Relax-requirements-for-setting-ParentRelative.patch

--+
 0001-Revert-image-Optimize-non-resize-changes.patch  |  233 --
 0001-x11-Relax-requirements-for-setting-ParentRelative.patch |   42 -
 PKGBUILD |   23 
 3 files changed, 5 insertions(+), 293 deletions(-)

Deleted: 0001-Revert-image-Optimize-non-resize-changes.patch
===
--- 0001-Revert-image-Optimize-non-resize-changes.patch 2015-04-14 02:00:13 UTC 
(rev 236458)
+++ 0001-Revert-image-Optimize-non-resize-changes.patch 2015-04-14 02:00:32 UTC 
(rev 236459)
@@ -1,233 +0,0 @@
-From 7963f689296ad06dff0e0d426bd9324de1dec7aa Mon Sep 17 00:00:00 2001
-From: Matthias Clasen mcla...@redhat.com
-Date: Wed, 8 Apr 2015 14:18:08 -0400
-Subject: [PATCH] Revert image: Optimize non-resize changes
-
-This reverts commit fef7d65685a3a45a47f968cab6b5e5150323f606.
-
-We're still seeing regressions from this, see
-http://bugzilla.redhat.com/show_bug.cgi?id=1208183

- gtk/gtkimage.c | 107 +
- 1 file changed, 17 insertions(+), 90 deletions(-)
-
-diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
-index d501aef..5763f06 100644
 a/gtk/gtkimage.c
-+++ b/gtk/gtkimage.c
-@@ -155,9 +155,6 @@ static void gtk_image_size_allocate(GtkWidget
*widget,
- static void gtk_image_unmap(GtkWidget*widget);
- static void gtk_image_realize  (GtkWidget*widget);
- static void gtk_image_unrealize(GtkWidget*widget);
--static void gtk_image_get_preferred_size   (GtkImage *image,
--gint *width_out,
--gint *height_out);
- static void gtk_image_get_preferred_width  (GtkWidget*widget,
- gint *minimum,
- gint *natural);
-@@ -937,8 +934,8 @@ gtk_image_set_from_file   (GtkImage*image,
-   priv = image-priv;
- 
-   g_object_freeze_notify (G_OBJECT (image));
--
--  gtk_image_reset (image);
-+  
-+  gtk_image_clear (image);
- 
-   if (filename == NULL)
- {
-@@ -951,7 +948,9 @@ gtk_image_set_from_file   (GtkImage*image,
- 
-   if (anim == NULL)
- {
--  gtk_image_set_from_icon_name (image, image-missing, 
DEFAULT_ICON_SIZE);
-+  gtk_image_set_from_icon_name (image,
-+image-missing,
-+DEFAULT_ICON_SIZE);
-   g_object_thaw_notify (G_OBJECT (image));
-   return;
- }
-@@ -972,21 +971,7 @@ gtk_image_set_from_file   (GtkImage*image,
-   g_object_unref (anim);
- 
-   priv-filename = g_strdup (filename);
--
--  if (gtk_widget_get_visible (GTK_WIDGET (image)))
--{
--  gint width, height;
--
--  gtk_image_get_preferred_size (image, width, height);
--  if (width != gtk_widget_get_allocated_width (GTK_WIDGET (image)) ||
--  height != gtk_widget_get_allocated_height (GTK_WIDGET (image)))
--gtk_widget_queue_resize (GTK_WIDGET (image));
--  else
--gtk_widget_queue_draw (GTK_WIDGET (image));
--}
--
--  g_object_notify (G_OBJECT (image), file);
--
-+  
-   g_object_thaw_notify (G_OBJECT (image));
- }
- 
-@@ -1023,7 +1008,9 @@ gtk_image_set_from_resource (GtkImage*image,
- 
-   if (animation == NULL)
- {
--  gtk_image_set_from_icon_name (image, image-missing, 
DEFAULT_ICON_SIZE);
-+  gtk_image_set_from_icon_name (image,
-+image-missing,
-+DEFAULT_ICON_SIZE);
-   g_object_thaw_notify (G_OBJECT (image));
-   return;
- }
-@@ -1059,29 +1046,18 @@ gtk_image_set_from_pixbuf (GtkImage  *image,
-   GtkImagePrivate *priv;
- 
-   g_return_if_fail (GTK_IS_IMAGE (image));
--  g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf));
-+  g_return_if_fail (pixbuf == NULL ||
-+GDK_IS_PIXBUF (pixbuf));
- 
-   priv = image-priv;
- 
-   g_object_freeze_notify (G_OBJECT (image));
--
--  gtk_image_reset (image);
-+  
-+  gtk_image_clear (image);
- 
-   if (pixbuf != NULL)
- _gtk_icon_helper_set_pixbuf (priv-icon_helper, pixbuf);
- 
--  if (gtk_widget_get_visible (GTK_WIDGET (image)))
--{
--  gint width, height;
--
--  gtk_image_get_preferred_size (image, width, height);
--  if (width != gtk_widget_get_allocated_width (GTK_WIDGET (image)) ||
--  height != gtk_widget_get_allocated_height (GTK_WIDGET (image)))
--gtk_widget_queue_resize (GTK_WIDGET (image));
--  else
--gtk_widget_queue_draw

[arch-commits] Commit in gtk3/trunk (3 files)

2015-04-12 Thread Evangelos Foutras 
Date: Sunday, April 12, 2015 @ 22:49:24
  Author: foutrelis
Revision: 236320

upgpkg: gtk3 3.16.1-2

- Revert commit that causes nm-applet to fail to load (FS#44504).
- Fix transparency setting for status icons on Xfce.

Added:
  gtk3/trunk/0001-Revert-image-Optimize-non-resize-changes.patch
  gtk3/trunk/0001-x11-Relax-requirements-for-setting-ParentRelative.patch
Modified:
  gtk3/trunk/PKGBUILD

--+
 0001-Revert-image-Optimize-non-resize-changes.patch  |  233 ++
 0001-x11-Relax-requirements-for-setting-ParentRelative.patch |   42 +
 PKGBUILD |   19 
 3 files changed, 291 insertions(+), 3 deletions(-)

Added: 0001-Revert-image-Optimize-non-resize-changes.patch
===
--- 0001-Revert-image-Optimize-non-resize-changes.patch 
(rev 0)
+++ 0001-Revert-image-Optimize-non-resize-changes.patch 2015-04-12 20:49:24 UTC 
(rev 236320)
@@ -0,0 +1,233 @@
+From 7963f689296ad06dff0e0d426bd9324de1dec7aa Mon Sep 17 00:00:00 2001
+From: Matthias Clasen mcla...@redhat.com
+Date: Wed, 8 Apr 2015 14:18:08 -0400
+Subject: [PATCH] Revert image: Optimize non-resize changes
+
+This reverts commit fef7d65685a3a45a47f968cab6b5e5150323f606.
+
+We're still seeing regressions from this, see
+http://bugzilla.redhat.com/show_bug.cgi?id=1208183
+---
+ gtk/gtkimage.c | 107 +
+ 1 file changed, 17 insertions(+), 90 deletions(-)
+
+diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
+index d501aef..5763f06 100644
+--- a/gtk/gtkimage.c
 b/gtk/gtkimage.c
+@@ -155,9 +155,6 @@ static void gtk_image_size_allocate(GtkWidget
*widget,
+ static void gtk_image_unmap(GtkWidget*widget);
+ static void gtk_image_realize  (GtkWidget*widget);
+ static void gtk_image_unrealize(GtkWidget*widget);
+-static void gtk_image_get_preferred_size   (GtkImage *image,
+-gint *width_out,
+-gint *height_out);
+ static void gtk_image_get_preferred_width  (GtkWidget*widget,
+ gint *minimum,
+ gint *natural);
+@@ -937,8 +934,8 @@ gtk_image_set_from_file   (GtkImage*image,
+   priv = image-priv;
+ 
+   g_object_freeze_notify (G_OBJECT (image));
+-
+-  gtk_image_reset (image);
++  
++  gtk_image_clear (image);
+ 
+   if (filename == NULL)
+ {
+@@ -951,7 +948,9 @@ gtk_image_set_from_file   (GtkImage*image,
+ 
+   if (anim == NULL)
+ {
+-  gtk_image_set_from_icon_name (image, image-missing, 
DEFAULT_ICON_SIZE);
++  gtk_image_set_from_icon_name (image,
++image-missing,
++DEFAULT_ICON_SIZE);
+   g_object_thaw_notify (G_OBJECT (image));
+   return;
+ }
+@@ -972,21 +971,7 @@ gtk_image_set_from_file   (GtkImage*image,
+   g_object_unref (anim);
+ 
+   priv-filename = g_strdup (filename);
+-
+-  if (gtk_widget_get_visible (GTK_WIDGET (image)))
+-{
+-  gint width, height;
+-
+-  gtk_image_get_preferred_size (image, width, height);
+-  if (width != gtk_widget_get_allocated_width (GTK_WIDGET (image)) ||
+-  height != gtk_widget_get_allocated_height (GTK_WIDGET (image)))
+-gtk_widget_queue_resize (GTK_WIDGET (image));
+-  else
+-gtk_widget_queue_draw (GTK_WIDGET (image));
+-}
+-
+-  g_object_notify (G_OBJECT (image), file);
+-
++  
+   g_object_thaw_notify (G_OBJECT (image));
+ }
+ 
+@@ -1023,7 +1008,9 @@ gtk_image_set_from_resource (GtkImage*image,
+ 
+   if (animation == NULL)
+ {
+-  gtk_image_set_from_icon_name (image, image-missing, 
DEFAULT_ICON_SIZE);
++  gtk_image_set_from_icon_name (image,
++image-missing,
++DEFAULT_ICON_SIZE);
+   g_object_thaw_notify (G_OBJECT (image));
+   return;
+ }
+@@ -1059,29 +1046,18 @@ gtk_image_set_from_pixbuf (GtkImage  *image,
+   GtkImagePrivate *priv;
+ 
+   g_return_if_fail (GTK_IS_IMAGE (image));
+-  g_return_if_fail (pixbuf == NULL || GDK_IS_PIXBUF (pixbuf));
++  g_return_if_fail (pixbuf == NULL ||
++GDK_IS_PIXBUF (pixbuf));
+ 
+   priv = image-priv;
+ 
+   g_object_freeze_notify (G_OBJECT (image));
+-
+-  gtk_image_reset (image);
++  
++  gtk_image_clear (image);
+ 
+   if (pixbuf != NULL)
+ _gtk_icon_helper_set_pixbuf (priv-icon_helper, pixbuf);
+ 
+-  if (gtk_widget_get_visible (GTK_WIDGET (image)))
+-{
+-  gint width, height;
+-
+-  gtk_image_get_preferred_size (image, width, height);
+-  if (width != gtk_widget_get_allocated_width (GTK_WIDGET (image)) ||
+-  height != gtk_widget_get_allocated_height

[arch-commits] Commit in gtk3/trunk (3 files)

2011-12-19 Thread Ionut Biru 
Date: Monday, December 19, 2011 @ 11:28:04
  Author: ibiru
Revision: 145198

update to 3.2.3

Modified:
  gtk3/trunk/PKGBUILD
Deleted:
  gtk3/trunk/filechooserdefault_do_not_unref_value_twice.patch
  gtk3/trunk/moveresize.patch

---+
 PKGBUILD  |   16 ++
 filechooserdefault_do_not_unref_value_twice.patch |   24 --
 moveresize.patch  |   47 
 3 files changed, 5 insertions(+), 82 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-19 14:11:19 UTC (rev 145197)
+++ PKGBUILD2011-12-19 16:28:04 UTC (rev 145198)
@@ -2,8 +2,8 @@
 # Maintainer: Ionut Biru ib...@archlinux.org
 
 pkgname=gtk3
-pkgver=3.2.2
-pkgrel=4
+pkgver=3.2.3
+pkgrel=1
 pkgdesc=GTK+ is a multi-platform toolkit (v3)
 arch=('i686' 'x86_64')
 url=http://www.gtk.org/;
@@ -14,18 +14,12 @@
 backup=(etc/gtk-3.0/settings.ini)
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
-settings.ini
-filechooserdefault_do_not_unref_value_twice.patch
-moveresize.patch)
-sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84'
-'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621'
-'0d6b04d5fc12b7c08e0cff4b94d001d5c167a944b72579fb14fd6de2ee4ad9e6'
-'627f430ccecc95ec61d9a83607469e71e95568c077f7bda849a7fe1c02d0bea7')
+settings.ini)
+sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d'
+'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
 
 build() {
 cd $srcdir/gtk+-$pkgver
-patch -Np1 -i $srcdir/filechooserdefault_do_not_unref_value_twice.patch
-patch -Np1 -i $srcdir/moveresize.patch
 CXX=/bin/false ./configure --prefix=/usr \
 --sysconfdir=/etc \
 --localstatedir=/var \

Deleted: filechooserdefault_do_not_unref_value_twice.patch
===
--- filechooserdefault_do_not_unref_value_twice.patch   2011-12-19 14:11:19 UTC 
(rev 145197)
+++ filechooserdefault_do_not_unref_value_twice.patch   2011-12-19 16:28:04 UTC 
(rev 145198)
@@ -1,24 +0,0 @@
-From aca43f43be3886f1a0befda0178ebb94ea2cf7b1 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte o...@redhat.com
-Date: Tue, 29 Nov 2011 19:39:21 +
-Subject: filechooserdefault: Don't unref value twice
-
-Double unref was introduced in eb02dacb370e8b4e6ef62328d0c09673b1234b32
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646461
-https://bugzilla.gnome.org/show_bug.cgi?id=664137

-diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
-index e33b91e..a74aacc 100644
 a/gtk/gtkfilechooserdefault.c
-+++ b/gtk/gtkfilechooserdefault.c
-@@ -10127,7 +10127,6 @@ list_row_activated (GtkTreeView   *tree_view,
-   if (is_folder  file)
- {
-   change_folder_and_display_error (impl, file, FALSE);
--  g_object_unref (file);
-   goto out;
- }
- 
---
-cgit v0.9.0.2

Deleted: moveresize.patch
===
--- moveresize.patch2011-12-19 14:11:19 UTC (rev 145197)
+++ moveresize.patch2011-12-19 16:28:04 UTC (rev 145198)
@@ -1,47 +0,0 @@
-From 89c90ed193331d2ee96f323e10aaafd4366f4b0e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen mcla...@redhat.com
-Date: Sat, 10 Dec 2011 02:21:09 +
-Subject: Fix move-resize emulation with XI2
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650943

-diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index 1ff816e..d48927f 100644
 a/gdk/x11/gdkwindow-x11.c
-+++ b/gdk/x11/gdkwindow-x11.c
-@@ -4296,6 +4296,33 @@ _gdk_x11_moveresize_handle_event (XEvent *event)
-   if (event-xbutton.button == mv_resize-moveresize_button)
- finish_drag (mv_resize);
-   break;
-+
-+#ifdef HAVE_XGENERICEVENTS
-+case GenericEvent:
-+  {
-+/* we just assume this is an XI2 event */
-+XIEvent *ev = (XIEvent *) event-xcookie.data;
-+XIDeviceEvent *xev = (XIDeviceEvent *)ev;
-+gint state;
-+switch (ev-evtype)
-+  {
-+  case XI_Motion:
-+update_pos (mv_resize, xev-root_x, xev-root_y);
-+state = _gdk_x11_device_xi2_translate_state (xev-mods, 
xev-buttons, xev-group);
-+if ((state  button_mask) == 0)
-+finish_drag (mv_resize);
-+break;
-+
-+  case XI_ButtonRelease:
-+update_pos (mv_resize, xev-root_x, xev-root_y);
-+if (xev-detail == mv_resize-moveresize_button)
-+  finish_drag (mv_resize);
-+break;
-+  }
-+  }
-+  break;
-+#endif
-+
- }
-   return TRUE;
- }
---
-cgit v0.9.0.2