[arch-commits] Commit in giggle/trunk (PKGBUILD gtksourceview3.7.patch vte2.91.patch)

Balló György bgyorgy at archlinux.org
Fri Mar 29 18:49:23 UTC 2019


    Date: Friday, March 29, 2019 @ 18:49:23
  Author: bgyorgy
Revision: 446056

upgpkg: giggle 0.7-9

Fix crash (FS#62137)

Modified:
  giggle/trunk/PKGBUILD
  giggle/trunk/gtksourceview3.7.patch
  giggle/trunk/vte2.91.patch

------------------------+
 PKGBUILD               |    7 ++--
 gtksourceview3.7.patch |   68 +++++++++++++++++++++++++++++++----------------
 vte2.91.patch          |   43 +++++++++++++++++------------
 3 files changed, 74 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-29 18:46:49 UTC (rev 446055)
+++ PKGBUILD	2019-03-29 18:49:23 UTC (rev 446056)
@@ -5,7 +5,7 @@
 
 pkgname=giggle
 pkgver=0.7
-pkgrel=8
+pkgrel=9
 pkgdesc='Git repository viewer'
 arch=(x86_64)
 url='https://wiki.gnome.org/Apps/giggle'
@@ -16,8 +16,8 @@
         gtksourceview3.7.patch
         vte2.91.patch)
 sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59'
-            'ca0b841d11bb5072741784dbeb72705eddf8e2bde780b8712355d5b66e456b37'
-            '2eba9ff9b11ac8ae2d1f3d104a61026b0b04e745f810f719c8f4657f8c23ce02')
+            'a29cc899d17645d43a39ac94551c4af896f67983c40fab3bfc585881217f30df'
+            'eec654cd3ec31144461cbfc01f4c0b6690e0cdd1b08e057cd5afe99acc17dfed')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -31,6 +31,7 @@
   cd $pkgname-$pkgver
 
   ./configure --prefix=/usr
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
 

Modified: gtksourceview3.7.patch
===================================================================
--- gtksourceview3.7.patch	2019-03-29 18:46:49 UTC (rev 446055)
+++ gtksourceview3.7.patch	2019-03-29 18:49:23 UTC (rev 446056)
@@ -1,36 +1,58 @@
-From 9999a7ff573b7f3320c2065e8d0eaf0fea32a41b Mon Sep 17 00:00:00 2001
+From 44490f7f78c3281c8fc4f38aa7226fc5955720a9 Mon Sep 17 00:00:00 2001
 From: Dominique Leuenberger <dimstar at opensuse.org>
-Date: Wed, 03 Apr 2013 20:26:17 +0000
-Subject: Directly include gtksourcebuffer.h
+Date: Wed, 3 Apr 2013 22:26:17 +0200
+Subject: [PATCH] include gtksource.h instead of gtksourceview.h
 
-Until gtksourceview 3.7, it was included indirectly by gtksourceview.h.
+The main header of gtksourceview is now called gtksource.h
 
 https://bugzilla.gnome.org/show_bug.cgi?id=697220
 ---
-diff --git a/src/giggle-diff-view.c b/src/giggle-diff-view.c
-index 3ded28d..ff6bbe3 100644
---- a/src/giggle-diff-view.c
-+++ b/src/giggle-diff-view.c
-@@ -29,6 +29,8 @@
- #include <glib/gi18n.h>
- #include <string.h>
+ configure.ac           | 2 +-
+ src/giggle-diff-view.h | 3 +--
+ src/giggle-view-file.c | 3 +--
+ 3 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a7011f8..3e47b48 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@ dnl  ------------------
+ GLIB_REQUIRED_VERSION=2.30
+ GDK_PIXBUF_REQUIRED_VERSION=2.22
+ GTK_REQUIRED_VERSION=3.3.12
+-GTKSOURCE_REQUIRED_VERSION=3.0
++GTKSOURCE_REQUIRED_VERSION=3.8
+ EDS_REQUIRED_VERSION=3.2
+ VTE_REQUIRED_VERSION=0.28
  
-+#include <gtksourceview/gtksourcebuffer.h>
-+
- typedef struct GiggleDiffViewPriv GiggleDiffViewPriv;
- typedef struct GiggleDiffViewFile GiggleDiffViewFile;
- typedef struct GiggleDiffViewHunk GiggleDiffViewHunk;
+diff --git a/src/giggle-diff-view.h b/src/giggle-diff-view.h
+index 74fb983..28266e3 100644
+--- a/src/giggle-diff-view.h
++++ b/src/giggle-diff-view.h
+@@ -21,8 +21,7 @@
+ 
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+ 
+ #include "libgiggle/giggle-revision.h"
+ 
 diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
