public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/giggle/, dev-vcs/giggle/files/
@ 2016-10-03  8:49 Mike Auty
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Auty @ 2016-10-03  8:49 UTC (permalink / raw
  To: gentoo-commits

commit:     547bf1f772e2900745767349468e13960d84f8d5
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  3 08:49:09 2016 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Mon Oct  3 08:49:09 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547bf1f7

dev-vcs/giggle: Move to vte-2.91 (bug #595902).

Package-Manager: portage-2.3.1

 dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch | 57 ++++++++++++++++++++++++++
 dev-vcs/giggle/giggle-0.7-r2.ebuild            | 47 +++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch b/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch
new file mode 100644
index 00000000..f800a9d
--- /dev/null
+++ b/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch
@@ -0,0 +1,57 @@
+From b9e260840d03e33ac55142719f3d54129b54cc70 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@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.1.0
+

diff --git a/dev-vcs/giggle/giggle-0.7-r2.ebuild b/dev-vcs/giggle/giggle-0.7-r2.ebuild
new file mode 100644
index 00000000..0a0bb54
--- /dev/null
+++ b/dev-vcs/giggle/giggle-0.7-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 eutils
+
+DESCRIPTION="GTK+ Frontend for GIT"
+HOMEPAGE="https://wiki.gnome.org/Apps/giggle"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="eds"
+
+RDEPEND="
+	>=dev-vcs/git-1.5
+	>=dev-libs/glib-2.30:2
+	>=x11-libs/gtk+-3.3.12:3
+	>=x11-libs/gtksourceview-3.0:3.0
+	>=x11-libs/gdk-pixbuf-2.22.0
+	eds? ( gnome-extra/evolution-data-server )
+	>=x11-libs/vte-0.28:2.91
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	sys-devel/gettext
+	app-text/yelp-tools
+	virtual/pkgconfig
+	>=dev-util/intltool-0.35
+	>=sys-devel/autoconf-2.64
+	>=sys-devel/libtool-2
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.6.2-gtksourceview-3.8.0.patch"
+	epatch "${FILESDIR}/${PN}-0.7-vte-2.91.patch"
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable eds evolution-data-server)
+}


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-vcs/giggle/, dev-vcs/giggle/files/
@ 2018-07-22  8:34 Mike Auty
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Auty @ 2018-07-22  8:34 UTC (permalink / raw
  To: gentoo-commits

commit:     1f8826f159097e4d9ce7a0296924e8c5e7329e4d
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 08:33:14 2018 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 08:33:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f8826f1

dev-vcs/giggle: remove last rited package

Closes: https://bugs.gentoo.org/658264

 dev-vcs/giggle/Manifest                            |  1 -
 .../files/giggle-0.6.2-gtksourceview-3.8.0.patch   | 24 ---------
 dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch     | 57 ----------------------
 dev-vcs/giggle/giggle-0.7-r2.ebuild                | 46 -----------------
 dev-vcs/giggle/metadata.xml                        | 11 -----
 5 files changed, 139 deletions(-)

diff --git a/dev-vcs/giggle/Manifest b/dev-vcs/giggle/Manifest
deleted file mode 100644
index dc643aeb035..00000000000
--- a/dev-vcs/giggle/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST giggle-0.7.tar.xz 2042304 BLAKE2B 376b82e7550e1926109572656424918cdd4282e64f215344c519f0c5960f2aea5399fd9f779982c75f7fffdc41b3c7f4660d823ddcbb03d43506646299f34509 SHA512 01d3cc0adc610706a97b89487624fe3d09c1347c0b07920e71d2e33761fab4894ebb304113ac7df6cdd03ed6116d09dcce85b35d6169df5a3f3973faaa151cfb

diff --git a/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch b/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch
deleted file mode 100644
index 37648e17123..00000000000
--- a/dev-vcs/giggle/files/giggle-0.6.2-gtksourceview-3.8.0.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/giggle-diff-view.h b/src/giggle-diff-view.h
-index de5fe02..9ef33b5 100644
---- a/src/giggle-diff-view.h
-+++ b/src/giggle-diff-view.h
-@@ -23,6 +23,7 @@
- 
- #include <glib-object.h>
- #include <gtk/gtk.h>
-+#include <gtksourceview/gtksourcebuffer.h>
- #include <gtksourceview/gtksourceview.h>
- #include <gtksourceview/gtksourcelanguagemanager.h>
- 
-diff --git a/src/giggle-view-file.c b/src/giggle-view-file.c
-index 7746225..7b74c0a 100644
---- a/src/giggle-view-file.c
-+++ b/src/giggle-view-file.c
-@@ -42,6 +42,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))

diff --git a/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch b/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch
deleted file mode 100644
index f800a9d157c..00000000000
--- a/dev-vcs/giggle/files/giggle-0.7-vte-2.91.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b9e260840d03e33ac55142719f3d54129b54cc70 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@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.1.0
-

diff --git a/dev-vcs/giggle/giggle-0.7-r2.ebuild b/dev-vcs/giggle/giggle-0.7-r2.ebuild
deleted file mode 100644
index b423d027f8f..00000000000
--- a/dev-vcs/giggle/giggle-0.7-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit autotools gnome2
-
-DESCRIPTION="GTK+ Frontend for GIT"
-HOMEPAGE="https://wiki.gnome.org/Apps/giggle"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="eds"
-
-RDEPEND="
-	>=dev-vcs/git-1.5
-	>=dev-libs/glib-2.30:2
-	>=x11-libs/gtk+-3.3.12:3
-	>=x11-libs/gtksourceview-3.0:3.0
-	>=x11-libs/gdk-pixbuf-2.22.0
-	eds? ( gnome-extra/evolution-data-server:= )
-	>=x11-libs/vte-0.28:2.91
-"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	app-text/yelp-tools
-	virtual/pkgconfig
-	>=dev-util/intltool-0.35
-	>=sys-devel/autoconf-2.64
-	>=sys-devel/libtool-2
-"
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-0.6.2-gtksourceview-3.8.0.patch"
-	eapply "${FILESDIR}/${PN}-0.7-vte-2.91.patch"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable eds evolution-data-server)
-}

diff --git a/dev-vcs/giggle/metadata.xml b/dev-vcs/giggle/metadata.xml
deleted file mode 100644
index 93f8632fd83..00000000000
--- a/dev-vcs/giggle/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>ikelos@gentoo.org</email>
-		<name>Mike Auty</name>
-	</maintainer>
-	<longdescription lang="en">
-		GTK+ based frontend for GIT
-	</longdescription>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-07-22  8:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-22  8:34 [gentoo-commits] repo/gentoo:master commit in: dev-vcs/giggle/, dev-vcs/giggle/files/ Mike Auty
  -- strict thread matches above, loose matches on Subject: below --
2016-10-03  8:49 Mike Auty

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox