[arch-commits] Commit in gtk3/repos (26 files)
Jan Steffens
heftig at archlinux.org
Wed Oct 4 14:33:12 UTC 2017
Date: Wednesday, October 4, 2017 @ 14:33:11
Author: heftig
Revision: 306720
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gtk3/repos/testing-i686/PKGBUILD
(from rev 306719, gtk3/trunk/PKGBUILD)
gtk3/repos/testing-i686/gtk-query-immodules-3.0.hook
(from rev 306719, gtk3/trunk/gtk-query-immodules-3.0.hook)
gtk3/repos/testing-i686/gtk-update-icon-cache.hook
(from rev 306719, gtk3/trunk/gtk-update-icon-cache.hook)
gtk3/repos/testing-i686/gtk-update-icon-cache.script
(from rev 306719, gtk3/trunk/gtk-update-icon-cache.script)
gtk3/repos/testing-i686/gtk3.install
(from rev 306719, gtk3/trunk/gtk3.install)
gtk3/repos/testing-i686/settings.ini
(from rev 306719, gtk3/trunk/settings.ini)
gtk3/repos/testing-x86_64/PKGBUILD
(from rev 306719, gtk3/trunk/PKGBUILD)
gtk3/repos/testing-x86_64/gtk-query-immodules-3.0.hook
(from rev 306719, gtk3/trunk/gtk-query-immodules-3.0.hook)
gtk3/repos/testing-x86_64/gtk-update-icon-cache.hook
(from rev 306719, gtk3/trunk/gtk-update-icon-cache.hook)
gtk3/repos/testing-x86_64/gtk-update-icon-cache.script
(from rev 306719, gtk3/trunk/gtk-update-icon-cache.script)
gtk3/repos/testing-x86_64/gtk3.install
(from rev 306719, gtk3/trunk/gtk3.install)
gtk3/repos/testing-x86_64/settings.ini
(from rev 306719, gtk3/trunk/settings.ini)
Deleted:
gtk3/repos/testing-i686/PKGBUILD
gtk3/repos/testing-i686/gtk-query-immodules-3.0.hook
gtk3/repos/testing-i686/gtk-update-icon-cache.hook
gtk3/repos/testing-i686/gtk-update-icon-cache.script
gtk3/repos/testing-i686/gtk3.install
gtk3/repos/testing-i686/settings.ini
gtk3/repos/testing-i686/window-edges.diff
gtk3/repos/testing-x86_64/PKGBUILD
gtk3/repos/testing-x86_64/gtk-query-immodules-3.0.hook
gtk3/repos/testing-x86_64/gtk-update-icon-cache.hook
gtk3/repos/testing-x86_64/gtk-update-icon-cache.script
gtk3/repos/testing-x86_64/gtk3.install
gtk3/repos/testing-x86_64/settings.ini
gtk3/repos/testing-x86_64/window-edges.diff
---------------------------------------------+
/PKGBUILD | 208 ++++++++++++++++++++++++++
/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 +
testing-i686/PKGBUILD | 109 -------------
testing-i686/gtk-query-immodules-3.0.hook | 11 -
testing-i686/gtk-update-icon-cache.hook | 13 -
testing-i686/gtk-update-icon-cache.script | 10 -
testing-i686/gtk3.install | 3
testing-i686/settings.ini | 4
testing-i686/window-edges.diff | 90 -----------
testing-x86_64/PKGBUILD | 109 -------------
testing-x86_64/gtk-query-immodules-3.0.hook | 11 -
testing-x86_64/gtk-update-icon-cache.hook | 13 -
testing-x86_64/gtk-update-icon-cache.script | 10 -
testing-x86_64/gtk3.install | 3
testing-x86_64/settings.ini | 4
testing-x86_64/window-edges.diff | 90 -----------
20 files changed, 290 insertions(+), 480 deletions(-)
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-i686/PKGBUILD 2017-10-04 14:33:11 UTC (rev 306720)
@@ -1,109 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache gtk3-print-backends)
-pkgver=3.22.23
-pkgrel=2
-pkgdesc="GObject-based multi-platform GUI toolkit"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
- libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
- adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
- cantarell-fonts)
-makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups glib2-docs
- sassc)
-license=(LGPL)
-_commit=a5c24729413361bdd3427a8ab248519429583e22 # tags/3.22.23^0
-source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit"
- window-edges.diff
- settings.ini
- gtk-query-immodules-3.0.hook
- gtk-update-icon-cache.hook
- gtk-update-icon-cache.script)
-sha256sums=('SKIP'
- '12dc4b946f1d5fd4cf7056ed1fe6cdd19c12730568e608aec3b3a1316f27b843'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
- '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
- 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
-
-pkgver() {
- cd gtk+
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- mkdir print-backends
- cd gtk+
-
- patch -Np1 -i ../window-edges.diff
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd gtk+
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-schemas-compile \
- --enable-x11-backend \
- --enable-broadway-backend \
- --enable-wayland-backend \
- --enable-gtk-doc
-
- #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'
- 'gtk3-print-backends: Printing')
- install=gtk3.install
-
- cd gtk+
- 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"
-
- cd "$pkgdir"
- for _f in usr/lib/*/*/printbackends/*; do
- case $_f in
- *-file.so|*-lpr.so) continue ;;
- esac
-
- mkdir -p "$srcdir/print-backends/${_f%/*}"
- mv "$_f" "$srcdir/print-backends/$_f"
- done
-}
-
-package_gtk-update-icon-cache() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 hicolor-icon-theme)
-
- cd gtk+
- 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"
-}
-
-package_gtk3-print-backends() {
- pkgdesc="Print backends for GTK3"
- depends=(gtk3 rest colord libcups)
- groups=(gnome)
-
- mv print-backends/* "$pkgdir"
-}
-
-# vim:set et sw=2:
Copied: gtk3/repos/testing-i686/PKGBUILD (from rev 306719, gtk3/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-10-04 14:33:11 UTC (rev 306720)
@@ -0,0 +1,104 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache gtk3-print-backends)
+pkgver=3.22.24
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
+ libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
+ adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
+ cantarell-fonts)
+makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups glib2-docs
+ sassc)
+license=(LGPL)
+_commit=e72d54c8a7bdf5f41feccbcc0b78522a8b50d79e # tags/3.22.24^0
+source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit"
+ settings.ini
+ gtk-query-immodules-3.0.hook
+ gtk-update-icon-cache.hook
+ gtk-update-icon-cache.script)
+sha256sums=('SKIP'
+ '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+ 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+ '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
+ 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
+
+pkgver() {
+ cd gtk+
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ mkdir print-backends
+ cd gtk+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd gtk+
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-schemas-compile \
+ --enable-x11-backend \
+ --enable-broadway-backend \
+ --enable-wayland-backend \
+ --enable-gtk-doc
+
+ #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'
+ 'gtk3-print-backends: Printing')
+ install=gtk3.install
+
+ cd gtk+
+ 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"
+
+ cd "$pkgdir"
+ for _f in usr/lib/*/*/printbackends/*; do
+ case $_f in
+ *-file.so|*-lpr.so) continue ;;
+ esac
+
+ mkdir -p "$srcdir/print-backends/${_f%/*}"
+ mv "$_f" "$srcdir/print-backends/$_f"
+ done
+}
+
+package_gtk-update-icon-cache() {
+ pkgdesc="GTK+ icon cache updater"
+ depends=(gdk-pixbuf2 hicolor-icon-theme)
+
+ cd gtk+
+ 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"
+}
+
+package_gtk3-print-backends() {
+ pkgdesc="Print backends for GTK3"
+ depends=(gtk3 rest colord libcups)
+ groups=(gnome)
+
+ mv print-backends/* "$pkgdir"
+}
+
+# vim:set et sw=2:
Deleted: testing-i686/gtk-query-immodules-3.0.hook
===================================================================
--- testing-i686/gtk-query-immodules-3.0.hook 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-i686/gtk-query-immodules-3.0.hook 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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/testing-i686/gtk-query-immodules-3.0.hook (from rev 306719, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- testing-i686/gtk-query-immodules-3.0.hook (rev 0)
+++ testing-i686/gtk-query-immodules-3.0.hook 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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: testing-i686/gtk-update-icon-cache.hook
===================================================================
--- testing-i686/gtk-update-icon-cache.hook 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-i686/gtk-update-icon-cache.hook 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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/testing-i686/gtk-update-icon-cache.hook (from rev 306719, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- testing-i686/gtk-update-icon-cache.hook (rev 0)
+++ testing-i686/gtk-update-icon-cache.hook 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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: testing-i686/gtk-update-icon-cache.script
===================================================================
--- testing-i686/gtk-update-icon-cache.script 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-i686/gtk-update-icon-cache.script 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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/testing-i686/gtk-update-icon-cache.script (from rev 306719, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- testing-i686/gtk-update-icon-cache.script (rev 0)
+++ testing-i686/gtk-update-icon-cache.script 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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: testing-i686/gtk3.install
===================================================================
--- testing-i686/gtk3.install 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-i686/gtk3.install 2017-10-04 14:33:11 UTC (rev 306720)
@@ -1,3 +0,0 @@
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
Copied: gtk3/repos/testing-i686/gtk3.install (from rev 306719, gtk3/trunk/gtk3.install)
===================================================================
--- testing-i686/gtk3.install (rev 0)
+++ testing-i686/gtk3.install 2017-10-04 14:33:11 UTC (rev 306720)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
Deleted: testing-i686/settings.ini
===================================================================
--- testing-i686/settings.ini 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-i686/settings.ini 2017-10-04 14:33:11 UTC (rev 306720)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
Copied: gtk3/repos/testing-i686/settings.ini (from rev 306719, gtk3/trunk/settings.ini)
===================================================================
--- testing-i686/settings.ini (rev 0)
+++ testing-i686/settings.ini 2017-10-04 14:33:11 UTC (rev 306720)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
Deleted: testing-i686/window-edges.diff
===================================================================
--- testing-i686/window-edges.diff 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-i686/window-edges.diff 2017-10-04 14:33:11 UTC (rev 306720)
@@ -1,90 +0,0 @@
-diff --git i/gdk/wayland/gdkwindow-wayland.c w/gdk/wayland/gdkwindow-wayland.c
-index 77a6e978f8463ccd..c87d6d9ce7e79bef 100644
---- i/gdk/wayland/gdkwindow-wayland.c
-+++ w/gdk/wayland/gdkwindow-wayland.c
-@@ -3004,7 +3004,7 @@ gtk_surface_configure_edges (void *data,
- new_state |= GDK_WINDOW_STATE_TOP_RESIZABLE;
- break;
- case GTK_SURFACE1_EDGE_CONSTRAINT_RESIZABLE_RIGHT:
-- new_state |= GDK_WINDOW_STATE_TOP_TILED;
-+ new_state |= GDK_WINDOW_STATE_RIGHT_RESIZABLE;
- break;
- case GTK_SURFACE1_EDGE_CONSTRAINT_RESIZABLE_BOTTOM:
- new_state |= GDK_WINDOW_STATE_BOTTOM_RESIZABLE;
-diff --git i/gtk/gtkwindow.c w/gtk/gtkwindow.c
-index ffc841871fde0d61..a4ba0982240d8b6d 100644
---- i/gtk/gtkwindow.c
-+++ w/gtk/gtkwindow.c
-@@ -6855,7 +6855,7 @@ update_corner_windows (GtkWindow *window,
- region, 0, 0);
- cairo_region_destroy (region);
-
-- gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST]);
-+ gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST]);
- }
- else
- {
-@@ -7065,57 +7065,50 @@ update_border_windows (GtkWindow *window)
-
- if (resize_n)
- {
-- y += window_border.top;
-+ y += window_border.top + handle_v;
- h -= window_border.top + handle_v;
- }
-
- if (resize_w)
- {
-- x += window_border.left;
-+ x += window_border.left + handle_h;
- w -= window_border.left + handle_h;
- }
-
- if (resize_s)
- h -= window_border.bottom + handle_v;
-
- if (resize_e)
- w -= window_border.right + handle_h;
-
- /* North */
- if (resize_n)
- {
-- gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_SOUTH],
-- x, window_border.top + height,
-- w, border.bottom);
-+ gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_NORTH],
-+ x, window_border.top - border.top,
-+ w, border.top);
-
- gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_NORTH]);
- }
- else
- {
- gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_NORTH]);
- }
-
- /* South */
-- if (resize_n)
-+ if (resize_s)
- {
- gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_SOUTH],
- x, window_border.top + height,
- w, border.bottom);
-
- gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_SOUTH]);
- }
- else
- {
- gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_SOUTH]);
- }
-
-- /*
-- * Horizontal edges
-- */
--
-- y = (resize_n || resize_s) ? window_border.top + handle_v : 0;
-- h = (resize_n || resize_s) ? height - 2 * handle_v : height + window_border.top + window_border.bottom;
--
- /* East */
- if (resize_e)
- {
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-x86_64/PKGBUILD 2017-10-04 14:33:11 UTC (rev 306720)
@@ -1,109 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache gtk3-print-backends)
-pkgver=3.22.23
-pkgrel=2
-pkgdesc="GObject-based multi-platform GUI toolkit"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
- libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
- adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
- cantarell-fonts)
-makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups glib2-docs
- sassc)
-license=(LGPL)
-_commit=a5c24729413361bdd3427a8ab248519429583e22 # tags/3.22.23^0
-source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit"
- window-edges.diff
- settings.ini
- gtk-query-immodules-3.0.hook
- gtk-update-icon-cache.hook
- gtk-update-icon-cache.script)
-sha256sums=('SKIP'
- '12dc4b946f1d5fd4cf7056ed1fe6cdd19c12730568e608aec3b3a1316f27b843'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
- '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
- 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
-
-pkgver() {
- cd gtk+
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- mkdir print-backends
- cd gtk+
-
- patch -Np1 -i ../window-edges.diff
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd gtk+
-
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-schemas-compile \
- --enable-x11-backend \
- --enable-broadway-backend \
- --enable-wayland-backend \
- --enable-gtk-doc
-
- #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'
- 'gtk3-print-backends: Printing')
- install=gtk3.install
-
- cd gtk+
- 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"
-
- cd "$pkgdir"
- for _f in usr/lib/*/*/printbackends/*; do
- case $_f in
- *-file.so|*-lpr.so) continue ;;
- esac
-
- mkdir -p "$srcdir/print-backends/${_f%/*}"
- mv "$_f" "$srcdir/print-backends/$_f"
- done
-}
-
-package_gtk-update-icon-cache() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 hicolor-icon-theme)
-
- cd gtk+
- 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"
-}
-
-package_gtk3-print-backends() {
- pkgdesc="Print backends for GTK3"
- depends=(gtk3 rest colord libcups)
- groups=(gnome)
-
- mv print-backends/* "$pkgdir"
-}
-
-# vim:set et sw=2:
Copied: gtk3/repos/testing-x86_64/PKGBUILD (from rev 306719, gtk3/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-10-04 14:33:11 UTC (rev 306720)
@@ -0,0 +1,104 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache gtk3-print-backends)
+pkgver=3.22.24
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit"
+arch=(i686 x86_64)
+url="http://www.gtk.org/"
+depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
+ libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
+ adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
+ cantarell-fonts)
+makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups glib2-docs
+ sassc)
+license=(LGPL)
+_commit=e72d54c8a7bdf5f41feccbcc0b78522a8b50d79e # tags/3.22.24^0
+source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit"
+ settings.ini
+ gtk-query-immodules-3.0.hook
+ gtk-update-icon-cache.hook
+ gtk-update-icon-cache.script)
+sha256sums=('SKIP'
+ '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+ 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+ '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
+ 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
+
+pkgver() {
+ cd gtk+
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ mkdir print-backends
+ cd gtk+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd gtk+
+
+ CXX=/bin/false ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --disable-schemas-compile \
+ --enable-x11-backend \
+ --enable-broadway-backend \
+ --enable-wayland-backend \
+ --enable-gtk-doc
+
+ #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'
+ 'gtk3-print-backends: Printing')
+ install=gtk3.install
+
+ cd gtk+
+ 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"
+
+ cd "$pkgdir"
+ for _f in usr/lib/*/*/printbackends/*; do
+ case $_f in
+ *-file.so|*-lpr.so) continue ;;
+ esac
+
+ mkdir -p "$srcdir/print-backends/${_f%/*}"
+ mv "$_f" "$srcdir/print-backends/$_f"
+ done
+}
+
+package_gtk-update-icon-cache() {
+ pkgdesc="GTK+ icon cache updater"
+ depends=(gdk-pixbuf2 hicolor-icon-theme)
+
+ cd gtk+
+ 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"
+}
+
+package_gtk3-print-backends() {
+ pkgdesc="Print backends for GTK3"
+ depends=(gtk3 rest colord libcups)
+ groups=(gnome)
+
+ mv print-backends/* "$pkgdir"
+}
+
+# vim:set et sw=2:
Deleted: testing-x86_64/gtk-query-immodules-3.0.hook
===================================================================
--- testing-x86_64/gtk-query-immodules-3.0.hook 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-x86_64/gtk-query-immodules-3.0.hook 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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/testing-x86_64/gtk-query-immodules-3.0.hook (from rev 306719, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- testing-x86_64/gtk-query-immodules-3.0.hook (rev 0)
+++ testing-x86_64/gtk-query-immodules-3.0.hook 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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: testing-x86_64/gtk-update-icon-cache.hook
===================================================================
--- testing-x86_64/gtk-update-icon-cache.hook 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-x86_64/gtk-update-icon-cache.hook 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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/testing-x86_64/gtk-update-icon-cache.hook (from rev 306719, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- testing-x86_64/gtk-update-icon-cache.hook (rev 0)
+++ testing-x86_64/gtk-update-icon-cache.hook 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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: testing-x86_64/gtk-update-icon-cache.script
===================================================================
--- testing-x86_64/gtk-update-icon-cache.script 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-x86_64/gtk-update-icon-cache.script 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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/testing-x86_64/gtk-update-icon-cache.script (from rev 306719, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- testing-x86_64/gtk-update-icon-cache.script (rev 0)
+++ testing-x86_64/gtk-update-icon-cache.script 2017-10-04 14:33:11 UTC (rev 306720)
@@ -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: testing-x86_64/gtk3.install
===================================================================
--- testing-x86_64/gtk3.install 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-x86_64/gtk3.install 2017-10-04 14:33:11 UTC (rev 306720)
@@ -1,3 +0,0 @@
-pre_remove() {
- rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
Copied: gtk3/repos/testing-x86_64/gtk3.install (from rev 306719, gtk3/trunk/gtk3.install)
===================================================================
--- testing-x86_64/gtk3.install (rev 0)
+++ testing-x86_64/gtk3.install 2017-10-04 14:33:11 UTC (rev 306720)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
Deleted: testing-x86_64/settings.ini
===================================================================
--- testing-x86_64/settings.ini 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-x86_64/settings.ini 2017-10-04 14:33:11 UTC (rev 306720)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11
Copied: gtk3/repos/testing-x86_64/settings.ini (from rev 306719, gtk3/trunk/settings.ini)
===================================================================
--- testing-x86_64/settings.ini (rev 0)
+++ testing-x86_64/settings.ini 2017-10-04 14:33:11 UTC (rev 306720)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11
Deleted: testing-x86_64/window-edges.diff
===================================================================
--- testing-x86_64/window-edges.diff 2017-10-04 14:30:05 UTC (rev 306719)
+++ testing-x86_64/window-edges.diff 2017-10-04 14:33:11 UTC (rev 306720)
@@ -1,90 +0,0 @@
-diff --git i/gdk/wayland/gdkwindow-wayland.c w/gdk/wayland/gdkwindow-wayland.c
-index 77a6e978f8463ccd..c87d6d9ce7e79bef 100644
---- i/gdk/wayland/gdkwindow-wayland.c
-+++ w/gdk/wayland/gdkwindow-wayland.c
-@@ -3004,7 +3004,7 @@ gtk_surface_configure_edges (void *data,
- new_state |= GDK_WINDOW_STATE_TOP_RESIZABLE;
- break;
- case GTK_SURFACE1_EDGE_CONSTRAINT_RESIZABLE_RIGHT:
-- new_state |= GDK_WINDOW_STATE_TOP_TILED;
-+ new_state |= GDK_WINDOW_STATE_RIGHT_RESIZABLE;
- break;
- case GTK_SURFACE1_EDGE_CONSTRAINT_RESIZABLE_BOTTOM:
- new_state |= GDK_WINDOW_STATE_BOTTOM_RESIZABLE;
-diff --git i/gtk/gtkwindow.c w/gtk/gtkwindow.c
-index ffc841871fde0d61..a4ba0982240d8b6d 100644
---- i/gtk/gtkwindow.c
-+++ w/gtk/gtkwindow.c
-@@ -6855,7 +6855,7 @@ update_corner_windows (GtkWindow *window,
- region, 0, 0);
- cairo_region_destroy (region);
-
-- gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST]);
-+ gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_NORTH_EAST]);
- }
- else
- {
-@@ -7065,57 +7065,50 @@ update_border_windows (GtkWindow *window)
-
- if (resize_n)
- {
-- y += window_border.top;
-+ y += window_border.top + handle_v;
- h -= window_border.top + handle_v;
- }
-
- if (resize_w)
- {
-- x += window_border.left;
-+ x += window_border.left + handle_h;
- w -= window_border.left + handle_h;
- }
-
- if (resize_s)
- h -= window_border.bottom + handle_v;
-
- if (resize_e)
- w -= window_border.right + handle_h;
-
- /* North */
- if (resize_n)
- {
-- gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_SOUTH],
-- x, window_border.top + height,
-- w, border.bottom);
-+ gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_NORTH],
-+ x, window_border.top - border.top,
-+ w, border.top);
-
- gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_NORTH]);
- }
- else
- {
- gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_NORTH]);
- }
-
- /* South */
-- if (resize_n)
-+ if (resize_s)
- {
- gdk_window_move_resize (priv->border_window[GDK_WINDOW_EDGE_SOUTH],
- x, window_border.top + height,
- w, border.bottom);
-
- gdk_window_show_unraised (priv->border_window[GDK_WINDOW_EDGE_SOUTH]);
- }
- else
- {
- gdk_window_hide (priv->border_window[GDK_WINDOW_EDGE_SOUTH]);
- }
-
-- /*
-- * Horizontal edges
-- */
--
-- y = (resize_n || resize_s) ? window_border.top + handle_v : 0;
-- h = (resize_n || resize_s) ? height - 2 * handle_v : height + window_border.top + window_border.bottom;
--
- /* East */
- if (resize_e)
- {
More information about the arch-commits
mailing list