[arch-commits] Commit in giggle/repos/community-x86_64 (7 files)

Balló György bgyorgy at archlinux.org
Sat Jun 22 05:56:23 UTC 2019


    Date: Saturday, June 22, 2019 @ 05:56:23
  Author: bgyorgy
Revision: 482646

archrelease: copy trunk to community-x86_64

Added:
  giggle/repos/community-x86_64/PKGBUILD
    (from rev 482645, giggle/trunk/PKGBUILD)
  giggle/repos/community-x86_64/giggle.appdata.xml
    (from rev 482645, giggle/trunk/giggle.appdata.xml)
  giggle/repos/community-x86_64/gtksourceview3.7.patch
    (from rev 482645, giggle/trunk/gtksourceview3.7.patch)
  giggle/repos/community-x86_64/vte2.91.patch
    (from rev 482645, 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               |   94 +++++++++++++++++++-------------------
 giggle.appdata.xml     |   38 +++++++++++++++
 gtksourceview3.7.patch |  116 +++++++++++++++++++++++------------------------
 vte2.91.patch          |  114 +++++++++++++++++++++++-----------------------
 4 files changed, 200 insertions(+), 162 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-22 05:56:18 UTC (rev 482645)
+++ PKGBUILD	2019-06-22 05:56:23 UTC (rev 482646)
@@ -1,47 +0,0 @@
-# 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=9
-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'
-            'a29cc899d17645d43a39ac94551c4af896f67983c40fab3bfc585881217f30df'
-            'eec654cd3ec31144461cbfc01f4c0b6690e0cdd1b08e057cd5afe99acc17dfed')
-
-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
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  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 482645, giggle/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-06-22 05:56:23 UTC (rev 482646)
@@ -0,0 +1,47 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# 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=10
+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://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"
+        giggle.appdata.xml
+        gtksourceview3.7.patch
+        vte2.91.patch)
+sha256sums=('ae2e2237fa0d0999d99d0a0ee9b7ec147e80bd2472d59a045b2b01eb02261f59'
+            '52bc930fe0e981bc14722b842cf2a57e645509853a642692d73f14462b3522be'
+            'a29cc899d17645d43a39ac94551c4af896f67983c40fab3bfc585881217f30df'
+            'eec654cd3ec31144461cbfc01f4c0b6690e0cdd1b08e057cd5afe99acc17dfed')
+
+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
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make -k check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../giggle.appdata.xml "$pkgdir/usr/share/metainfo/giggle.appdata.xml"
+}

Copied: giggle/repos/community-x86_64/giggle.appdata.xml (from rev 482645, giggle/trunk/giggle.appdata.xml)
===================================================================
--- giggle.appdata.xml	                        (rev 0)
+++ giggle.appdata.xml	2019-06-22 05:56:23 UTC (rev 482646)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>org.gnome.Giggle.desktop</id>
+  <launchable type="desktop-id">giggle.desktop</launchable>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+</project_license>
+  <name>Giggle</name>
+  <summary>Git repository viewer</summary>
+  <description>
+    <p>
+      Giggle is a graphical frontend for the git directory tracker.
+    </p>
+    <p>
+      It currently features a history viewer much like gitk and a commit GUI like git gui.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default" height="742" width="1034">
+      <image>https://wiki.gnome.org/Apps/giggle?action=AttachFile&do=get&target=giggle-history.png</image>
+      <caption>Giggle history view</caption>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">https://wiki.gnome.org/Apps/giggle</url>
+  <update_contact>jjardon_at_gnome.org</update_contact>
+  <project_group>GNOME</project_group>
+  <developer_name>The GNOME Project</developer_name>
+  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=giggle</url>
+  <url type="donation">https://www.gnome.org/friends/</url>
+  <url type="help">https://wiki.gnome.org/Apps/giggle/</url>
+  <kudos>
+    <kudo>HiDpiIcon</kudo>
+    <kudo>ModernToolkit</kudo>
+    <kudo>UserDocs</kudo>
+  </kudos>
+  <translation type="gettext">giggle</translation>
+
+  <url type="translate">https://wiki.gnome.org/TranslationProject</url>
+</component>

Deleted: gtksourceview3.7.patch
===================================================================
--- gtksourceview3.7.patch	2019-06-22 05:56:18 UTC (rev 482645)
+++ gtksourceview3.7.patch	2019-06-22 05:56:23 UTC (rev 482646)
@@ -1,58 +0,0 @@
-From 44490f7f78c3281c8fc4f38aa7226fc5955720a9 Mon Sep 17 00:00:00 2001
-From: Dominique Leuenberger <dimstar at opensuse.org>
-Date: Wed, 3 Apr 2013 22:26:17 +0200
-Subject: [PATCH] include gtksource.h instead of gtksourceview.h
-
-The main header of gtksourceview is now called gtksource.h
-
-https://bugzilla.gnome.org/show_bug.cgi?id=697220
----
- 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
- 
-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..94c6c76 100644
---- a/src/giggle-view-file.c
-+++ b/src/giggle-view-file.c
-@@ -38,8 +38,7 @@
- #include <gio/gio.h>
- #include <glib/gi18n.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))
--- 
-2.18.1
-

Copied: giggle/repos/community-x86_64/gtksourceview3.7.patch (from rev 482645, giggle/trunk/gtksourceview3.7.patch)
===================================================================
--- gtksourceview3.7.patch	                        (rev 0)
+++ gtksourceview3.7.patch	2019-06-22 05:56:23 UTC (rev 482646)
@@ -0,0 +1,58 @@
+From 44490f7f78c3281c8fc4f38aa7226fc5955720a9 Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar at opensuse.org>
+Date: Wed, 3 Apr 2013 22:26:17 +0200
+Subject: [PATCH] include gtksource.h instead of gtksourceview.h
+
+The main header of gtksourceview is now called gtksource.h
+
+https://bugzilla.gnome.org/show_bug.cgi?id=697220
+---
+ 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
+ 
+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..94c6c76 100644
+--- a/src/giggle-view-file.c
++++ b/src/giggle-view-file.c
+@@ -38,8 +38,7 @@
+ #include <gio/gio.h>
+ #include <glib/gi18n.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))
+-- 
+2.18.1
+

Deleted: vte2.91.patch
===================================================================
--- vte2.91.patch	2019-06-22 05:56:18 UTC (rev 482645)
+++ vte2.91.patch	2019-06-22 05:56:23 UTC (rev 482646)
@@ -1,57 +0,0 @@
-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],
--                          [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 --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;
- 
--	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) {
--- 
-2.18.1
-

Copied: giggle/repos/community-x86_64/vte2.91.patch (from rev 482645, giggle/trunk/vte2.91.patch)
===================================================================
--- vte2.91.patch	                        (rev 0)
+++ vte2.91.patch	2019-06-22 05:56:23 UTC (rev 482646)
@@ -0,0 +1,57 @@
+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],
+-                          [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 --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;
+ 
+-	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) {
+-- 
+2.18.1
+


More information about the arch-commits mailing list