From 63e2c414d820ad067b71a1c7fb0fc0741f44118e Mon Sep 17 00:00:00 2001 From: Sergey Svishchev Date: Sat, 1 Oct 2011 19:24:33 +0000 Subject: [PATCH] Import gitg-0.0.8 as wip/gitg. gitg aims at being a small, fast and convenient tool to visualize git history and actions that benefit from a graphical presentation. --- gitg/DESCR | 2 + gitg/Makefile | 29 +++++++++ gitg/PLIST | 64 ++++++++++++++++++++ gitg/TODO | 3 + gitg/distinfo | 6 ++ gitg/patches/patch-aa | 134 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 238 insertions(+) create mode 100644 gitg/DESCR create mode 100644 gitg/Makefile create mode 100644 gitg/PLIST create mode 100644 gitg/TODO create mode 100644 gitg/distinfo create mode 100644 gitg/patches/patch-aa diff --git a/gitg/DESCR b/gitg/DESCR new file mode 100644 index 0000000000..f24038d30d --- /dev/null +++ b/gitg/DESCR @@ -0,0 +1,2 @@ +gitg aims at being a small, fast and convenient tool to visualize +git history and actions that benefit from a graphical presentation. diff --git a/gitg/Makefile b/gitg/Makefile new file mode 100644 index 0000000000..66c2a5fbee --- /dev/null +++ b/gitg/Makefile @@ -0,0 +1,29 @@ +# $NetBSD: Makefile,v 1.1.1.1 2011/10/01 19:24:33 shattered Exp $ +# + +DISTNAME= gitg-0.0.8 +CATEGORIES= devel +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gitg/0.0/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= shattered@NetBSD.org +HOMEPAGE= http://trac.novowork.com/gitg/ +COMMENT= Git repository browser +LICENSE= gnu-gpl-v2 + +PKG_DESTDIR_SUPPORT= user-destdir + +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_TOOLS+= pkg-config intltool gmake msgfmt + +GCONF_SCHEMAS+= data/gitg.schemas +PKGCONFIG_OVERRIDE+= libgitg-1.0.pc.in +USE_PKGLOCALEDIR= yes + +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../devel/GConf/schemas.mk" +.include "../../graphics/gnome-icon-theme/buildlink3.mk" +.include "../../x11/gtk2/buildlink3.mk" +.include "../../x11/gtksourceview2/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/gitg/PLIST b/gitg/PLIST new file mode 100644 index 0000000000..a42f3bc8e5 --- /dev/null +++ b/gitg/PLIST @@ -0,0 +1,64 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2011/10/01 19:24:33 shattered Exp $ +bin/gitg +include/libgitg-1.0/libgitg/gitg-changed-file.h +include/libgitg-1.0/libgitg/gitg-color.h +include/libgitg-1.0/libgitg/gitg-command.h +include/libgitg-1.0/libgitg/gitg-commit.h +include/libgitg-1.0/libgitg/gitg-config.h +include/libgitg-1.0/libgitg/gitg-hash.h +include/libgitg-1.0/libgitg/gitg-io.h +include/libgitg-1.0/libgitg/gitg-lane.h +include/libgitg-1.0/libgitg/gitg-line-parser.h +include/libgitg-1.0/libgitg/gitg-ref.h +include/libgitg-1.0/libgitg/gitg-repository.h +include/libgitg-1.0/libgitg/gitg-revision.h +include/libgitg-1.0/libgitg/gitg-runner.h +include/libgitg-1.0/libgitg/gitg-shell.h +lib/libgitg-1.0.la +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gitg.mo +${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gitg.mo +lib/pkgconfig/libgitg-1.0.pc +man/man1/gitg.1 +share/applications/gitg.desktop +share/gconf/schemas/gitg.schemas +share/gitg/icons/gitg.svg +share/gitg/icons/gitg128x128.png +share/gitg/icons/gitg16x16.png +share/gitg/icons/gitg22x22.png +share/gitg/icons/gitg24x24.png +share/gitg/icons/gitg32x32.png +share/gitg/icons/gitg48x48.png +share/gitg/icons/gitg64x64.png +share/gitg/language-specs/gitgdiff.lang +share/gitg/styles/gitgstyle.xml +share/gitg/ui/gitg-commit-menu.ui +share/gitg/ui/gitg-menus.xml +share/gitg/ui/gitg-new-branch.ui +share/gitg/ui/gitg-preferences.ui +share/gitg/ui/gitg-repository.ui +share/gitg/ui/gitg-revision-changes-panel.ui +share/gitg/ui/gitg-revision-details-panel.ui +share/gitg/ui/gitg-revision-files-panel.ui +share/gitg/ui/gitg-tag.ui +share/gitg/ui/gitg-ui.xml +share/gitg/ui/gitg-window.ui +share/icons/hicolor/16x16/apps/gitg.png +share/icons/hicolor/22x22/apps/gitg.png +share/icons/hicolor/24x24/apps/gitg.png +share/icons/hicolor/32x32/apps/gitg.png +share/icons/hicolor/48x48/apps/gitg.png +share/icons/hicolor/scalable/apps/gitg.svg diff --git a/gitg/TODO b/gitg/TODO new file mode 100644 index 0000000000..319560c933 --- /dev/null +++ b/gitg/TODO @@ -0,0 +1,3 @@ +0.1.x requires wip/gsettings-desktop-schemas + +0.2.x requires GTK+ 3 diff --git a/gitg/distinfo b/gitg/distinfo new file mode 100644 index 0000000000..597593ec07 --- /dev/null +++ b/gitg/distinfo @@ -0,0 +1,6 @@ +$NetBSD: distinfo,v 1.1.1.1 2011/10/01 19:24:33 shattered Exp $ + +SHA1 (gitg-0.0.8.tar.bz2) = c3d378a158118ff0ac0f3a02bcb3b57010f35d47 +RMD160 (gitg-0.0.8.tar.bz2) = 9dd4edc549ad7e7addcce47e1af3639775365415 +Size (gitg-0.0.8.tar.bz2) = 535076 bytes +SHA1 (patch-aa) = 93ee6a37f9f120c6bea27681cb554c148422d602 diff --git a/gitg/patches/patch-aa b/gitg/patches/patch-aa new file mode 100644 index 0000000000..415be521d8 --- /dev/null +++ b/gitg/patches/patch-aa @@ -0,0 +1,134 @@ +$NetBSD: patch-aa,v 1.1.1.1 2011/10/01 19:24:33 shattered Exp $ + +--- libgitg/gitg-runner.c.orig 2010-12-23 12:26:14.000000000 +0000 ++++ libgitg/gitg-runner.c +@@ -40,8 +40,8 @@ struct _GitgRunnerPrivate + { + GitgCommand *command; + +- GInputStream *stdout; +- GOutputStream *stdin; ++ GInputStream *_stdout; ++ GOutputStream *_stdin; + + GCancellable *cancellable; + gboolean cancelled; +@@ -98,20 +98,20 @@ close_streams (GitgRunner *runner) + g_cancellable_cancel (runner->priv->cancellable); + } + +- if (runner->priv->stdin != NULL) ++ if (runner->priv->_stdin != NULL) + { +- g_output_stream_close (runner->priv->stdin, NULL, NULL); +- g_object_unref (runner->priv->stdin); ++ g_output_stream_close (runner->priv->_stdin, NULL, NULL); ++ g_object_unref (runner->priv->_stdin); + +- runner->priv->stdin = NULL; ++ runner->priv->_stdin = NULL; + } + +- if (runner->priv->stdout != NULL) ++ if (runner->priv->_stdout != NULL) + { +- g_input_stream_close (runner->priv->stdout, NULL, NULL); +- g_object_unref (runner->priv->stdout); ++ g_input_stream_close (runner->priv->_stdout, NULL, NULL); ++ g_object_unref (runner->priv->_stdout); + +- runner->priv->stdout = NULL; ++ runner->priv->_stdout = NULL; + } + + gitg_io_close (GITG_IO (runner)); +@@ -376,7 +376,7 @@ gitg_runner_stream_close (GitgRunner *ru + } + else + { +- g_input_stream_close (runner->priv->stdout, NULL, NULL); ++ g_input_stream_close (runner->priv->_stdout, NULL, NULL); + } + } + +@@ -406,7 +406,7 @@ process_watch_cb (GPid pid, + + runner->priv->watch_id = 0; + +- if (runner->priv->stdout == NULL || g_input_stream_is_closed (runner->priv->stdout)) ++ if (runner->priv->_stdout == NULL || g_input_stream_is_closed (runner->priv->_stdout)) + { + runner_done (runner, NULL); + } +@@ -416,8 +416,8 @@ void + gitg_runner_run (GitgRunner *runner) + { + gboolean ret; +- gint stdinf; +- gint stdoutf; ++ gint _stdinf; ++ gint _stdoutf; + GFile *working_directory; + gchar *wd_path = NULL; + GInputStream *start_input; +@@ -450,8 +450,8 @@ gitg_runner_run (GitgRunner *runner) + NULL, + NULL, + &(runner->priv->pid), +- start_input ? &stdinf : NULL, +- &stdoutf, ++ start_input ? &_stdinf : NULL, ++ &_stdoutf, + NULL, + &error); + +@@ -476,13 +476,13 @@ gitg_runner_run (GitgRunner *runner) + + runner->priv->cancellable = g_cancellable_new (); + +- runner->priv->stdin = G_OUTPUT_STREAM (g_unix_output_stream_new (stdinf, ++ runner->priv->_stdin = G_OUTPUT_STREAM (g_unix_output_stream_new (_stdinf, + TRUE)); + + data = async_data_new (runner); + +- /* Splice the supplied input to stdin of the process */ +- g_output_stream_splice_async (runner->priv->stdin, ++ /* Splice the supplied input to _stdin of the process */ ++ g_output_stream_splice_async (runner->priv->_stdin, + start_input, + G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | + G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, +@@ -492,12 +492,12 @@ gitg_runner_run (GitgRunner *runner) + data); + } + +- output = G_INPUT_STREAM (g_unix_input_stream_new (stdoutf, ++ output = G_INPUT_STREAM (g_unix_input_stream_new (_stdoutf, + TRUE)); + + smart = gitg_smart_charset_converter_new (gitg_encoding_get_candidates ()); + +- runner->priv->stdout = g_converter_input_stream_new (output, ++ runner->priv->_stdout = g_converter_input_stream_new (output, + G_CONVERTER (smart)); + + g_object_unref (smart); +@@ -518,7 +518,7 @@ gitg_runner_run (GitgRunner *runner) + + /* Splice output of the process into the provided stream */ + g_output_stream_splice_async (end_output, +- runner->priv->stdout, ++ runner->priv->_stdout, + G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | + G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET, + G_PRIORITY_DEFAULT, +@@ -533,7 +533,7 @@ gitg_runner_get_stream (GitgRunner *runn + { + g_return_val_if_fail (GITG_IS_RUNNER (runner), NULL); + +- return runner->priv->stdout; ++ return runner->priv->_stdout; + } + + void