-index 130af4a..517858d 100644
+index 130af4a..94c6c76 100644
 --- a/src/giggle-view-file.c
 +++ b/src/giggle-view-file.c
-@@ -40,6 +40,7 @@
+@@ -38,8 +38,7 @@
+ #include <gio/gio.h>
+ #include <glib/gi18n.h>
  
- #include <gtksourceview/gtksourcelanguagemanager.h>
- #include <gtksourceview/gtksourceview.h>
-+#include <gtksourceview/gtksourcebuffer.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
+-#include <gtksourceview/gtksourceview.h>
++#include <gtksourceview/gtksource.h>
  
  #define GIGGLE_TYPE_VIEW_FILE_SNAPSHOT            (giggle_view_file_snapshot_get_type ())
  #define GIGGLE_VIEW_FILE_SNAPSHOT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIGGLE_TYPE_VIEW_FILE_SNAPSHOT, GiggleViewFileSnapshot))
---
-cgit v0.9.1
+-- 
+2.18.1
+

Modified: vte2.91.patch
===================================================================
--- vte2.91.patch	2019-03-29 18:46:49 UTC (rev 446055)
+++ vte2.91.patch	2019-03-29 18:49:23 UTC (rev 446056)
@@ -1,16 +1,19 @@
-diff -u -r giggle-0.7/configure.ac giggle-0.7-vte2.91/configure.ac
---- giggle-0.7/configure.ac	2012-11-01 06:29:01.000000000 +0100
-+++ giggle-0.7-vte2.91/configure.ac	2014-09-28 23:31:40.389429740 +0200
-@@ -56,7 +56,7 @@
- GTK_REQUIRED_VERSION=3.3.12
- GTKSOURCE_REQUIRED_VERSION=3.0
- EDS_REQUIRED_VERSION=3.2
--VTE_REQUIRED_VERSION=0.28
-+VTE_REQUIRED_VERSION=0.38
- 
- 
- PKG_CHECK_MODULES(GIGGLE, [
-@@ -109,7 +109,7 @@
+From b9e260840d03e33ac55142719f3d54129b54cc70 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir at gnome.org>
+Date: Mon, 26 Jan 2015 15:38:24 +0100
+Subject: [PATCH] Port to vte-2.91 API
+
+https://bugzilla.gnome.org/show_bug.cgi?id=743537
+---
+ configure.ac                   |  2 +-
+ plugins/giggle-view-terminal.c | 19 ++++++++++---------
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6e27733..72e7bd1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -106,7 +106,7 @@ AC_ARG_ENABLE([terminal],
  AS_IF([test "x$enable_terminal" = "xyes"],
        [
          PKG_CHECK_MODULES([VTE],
@@ -19,10 +22,11 @@
                            [have_vte=yes
                             AC_DEFINE([HAVE_VTE], [1],
                                       [Use features from vte])
-diff -u -r giggle-0.7/plugins/giggle-view-terminal.c giggle-0.7-vte2.91/plugins/giggle-view-terminal.c
---- giggle-0.7/plugins/giggle-view-terminal.c	2012-11-01 06:29:01.000000000 +0100
-+++ giggle-0.7-vte2.91/plugins/giggle-view-terminal.c	2014-09-28 23:46:07.965686517 +0200
-@@ -186,15 +186,16 @@
+diff --git a/plugins/giggle-view-terminal.c b/plugins/giggle-view-terminal.c
+index 06a9a50..cd107f2 100644
+--- a/plugins/giggle-view-terminal.c
++++ b/plugins/giggle-view-terminal.c
+@@ -186,15 +186,16 @@ giggle_view_terminal_append_tab (GiggleViewTerminal *view,
  	real_argv[1] = NULL;
  	spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO;
  
@@ -43,8 +47,11 @@
 +	                                  spawn_flags,
 +	                                  NULL, NULL,
 +	                                  NULL,
-+                                          NULL,
++	                                  NULL,
 +	                                  &error);
  	g_strfreev (real_argv);
  
  	if (succes == FALSE) {
+-- 
+2.18.1
+


More information about the arch-commits mailing list