[arch-commits] Commit in giggle/repos/community-x86_64 (6 files)
Alexander Rødseth
arodseth at archlinux.org
Fri Mar 29 12:32:13 UTC 2019
Date: Friday, March 29, 2019 @ 12:32:07
Author: arodseth
Revision: 446004
archrelease: copy trunk to community-x86_64
Added:
giggle/repos/community-x86_64/PKGBUILD
(from rev 446003, giggle/trunk/PKGBUILD)
giggle/repos/community-x86_64/gtksourceview3.7.patch
(from rev 446003, giggle/trunk/gtksourceview3.7.patch)
giggle/repos/community-x86_64/vte2.91.patch
(from rev 446003, giggle/trunk/vte2.91.patch)
Deleted:
giggle/repos/community-x86_64/PKGBUILD
giggle/repos/community-x86_64/gtksourceview3.7.patch
giggle/repos/community-x86_64/vte2.91.patch
------------------------+
PKGBUILD | 91 +++++++++++++++++++++---------------------
gtksourceview3.7.patch | 72 ++++++++++++++++-----------------
vte2.91.patch | 100 +++++++++++++++++++++++------------------------
3 files changed, 132 insertions(+), 131 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-03-29 12:31:57 UTC (rev 446003)
+++ PKGBUILD 2019-03-29 12:32:07 UTC (rev 446004)
@@ -1,45 +0,0 @@
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-# Contributor: neodreams <yanbrodeur at gmail.com>
-
-pkgname=giggle
-pkgver=0.7
-pkgrel=7
-pkgdesc='Git repository viewer'
-arch=('x86_64')
-url='https://wiki.gnome.org/Apps/giggle'
-license=('GPL')
-depends=('git' 'gtksourceview3' 'vte3')
-makedepends=('intltool' 'itstool' 'gnome-common' 'yelp-tools')
-source=("https://ftp.gnome.org/pub/GNOME/sources/giggle/$pkgver/$pkgname-$pkgver.tar.xz"
- 'gtksourceview3.7.patch'
- 'vte2.91.patch')
-sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59'
- 'ca0b841d11bb5072741784dbeb72705eddf8e2bde780b8712355d5b66e456b37'
- '2eba9ff9b11ac8ae2d1f3d104a61026b0b04e745f810f719c8f4657f8c23ce02')
-
-prepare() {
- cd "$pkgname-$pkgver"
-
- patch -Np1 -i ../gtksourceview3.7.patch
- patch -Np1 -i ../vte2.91.patch
- NOCONFIGURE=1 AUTOPOINT=intltoolize gnome-autogen.sh
-}
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure --prefix=/usr
- make
-}
-
-check() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" check
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-}
-
-# getver: -u 7 git.gnome.org/browse/giggle/plain/NEWS
-# vim:set ts=2 sw=2 et:
Copied: giggle/repos/community-x86_64/PKGBUILD (from rev 446003, giggle/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-03-29 12:32:07 UTC (rev 446004)
@@ -0,0 +1,46 @@
+# Maintainer:
+# Contributor: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+# Contributor: neodreams <yanbrodeur at gmail.com>
+
+pkgname=giggle
+pkgver=0.7
+pkgrel=8
+pkgdesc='Git repository viewer'
+arch=(x86_64)
+url='https://wiki.gnome.org/Apps/giggle'
+license=(GPL)
+depends=(git gtksourceview3 vte3)
+makedepends=(intltool itstool gnome-common yelp-tools)
+source=("https://ftp.gnome.org/pub/GNOME/sources/giggle/$pkgver/$pkgname-$pkgver.tar.xz"
+ gtksourceview3.7.patch
+ vte2.91.patch)
+sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59'
+ 'ca0b841d11bb5072741784dbeb72705eddf8e2bde780b8712355d5b66e456b37'
+ '2eba9ff9b11ac8ae2d1f3d104a61026b0b04e745f810f719c8f4657f8c23ce02')
+
+prepare() {
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i ../gtksourceview3.7.patch
+ patch -Np1 -i ../vte2.91.patch
+ NOCONFIGURE=1 AUTOPOINT=intltoolize gnome-autogen.sh
+}
+
+build() {
+ cd $pkgname-$pkgver
+
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ make -C $pkgname-$pkgver DESTDIR="$pkgdir" check
+}
+
+package() {
+ make -C $pkgname-$pkgver DESTDIR="$pkgdir" install
+}
+
+# getver: -u 7 git.gnome.org/browse/giggle/plain/NEWS
+# vim:set ts=2 sw=2 et:
Deleted: gtksourceview3.7.patch
===================================================================
--- gtksourceview3.7.patch 2019-03-29 12:31:57 UTC (rev 446003)
+++ gtksourceview3.7.patch 2019-03-29 12:32:07 UTC (rev 446004)
@@ -1,36 +0,0 @@
-From 9999a7ff573b7f3320c2065e8d0eaf0fea32a41b 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
-
-Until gtksourceview 3.7, it was included indirectly by gtksourceview.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>
-
-+#include <gtksourceview/gtksourcebuffer.h>
-+
- typedef struct GiggleDiffViewPriv GiggleDiffViewPriv;
- typedef struct GiggleDiffViewFile GiggleDiffViewFile;
- typedef struct GiggleDiffViewHunk GiggleDiffViewHunk;
-diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
-index 130af4a..517858d 100644
---- a/src/giggle-view-file.c
-+++ b/src/giggle-view-file.c
-@@ -40,6 +40,7 @@
-
- #include <gtksourceview/gtksourcelanguagemanager.h>
- #include <gtksourceview/gtksourceview.h>
-+#include <gtksourceview/gtksourcebuffer.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
Copied: giggle/repos/community-x86_64/gtksourceview3.7.patch (from rev 446003, giggle/trunk/gtksourceview3.7.patch)
===================================================================
--- gtksourceview3.7.patch (rev 0)
+++ gtksourceview3.7.patch 2019-03-29 12:32:07 UTC (rev 446004)
@@ -0,0 +1,36 @@
+From 9999a7ff573b7f3320c2065e8d0eaf0fea32a41b 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
+
+Until gtksourceview 3.7, it was included indirectly by gtksourceview.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>
+
++#include <gtksourceview/gtksourcebuffer.h>
++
+ typedef struct GiggleDiffViewPriv GiggleDiffViewPriv;
+ typedef struct GiggleDiffViewFile GiggleDiffViewFile;
+ typedef struct GiggleDiffViewHunk GiggleDiffViewHunk;
+diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
+index 130af4a..517858d 100644
+--- a/src/giggle-view-file.c
++++ b/src/giggle-view-file.c
+@@ -40,6 +40,7 @@
+
+ #include <gtksourceview/gtksourcelanguagemanager.h>
+ #include <gtksourceview/gtksourceview.h>
++#include <gtksourceview/gtksourcebuffer.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
Deleted: vte2.91.patch
===================================================================
--- vte2.91.patch 2019-03-29 12:31:57 UTC (rev 446003)
+++ vte2.91.patch 2019-03-29 12:32:07 UTC (rev 446004)
@@ -1,50 +0,0 @@
-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 @@
- AS_IF([test "x$enable_terminal" = "xyes"],
- [
- PKG_CHECK_MODULES([VTE],
-- [vte-2.90 >= $VTE_REQUIRED_VERSION],
-+ [vte-2.91 >= $VTE_REQUIRED_VERSION],
- [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 @@
- real_argv[1] = NULL;
- spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO;
-
-- succes = vte_terminal_fork_command_full (VTE_TERMINAL (terminal),
-- pty_flags,
-- directory,
-- real_argv,
-- NULL,
-- spawn_flags,
-- NULL, NULL,
-- NULL,
-- &error);
-+ succes = vte_terminal_spawn_sync (VTE_TERMINAL (terminal),
-+ pty_flags,
-+ directory,
-+ real_argv,
-+ NULL,
-+ spawn_flags,
-+ NULL, NULL,
-+ NULL,
-+ NULL,
-+ &error);
- g_strfreev (real_argv);
-
- if (succes == FALSE) {
Copied: giggle/repos/community-x86_64/vte2.91.patch (from rev 446003, giggle/trunk/vte2.91.patch)
===================================================================
--- vte2.91.patch (rev 0)
+++ vte2.91.patch 2019-03-29 12:32:07 UTC (rev 446004)
@@ -0,0 +1,50 @@
+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 @@
+ AS_IF([test "x$enable_terminal" = "xyes"],
+ [
+ PKG_CHECK_MODULES([VTE],
+- [vte-2.90 >= $VTE_REQUIRED_VERSION],
++ [vte-2.91 >= $VTE_REQUIRED_VERSION],
+ [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 @@
+ real_argv[1] = NULL;
+ spawn_flags = G_SPAWN_CHILD_INHERITS_STDIN | G_SPAWN_SEARCH_PATH | G_SPAWN_FILE_AND_ARGV_ZERO;
+
+- succes = vte_terminal_fork_command_full (VTE_TERMINAL (terminal),
+- pty_flags,
+- directory,
+- real_argv,
+- NULL,
+- spawn_flags,
+- NULL, NULL,
+- NULL,
+- &error);
++ succes = vte_terminal_spawn_sync (VTE_TERMINAL (terminal),
++ pty_flags,
++ directory,
++ real_argv,
++ NULL,
++ spawn_flags,
++ NULL, NULL,
++ NULL,
++ NULL,
++ &error);
+ g_strfreev (real_argv);
+
+ if (succes == FALSE) {
More information about the arch-commits
mailing list