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

[Antonio Rojas]

    Date: Sunday, November 25, 2018 @ 15:34:58
  Author: arojas
Revision: 409695

PIE rebuild

Added:
  libappindicator/trunk/incompatible_pointer_build_fix.patch
Modified:
  libappindicator/trunk/PKGBUILD

--------------------------------------+
 PKGBUILD                             |    9 ++++++---
 incompatible_pointer_build_fix.patch |   12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-25 15:30:01 UTC (rev 409694)
+++ PKGBUILD	2018-11-25 15:34:58 UTC (rev 409695)
@@ -9,7 +9,7 @@
 pkgbase=libappindicator
 pkgname=("${pkgbase}-gtk"{2,3} "${pkgbase}-sharp" "python2-${pkgbase}")
 pkgver=12.10.0
-pkgrel=12
+pkgrel=13
 pkgdesc='Allow applications to extend a menu via Ayatana indicators in Unity, KDE or Systray'
 url='https://launchpad.net/libappindicator'
 arch=('x86_64')
@@ -20,11 +20,13 @@
 options=('!emptydirs')
 source=(http://launchpad.net/${pkgbase}/${pkgver%.*}/${pkgver}/+download/${pkgbase}-${pkgver}.tar.gz{,.asc}
         improved-plasma.patch
-        no-python.patch)
+        no-python.patch
+        incompatible_pointer_build_fix.patch)
 sha512sums=('317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a'
             'SKIP'
             'e2930b9942b800a7a14faf4c27d59073c166e24bb1675f8604a0b5ac3fbd101f3642f7221bc8f5219231c8f021a2a8c4aa203f971ea5f2f9225be83d807cb80e'
-            '891f5097c607770428460fe902214c70fb2a11de9fe1e6d6109ea859b22eda3d7057cab4c5b5444de5f6f3149348c186034dcde8f95c77800bcbd8abcdf7277b')
+            '891f5097c607770428460fe902214c70fb2a11de9fe1e6d6109ea859b22eda3d7057cab4c5b5444de5f6f3149348c186034dcde8f95c77800bcbd8abcdf7277b'
+            'bda93822c43dbc153202e7cd1e4b5c5fde5ca1ec35a1314bee37707f9cf4483c52ba79d3c808592f5e62470d45dc6a7b8eb5cfe60295a8e5446128b0643e36c5')
 validpgpkeys=('6FC05581A37D71FCECE165DB5BE41E162CD6358E')  # Charles Kerr <charles.kerr at canonical.com>
 
 prepare() {
@@ -32,6 +34,7 @@
     sed 's|/cli/|/mono/|' -i bindings/mono/{appindicator-sharp-0.1.pc.in,Makefile.in}
     sed 's/example //g' -i Makefile.in
     patch -p1 < "${srcdir}/improved-plasma.patch"
+    patch -p1 -i ../incompatible_pointer_build_fix.patch # Build fix, Fedora patch
   )
   # python enabled variant
   cp -ra ${pkgbase}-${pkgver}{,-py2}

Added: incompatible_pointer_build_fix.patch
===================================================================
--- incompatible_pointer_build_fix.patch	                        (rev 0)
+++ incompatible_pointer_build_fix.patch	2018-11-25 15:34:58 UTC (rev 409695)
@@ -0,0 +1,12 @@
+diff -up libappindicator-12.10.0/src/app-indicator.c.build_fix libappindicator-12.10.0/src/app-indicator.c
+--- libappindicator-12.10.0/src/app-indicator.c.build_fix	2018-04-10 14:43:57.134400594 +0200
++++ libappindicator-12.10.0/src/app-indicator.c	2018-04-10 14:45:34.655448722 +0200
+@@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_tar
+ 
+ 	g_return_if_fail (GTK_IS_WIDGET (menuitem));
+ 
+-	priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem));
++	priv->sec_activate_target = g_object_ref(menuitem);
+ 	priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
+ 	g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
+ }