[arch-commits] Commit in gtk3/repos/testing-x86_64 (13 files)
Jan Steffens
heftig at archlinux.org
Tue Jun 4 08:02:40 UTC 2019
Date: Tuesday, June 4, 2019 @ 08:02:39
Author: heftig
Revision: 354770
archrelease: copy trunk to testing-x86_64
Added:
gtk3/repos/testing-x86_64/PKGBUILD
(from rev 354769, gtk3/trunk/PKGBUILD)
gtk3/repos/testing-x86_64/gtk-query-immodules-3.0.hook
(from rev 354769, gtk3/trunk/gtk-query-immodules-3.0.hook)
gtk3/repos/testing-x86_64/gtk-update-icon-cache.hook
(from rev 354769, gtk3/trunk/gtk-update-icon-cache.hook)
gtk3/repos/testing-x86_64/gtk-update-icon-cache.script
(from rev 354769, gtk3/trunk/gtk-update-icon-cache.script)
gtk3/repos/testing-x86_64/gtk3.install
(from rev 354769, gtk3/trunk/gtk3.install)
gtk3/repos/testing-x86_64/settings.ini
(from rev 354769, gtk3/trunk/settings.ini)
Deleted:
gtk3/repos/testing-x86_64/0001-libgail-util-Fix-symbol-visibility-with-meson.patch
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
----------------------------------------------------------+
0001-libgail-util-Fix-symbol-visibility-with-meson.patch | 106 ---------
PKGBUILD | 151 ++++++-------
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
7 files changed, 115 insertions(+), 224 deletions(-)
Deleted: 0001-libgail-util-Fix-symbol-visibility-with-meson.patch
===================================================================
--- 0001-libgail-util-Fix-symbol-visibility-with-meson.patch 2019-06-04 08:02:25 UTC (rev 354769)
+++ 0001-libgail-util-Fix-symbol-visibility-with-meson.patch 2019-06-04 08:02:39 UTC (rev 354770)
@@ -1,106 +0,0 @@
-From 8cf270451b9a14fc73a6ca32d81febfeae026c30 Mon Sep 17 00:00:00 2001
-Message-Id: <8cf270451b9a14fc73a6ca32d81febfeae026c30.1559359751.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sat, 1 Jun 2019 05:27:43 +0200
-Subject: [PATCH] libgail-util: Fix symbol visibility with meson
-
-Autotools didn't add -fvisibility=hidden to the build of libgail-util-3.
-Meson does and produced a library that exported no symbols.
----
- libgail-util/gailmisc.h | 7 +++++++
- libgail-util/gailtextutil.h | 6 ++++++
- 2 files changed, 13 insertions(+)
-
-diff --git a/libgail-util/gailmisc.h b/libgail-util/gailmisc.h
-index a0145ab180..b6a160128d 100644
---- a/libgail-util/gailmisc.h
-+++ b/libgail-util/gailmisc.h
-@@ -24,47 +24,54 @@
-
- G_BEGIN_DECLS
-
-+GDK_AVAILABLE_IN_ALL
- AtkAttributeSet* gail_misc_add_attribute (AtkAttributeSet *attrib_set,
- AtkTextAttribute attr,
- gchar *value);
-+GDK_AVAILABLE_IN_ALL
- AtkAttributeSet* gail_misc_layout_get_run_attributes
- (AtkAttributeSet *attrib_set,
- PangoLayout *layout,
- const gchar *text,
- gint offset,
- gint *start_offset,
- gint *end_offset);
-
-+GDK_AVAILABLE_IN_ALL
- AtkAttributeSet* gail_misc_get_default_attributes (AtkAttributeSet *attrib_set,
- PangoLayout *layout,
- GtkWidget *widget);
-
-+GDK_AVAILABLE_IN_ALL
- void gail_misc_get_extents_from_pango_rectangle
- (GtkWidget *widget,
- PangoRectangle *char_rect,
- gint x_layout,
- gint y_layout,
- gint *x,
- gint *y,
- gint *width,
- gint *height,
- AtkCoordType coords);
-
-+GDK_AVAILABLE_IN_ALL
- gint gail_misc_get_index_at_point_in_layout
- (GtkWidget *widget,
- PangoLayout *layout,
- gint x_layout,
- gint y_layout,
- gint x,
- gint y,
- AtkCoordType coords);
-
-+GDK_AVAILABLE_IN_ALL
- void gail_misc_get_origins (GtkWidget *widget,
- gint *x_window,
- gint *y_window,
- gint *x_toplevel,
- gint *y_toplevel);
-
-+GDK_AVAILABLE_IN_ALL
- AtkAttributeSet* gail_misc_buffer_get_run_attributes
- (GtkTextBuffer *buffer,
- gint offset,
-diff --git a/libgail-util/gailtextutil.h b/libgail-util/gailtextutil.h
-index 7d8cf9ec20..5cc1a537fb 100644
---- a/libgail-util/gailtextutil.h
-+++ b/libgail-util/gailtextutil.h
-@@ -62,20 +62,26 @@ struct _GailTextUtilClass
- GObjectClass parent_class;
- };
-
-+GDK_AVAILABLE_IN_ALL
- GType gail_text_util_get_type (void);
-+GDK_AVAILABLE_IN_ALL
- GailTextUtil* gail_text_util_new (void);
-
-+GDK_AVAILABLE_IN_ALL
- void gail_text_util_text_setup (GailTextUtil *textutil,
- const gchar *text);
-+GDK_AVAILABLE_IN_ALL
- void gail_text_util_buffer_setup (GailTextUtil *textutil,
- GtkTextBuffer *buffer);
-+GDK_AVAILABLE_IN_ALL
- gchar* gail_text_util_get_text (GailTextUtil *textutil,
- gpointer layout,
- GailOffsetType function,
- AtkTextBoundary boundary_type,
- gint offset,
- gint *start_offset,
- gint *end_offset);
-+GDK_AVAILABLE_IN_ALL
- gchar* gail_text_util_get_substring (GailTextUtil *textutil,
- gint start_pos,
- gint end_pos);
---
-2.21.0
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-06-04 08:02:25 UTC (rev 354769)
+++ PKGBUILD 2019-06-04 08:02:39 UTC (rev 354770)
@@ -1,77 +0,0 @@
-# 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)
-pkgver=3.24.8+167+gdd25499f1e
-pkgrel=1
-epoch=1
-pkgdesc="GObject-based multi-platform GUI toolkit"
-arch=(x86_64)
-url="https://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 colord rest libcups libcanberra fribidi iso-codes)
-makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
-license=(LGPL)
-_commit=dd25499f1e565a2b3a8e81737155c107841d0282 # gtk-3-24
-source=("git+https://gitlab.gnome.org/GNOME/gtk.git#commit=$_commit"
- 0001-libgail-util-Fix-symbol-visibility-with-meson.patch
- settings.ini
- gtk-query-immodules-3.0.hook
- gtk-update-icon-cache.hook
- gtk-update-icon-cache.script)
-sha256sums=('SKIP'
- 'd528f5d27b7fb4333ca607ee1afe894fabd1d5d97e0f9e755365e44c60dc8ada'
- '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
- 'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
- '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
- 'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
-
-pkgver() {
- cd gtk
- git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
- cd gtk
- patch -Np1 -i ../0001-libgail-util-Fix-symbol-visibility-with-meson.patch
-}
-
-build() {
- arch-meson gtk build \
- --buildtype release \
- -D broadway_backend=true \
- -D colord=yes \
- -D gtk_doc=true \
- -D man=true
- ninja -C build
-}
-
-package_gtk3() {
- depends+=(gtk-update-icon-cache)
- provides=(gtk3-print-backends)
- conflicts=(gtk3-print-backends)
- replaces=("gtk3-print-backends<=3.22.26-1")
- install=gtk3.install
-
- DESTDIR="$pkgdir" meson install -C build
-
- install -Dt "$pkgdir/usr/share/gtk-3.0" -m644 settings.ini
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook
-
- # split this out to use with gtk2 too
- mv "$pkgdir/usr/bin/gtk-update-icon-cache" "$srcdir"
-}
-
-package_gtk-update-icon-cache() {
- pkgdesc="GTK+ icon cache updater"
- depends=(gdk-pixbuf2 librsvg hicolor-icon-theme)
-
- install -Dt "$pkgdir/usr/bin" gtk-update-icon-cache
- install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-update-icon-cache.hook
- install -D gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: gtk3/repos/testing-x86_64/PKGBUILD (from rev 354769, gtk3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-06-04 08:02:39 UTC (rev 354770)
@@ -0,0 +1,74 @@
+# 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)
+pkgver=3.24.8+177+gae2ef1472c
+pkgrel=1
+epoch=1
+pkgdesc="GObject-based multi-platform GUI toolkit"
+arch=(x86_64)
+url="https://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 colord rest libcups libcanberra fribidi iso-codes)
+makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
+license=(LGPL)
+_commit=ae2ef1472c69ad61ed8d19d932da4ca04c2a13ef # gtk-3-24
+source=("git+https://gitlab.gnome.org/GNOME/gtk.git#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() {
+ cd gtk
+}
+
+build() {
+ CFLAGS+=" -DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"
+ arch-meson gtk build \
+ -D broadway_backend=true \
+ -D colord=yes \
+ -D gtk_doc=true \
+ -D man=true
+ ninja -C build
+}
+
+package_gtk3() {
+ depends+=(gtk-update-icon-cache)
+ provides=(gtk3-print-backends)
+ conflicts=(gtk3-print-backends)
+ replaces=("gtk3-print-backends<=3.22.26-1")
+ install=gtk3.install
+
+ DESTDIR="$pkgdir" meson install -C build
+
+ install -Dt "$pkgdir/usr/share/gtk-3.0" -m644 settings.ini
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-query-immodules-3.0.hook
+
+ # split this out to use with gtk2 too
+ mv "$pkgdir/usr/bin/gtk-update-icon-cache" "$srcdir"
+}
+
+package_gtk-update-icon-cache() {
+ pkgdesc="GTK+ icon cache updater"
+ depends=(gdk-pixbuf2 librsvg hicolor-icon-theme)
+
+ install -Dt "$pkgdir/usr/bin" gtk-update-icon-cache
+ install -Dt "$pkgdir/usr/share/libalpm/hooks" -m644 gtk-update-icon-cache.hook
+ install -D gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: gtk-query-immodules-3.0.hook
===================================================================
--- gtk-query-immodules-3.0.hook 2019-06-04 08:02:25 UTC (rev 354769)
+++ gtk-query-immodules-3.0.hook 2019-06-04 08:02:39 UTC (rev 354770)
@@ -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 354769, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- gtk-query-immodules-3.0.hook (rev 0)
+++ gtk-query-immodules-3.0.hook 2019-06-04 08:02:39 UTC (rev 354770)
@@ -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: gtk-update-icon-cache.hook
===================================================================
--- gtk-update-icon-cache.hook 2019-06-04 08:02:25 UTC (rev 354769)
+++ gtk-update-icon-cache.hook 2019-06-04 08:02:39 UTC (rev 354770)
@@ -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 354769, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- gtk-update-icon-cache.hook (rev 0)
+++ gtk-update-icon-cache.hook 2019-06-04 08:02:39 UTC (rev 354770)
@@ -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: gtk-update-icon-cache.script
===================================================================
--- gtk-update-icon-cache.script 2019-06-04 08:02:25 UTC (rev 354769)
+++ gtk-update-icon-cache.script 2019-06-04 08:02:39 UTC (rev 354770)
@@ -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 354769, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- gtk-update-icon-cache.script (rev 0)
+++ gtk-update-icon-cache.script 2019-06-04 08:02:39 UTC (rev 354770)
@@ -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: gtk3.install
===================================================================
--- gtk3.install 2019-06-04 08:02:25 UTC (rev 354769)
+++ gtk3.install 2019-06-04 08:02:39 UTC (rev 354770)
@@ -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 354769, gtk3/trunk/gtk3.install)
===================================================================
--- gtk3.install (rev 0)
+++ gtk3.install 2019-06-04 08:02:39 UTC (rev 354770)
@@ -0,0 +1,3 @@
+pre_remove() {
+ rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}
Deleted: settings.ini
===================================================================
--- settings.ini 2019-06-04 08:02:25 UTC (rev 354769)
+++ settings.ini 2019-06-04 08:02:39 UTC (rev 354770)
@@ -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 354769, gtk3/trunk/settings.ini)
===================================================================
--- settings.ini (rev 0)
+++ settings.ini 2019-06-04 08:02:39 UTC (rev 354770)
@@ -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