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

Jan Steffens heftig at archlinux.org
Sat Jun 1 04:11:01 UTC 2019


    Date: Saturday, June 1, 2019 @ 04:11:01
  Author: heftig
Revision: 354591

3.24.8+167+gdd25499f1e-1

Added:
  gtk3/trunk/0001-libgail-util-Fix-symbol-visibility-with-meson.patch
Modified:
  gtk3/trunk/PKGBUILD

----------------------------------------------------------+
 0001-libgail-util-Fix-symbol-visibility-with-meson.patch |  106 +++++++++++++
 PKGBUILD                                                 |    8 
 2 files changed, 112 insertions(+), 2 deletions(-)

Added: 0001-libgail-util-Fix-symbol-visibility-with-meson.patch
===================================================================
--- 0001-libgail-util-Fix-symbol-visibility-with-meson.patch	                        (rev 0)
+++ 0001-libgail-util-Fix-symbol-visibility-with-meson.patch	2019-06-01 04:11:01 UTC (rev 354591)
@@ -0,0 +1,106 @@
+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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-01 03:59:54 UTC (rev 354590)
+++ PKGBUILD	2019-06-01 04:11:01 UTC (rev 354591)
@@ -3,7 +3,7 @@
 
 pkgbase=gtk3
 pkgname=(gtk3 gtk-update-icon-cache)
-pkgver=3.24.8+162+g689bc42aaf
+pkgver=3.24.8+167+gdd25499f1e
 pkgrel=1
 epoch=1
 pkgdesc="GObject-based multi-platform GUI toolkit"
@@ -15,13 +15,15 @@
          cantarell-fonts colord rest libcups libcanberra fribidi iso-codes)
 makedepends=(gobject-introspection gtk-doc git glib2-docs sassc meson)
 license=(LGPL)
-_commit=689bc42aaffcf278c145f8e7d46ee6b934e6d709  # gtk-3-24
+_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'
@@ -34,10 +36,12 @@
 
 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 \


More information about the arch-commits mailing list