diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-vcs/gitg/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-vcs/gitg/files')
-rw-r--r-- | dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch | 58 | ||||
-rw-r--r-- | dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch | 371 | ||||
-rw-r--r-- | dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch | 123 |
3 files changed, 552 insertions, 0 deletions
diff --git a/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch b/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch new file mode 100644 index 000000000000..3c0b88133485 --- /dev/null +++ b/dev-vcs/gitg/files/gitg-0.1.2-fix-disable-debug.patch @@ -0,0 +1,58 @@ +From eeec06ef06073b28f011a2be5417f4398d187c2e Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <sebastian@pipping.org> +Date: Sun, 27 Mar 2011 22:42:29 +0200 +Subject: [PATCH] Fix --disable-debug + +--- + gitg-debug.c | 7 +++++++ + gitg-debug.h | 4 ++-- + 2 files changed, 9 insertions(+), 2 deletions(-) + +diff --git a/libgitg/gitg-debug.c b/libgitg/gitg-debug.c +index 6530e7a..781101e 100644 +--- a/libgitg/gitg-debug.c ++++ b/libgitg/gitg-debug.c +@@ -21,6 +21,7 @@ + */ + + #include "gitg-debug.h" ++#if ENABLE_DEBUG + #include <glib.h> + #include <stdio.h> + +@@ -72,3 +73,9 @@ gitg_debug_message (guint level, + g_free (msg); + } + } ++ ++#else ++ ++void gitg_debug_init (void) { } ++ ++#endif /* ENABLE_DEBUG */ +diff --git a/libgitg/gitg-debug.h b/libgitg/gitg-debug.h +index 55d4428..ab81b4e 100644 +--- a/libgitg/gitg-debug.h ++++ b/libgitg/gitg-debug.h +@@ -35,8 +35,9 @@ enum + GITG_DEBUG_CONFIG = 1 << 3 + }; + +-#if ENABLE_DEBUG + void gitg_debug_init (void); ++ ++#if ENABLE_DEBUG + gboolean gitg_debug_enabled (guint debug); + + void gitg_debug_message (guint level, +@@ -49,7 +50,6 @@ void gitg_debug_message (guint level, + #define gitg_debug(level,args...) gitg_debug_message (level, __FILE__, __LINE__, G_STRFUNC, args) + #else + +-#define gitg_debug_init ; + #define gitg_debug_enabled(x) FALSE + #define gitg_debug(level,args...) ; + +-- +1.7.4.1 + diff --git a/dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch b/dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch new file mode 100644 index 000000000000..48f875a612c2 --- /dev/null +++ b/dev-vcs/gitg/files/gitg-0.2.6-fix-libreoffice.patch @@ -0,0 +1,371 @@ +From 9fda4e3c22475059f4910d3072e01c4436bfeca9 Mon Sep 17 00:00:00 2001 +From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com> +Date: Thu, 28 Mar 2013 00:08:17 +0100 +Subject: [PATCH] lp#1056378: make end to nonsensical premature 8-bit + optimization + +- 128 lanes are _not_ enough for everyone +--- + gitg/gitg-cell-renderer-path.c | 8 ++++---- + libgitg/gitg-color.c | 6 +++--- + libgitg/gitg-color.h | 2 +- + libgitg/gitg-lane.h | 2 +- + libgitg/gitg-lanes.c | 40 ++++++++++++++++++++-------------------- + libgitg/gitg-lanes.h | 2 +- + libgitg/gitg-repository.c | 4 ++-- + libgitg/gitg-revision.c | 8 ++++---- + libgitg/gitg-revision.h | 6 +++--- + 9 files changed, 39 insertions(+), 39 deletions(-) + +diff --git a/gitg/gitg-cell-renderer-path.c b/gitg/gitg-cell-renderer-path.c +index 97902ee..e2ae957 100644 +--- a/gitg/gitg-cell-renderer-path.c ++++ b/gitg/gitg-cell-renderer-path.c +@@ -151,7 +151,7 @@ static void + draw_arrow (GitgCellRendererPath *self, + cairo_t *cr, + const GdkRectangle *area, +- gint8 laneidx, ++ gint32 laneidx, + gboolean top) + { + gdouble cw = self->priv->lane_width; +@@ -187,7 +187,7 @@ draw_paths_real (GitgCellRendererPath *self, + } + + GSList *lanes = gitg_revision_get_lanes (revision); +- gint8 to = 0; ++ gint32 to = 0; + gdouble cw = self->priv->lane_width; + gdouble ch = area->height / 2.0; + GitgLane *lane; +@@ -201,7 +201,7 @@ draw_paths_real (GitgCellRendererPath *self, + + for (item = lane->from; item; item = item->next) + { +- gint8 from = (gint8)GPOINTER_TO_INT (item->data); ++ gint32 from = (gint32)GPOINTER_TO_INT (item->data); + + cairo_move_to (cr, area->x + from * cw + cw / 2.0, + area->y + yoffset * ch); +@@ -241,7 +241,7 @@ draw_arrows (GitgCellRendererPath *self, + const GdkRectangle *area) + { + GSList *item; +- gint8 to = 0; ++ gint32 to = 0; + + for (item = gitg_revision_get_lanes (self->priv->revision); item; item = item->next) + { +diff --git a/libgitg/gitg-color.c b/libgitg/gitg-color.c +index d5eeb85..f13dd77 100644 +--- a/libgitg/gitg-color.c ++++ b/libgitg/gitg-color.c +@@ -23,7 +23,7 @@ + #include "gitg-color.h" + #include <gdk/gdk.h> + +-static gint8 current_index = 0; ++static gint32 current_index = 0; + + static gchar const *palette[] = { + "#c4a000", +@@ -72,10 +72,10 @@ gitg_color_set_cairo_source (GitgColor *color, cairo_t *cr) + cairo_set_source_rgb(cr, r, g, b); + } + +-static gint8 ++static gint32 + next_index () + { +- gint8 next = current_index++; ++ gint32 next = current_index++; + + if (current_index == sizeof(palette) / sizeof(gchar const *)) + current_index = 0; +diff --git a/libgitg/gitg-color.h b/libgitg/gitg-color.h +index c3c9bd3..1968597 100644 +--- a/libgitg/gitg-color.h ++++ b/libgitg/gitg-color.h +@@ -33,7 +33,7 @@ typedef struct _GitgColor GitgColor; + struct _GitgColor + { + gulong ref_count; +- gint8 index; ++ gint32 index; + }; + + void gitg_color_reset (void); +diff --git a/libgitg/gitg-lane.h b/libgitg/gitg-lane.h +index 61664db..4ce0737 100644 +--- a/libgitg/gitg-lane.h ++++ b/libgitg/gitg-lane.h +@@ -47,7 +47,7 @@ typedef struct + { + GitgColor *color; /** Pointer to color */ + GSList *from; /** List of lanes merging on this lane */ +- gint8 type; ++ gint32 type; + } GitgLane; + + typedef struct +diff --git a/libgitg/gitg-lanes.c b/libgitg/gitg-lanes.c +index 41b8650..f3aaa61 100644 +--- a/libgitg/gitg-lanes.c ++++ b/libgitg/gitg-lanes.c +@@ -46,7 +46,7 @@ typedef struct + typedef struct + { + GitgColor *color; +- gint8 index; ++ gint32 index; + gchar const *from; + gchar const *to; + } CollapsedLane; +@@ -109,10 +109,10 @@ free_lanes (GitgLanes *lanes) + static LaneContainer * + find_lane_by_hash (GitgLanes *lanes, + gchar const *hash, +- gint8 *pos) ++ gint32 *pos) + { + GSList *item; +- gint8 p = 0; ++ gint32 p = 0; + + if (!hash) + { +@@ -344,14 +344,14 @@ lane_container_next (LaneContainer *container, + + static void + update_lane_merge_indices (GSList *from, +- gint8 index, ++ gint32 index, + gint direction) + { + GSList *item; + + for (item = from; item; item = g_slist_next (item)) + { +- gint8 idx = GPOINTER_TO_INT (item->data); ++ gint32 idx = GPOINTER_TO_INT (item->data); + + if ((direction < 0 && idx > index) || (direction > 0 && idx >= index)) + { +@@ -362,7 +362,7 @@ update_lane_merge_indices (GSList *from, + + static void + update_merge_indices (GSList *lanes, +- gint8 index, ++ gint32 index, + gint direction) + { + GSList *item; +@@ -378,7 +378,7 @@ update_merge_indices (GSList *lanes, + static void + add_collapsed (GitgLanes *lanes, + LaneContainer *container, +- gint8 index) ++ gint32 index) + { + CollapsedLane *collapsed = collapsed_lane_new (container); + collapsed->index = index; +@@ -389,7 +389,7 @@ add_collapsed (GitgLanes *lanes, + static void + collapse_lane (GitgLanes *lanes, + LaneContainer *container, +- gint8 index) ++ gint32 index) + { + /* backtrack for inactive-collapse revisions and remove this container from + those revisions, appropriately updating merge indices etc */ +@@ -409,7 +409,7 @@ collapse_lane (GitgLanes *lanes, + GSList *collapsed = g_slist_nth(lns, index); + GitgLane *lane = (GitgLane *)collapsed->data; + +- gint8 newindex = GPOINTER_TO_INT(lane->from->data); ++ gint32 newindex = GPOINTER_TO_INT(lane->from->data); + + lns = gitg_revision_remove_lane(revision, lane); + +@@ -445,8 +445,8 @@ collapse_lane (GitgLanes *lanes, + + static void + update_current_lanes_merge_indices (GitgLanes *lanes, +- gint8 index, +- gint8 direction) ++ gint32 index, ++ gint32 direction) + { + GSList *item; + +@@ -462,7 +462,7 @@ static void + collapse_lanes (GitgLanes *lanes) + { + GSList *item = lanes->priv->lanes; +- gint8 index = 0; ++ gint32 index = 0; + + while (item) + { +@@ -490,9 +490,9 @@ collapse_lanes (GitgLanes *lanes) + } + } + +-static gint8 ++static gint32 + ensure_correct_index (GitgRevision *revision, +- gint8 index) ++ gint32 index) + { + guint len = g_slist_length (gitg_revision_get_lanes (revision)); + +@@ -509,11 +509,11 @@ expand_lane (GitgLanes *lanes, + CollapsedLane *lane) + { + GSList *item; +- gint8 index = lane->index; ++ gint32 index = lane->index; + + GitgLane *ln = gitg_lane_new_with_color (lane->color); + guint len = g_slist_length (lanes->priv->lanes); +- gint8 next; ++ gint32 next; + + if (index > len) + { +@@ -614,7 +614,7 @@ static void + init_next_layer (GitgLanes *lanes) + { + GSList *item = lanes->priv->lanes; +- gint8 index = 0; ++ gint32 index = 0; + + /* Initialize new set of lanes based on 'lanes'. It copies the lane (refs + the color) and adds the lane index as a merge (so it basicly represents +@@ -628,7 +628,7 @@ init_next_layer (GitgLanes *lanes) + } + + static void +-prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos) ++prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint32 *pos) + { + LaneContainer *mylane; + guint num; +@@ -647,7 +647,7 @@ prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos) + /* Iterate over all parents and find them a lane */ + for (i = 0; i < num; ++i) + { +- gint8 lnpos; ++ gint32 lnpos; + LaneContainer *container = find_lane_by_hash (lanes, parents[i], &lnpos); + + if (container) +@@ -710,7 +710,7 @@ prepare_lanes (GitgLanes *lanes, GitgRevision *next, gint8 *pos) + } + + GSList * +-gitg_lanes_next (GitgLanes *lanes, GitgRevision *next, gint8 *nextpos) ++gitg_lanes_next (GitgLanes *lanes, GitgRevision *next, gint32 *nextpos) + { + LaneContainer *mylane; + GSList *res; +diff --git a/libgitg/gitg-lanes.h b/libgitg/gitg-lanes.h +index ae71757..8e02bbb 100644 +--- a/libgitg/gitg-lanes.h ++++ b/libgitg/gitg-lanes.h +@@ -55,7 +55,7 @@ GType gitg_lanes_get_type (void) G_GNUC_CONST; + + GitgLanes *gitg_lanes_new(void); + void gitg_lanes_reset(GitgLanes *lanes); +-GSList *gitg_lanes_next(GitgLanes *lanes, GitgRevision *next, gint8 *mylane); ++GSList *gitg_lanes_next(GitgLanes *lanes, GitgRevision *next, gint32 *mylane); + + G_END_DECLS + +diff --git a/libgitg/gitg-repository.c b/libgitg/gitg-repository.c +index f1d1b18..2751800 100644 +--- a/libgitg/gitg-repository.c ++++ b/libgitg/gitg-repository.c +@@ -865,7 +865,7 @@ append_revision (GitgRepository *repository, + GitgRevision *rv) + { + GSList *lanes; +- gint8 mylane = 0; ++ gint32 mylane = 0; + + if (repository->priv->size == 0) + { +@@ -1158,7 +1158,7 @@ repository_relane (GitgRepository *repository) + + for (i = 0; i < repository->priv->size; ++i) + { +- gint8 mylane; ++ gint32 mylane; + GitgRevision *revision = repository->priv->storage[i]; + + GSList *lanes = gitg_lanes_next (repository->priv->lanes, +diff --git a/libgitg/gitg-revision.c b/libgitg/gitg-revision.c +index 579c878..37ca641 100644 +--- a/libgitg/gitg-revision.c ++++ b/libgitg/gitg-revision.c +@@ -45,7 +45,7 @@ struct _GitgRevision + char sign; + + GSList *lanes; +- gint8 mylane; ++ gint32 mylane; + }; + + G_DEFINE_BOXED_TYPE (GitgRevision, gitg_revision, gitg_revision_ref, gitg_revision_unref) +@@ -303,7 +303,7 @@ update_lane_type (GitgRevision *revision) + void + gitg_revision_set_lanes (GitgRevision *revision, + GSList *lanes, +- gint8 mylane) ++ gint32 mylane) + { + free_lanes (revision); + revision->lanes = lanes; +@@ -316,7 +316,7 @@ gitg_revision_set_lanes (GitgRevision *revision, + update_lane_type (revision); + } + +-gint8 ++gint32 + gitg_revision_get_mylane (GitgRevision *revision) + { + return revision->mylane; +@@ -324,7 +324,7 @@ gitg_revision_get_mylane (GitgRevision *revision) + + void + gitg_revision_set_mylane (GitgRevision *revision, +- gint8 mylane) ++ gint32 mylane) + { + g_return_if_fail (mylane >= 0); + +diff --git a/libgitg/gitg-revision.h b/libgitg/gitg-revision.h +index e01a141..72051d7 100644 +--- a/libgitg/gitg-revision.h ++++ b/libgitg/gitg-revision.h +@@ -64,13 +64,13 @@ gchar **gitg_revision_get_parents (GitgRevision *revision); + + GSList *gitg_revision_get_lanes (GitgRevision *revision); + GitgLane *gitg_revision_get_lane (GitgRevision *revision); +-void gitg_revision_set_lanes (GitgRevision *revision, GSList *lanes, gint8 mylane); ++void gitg_revision_set_lanes (GitgRevision *revision, GSList *lanes, gint32 mylane); + + GSList *gitg_revision_remove_lane (GitgRevision *revision, GitgLane *lane); + GSList *gitg_revision_insert_lane (GitgRevision *revision, GitgLane *lane, gint index); + +-gint8 gitg_revision_get_mylane (GitgRevision *revision); +-void gitg_revision_set_mylane (GitgRevision *revision, gint8 mylane); ++gint32 gitg_revision_get_mylane (GitgRevision *revision); ++void gitg_revision_set_mylane (GitgRevision *revision, gint32 mylane); + + void gitg_revision_set_sign(GitgRevision *revision, char sign); + char gitg_revision_get_sign(GitgRevision *revision); +-- +1.8.1.5 + diff --git a/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch b/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch new file mode 100644 index 000000000000..d8a8b0bd9007 --- /dev/null +++ b/dev-vcs/gitg/files/gitg-3.14.1-libgit2-glib-0.22.0.patch @@ -0,0 +1,123 @@ + gitg/gitg-author-details-dialog.vala | 1 - + gitg/gitg-clone-dialog.vala | 5 +---- + libgitg/gitg-commit.vala | 4 ++-- + libgitg/gitg-lanes.vala | 4 ++-- + tests/libgitg/test-commit.vala | 2 +- + 5 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/gitg/gitg-author-details-dialog.vala b/gitg/gitg-author-details-dialog.vala +index 64cdb65..59f66dd 100644 +--- a/gitg/gitg-author-details-dialog.vala ++++ b/gitg/gitg-author-details-dialog.vala +@@ -81,7 +81,6 @@ namespace Gitg + + try + { +- d_config.refresh(); + author_name = d_config.get_string("user.name"); + } + catch {} +diff --git a/gitg/gitg-clone-dialog.vala b/gitg/gitg-clone-dialog.vala +index 94eb610..60390f9 100644 +--- a/gitg/gitg-clone-dialog.vala ++++ b/gitg/gitg-clone-dialog.vala +@@ -80,9 +80,8 @@ public class CloneDialog : Gtk.Dialog + d_entry_url.changed.connect((e) => { + string ?tooltip_text = null; + string ?icon_name = null; +- bool url_supported = Ggit.Remote.is_supported_url(d_entry_url.get_text()); + +- if (!url_supported && (d_entry_url.text != "")) ++ if (d_entry_url.text != "") + { + icon_name = "dialog-warning-symbolic"; + tooltip_text = _("The URL introduced is not supported"); +@@ -90,8 +89,6 @@ public class CloneDialog : Gtk.Dialog + + d_entry_url.set_icon_from_icon_name(Gtk.EntryIconPosition.SECONDARY, icon_name); + d_entry_url.set_icon_tooltip_text(Gtk.EntryIconPosition.SECONDARY, tooltip_text); +- +- set_response_sensitive(Gtk.ResponseType.OK, url_supported); + }); + } + } +diff --git a/libgitg/gitg-commit.vala b/libgitg/gitg-commit.vala +index 2aba60d..2ec5a4c 100644 +--- a/libgitg/gitg-commit.vala ++++ b/libgitg/gitg-commit.vala +@@ -122,7 +122,7 @@ public class Commit : Ggit.Commit + var parents = get_parents(); + + // Create a new diff from the parents to the commit tree +- if (parents.size() == 0) ++ if (parents.size == 0) + { + diff = new Ggit.Diff.tree_to_tree(repo, + null, +@@ -131,7 +131,7 @@ public class Commit : Ggit.Commit + } + else + { +- for (var i = 0; i < parents.size(); ++i) ++ for (var i = 0; i < parents.size; ++i) + { + var parent = parents.get(0); + +diff --git a/libgitg/gitg-lanes.vala b/libgitg/gitg-lanes.vala +index 06886dc..f2d99f5 100644 +--- a/libgitg/gitg-lanes.vala ++++ b/libgitg/gitg-lanes.vala +@@ -158,7 +158,7 @@ public class Lanes : Object + init_next_layer(); + var mylane = d_lanes[pos]; + +- for (uint i = 0; i < parents.size(); ++i) ++ for (uint i = 0; i < parents.size; ++i) + { + int lnpos; + var poid = parents.get_id(i); +@@ -439,7 +439,7 @@ public class Lanes : Object + + var parents = commit.get_parents(); + +- for (uint i = 0; i < parents.size(); ++i) ++ for (uint i = 0; i < parents.size; ++i) + { + expand_lane_from_oid(parents.get_id(i)); + } +diff --git a/tests/libgitg/test-commit.vala b/tests/libgitg/test-commit.vala +index fd0c137..65c0473 100644 +--- a/tests/libgitg/test-commit.vala ++++ b/tests/libgitg/test-commit.vala +@@ -252,7 +252,7 @@ class Gitg.Test.Commit : Gitg.Test.Repository + assert_streq(d_repository.get_head().get_target().to_string(), + oid.to_string()); + +- assert_uinteq(commit.get_parents().size(), 0); ++ assert_uinteq(commit.get_parents().size, 0); + + var reflog = d_repository.lookup_reference("HEAD").get_log(); + var entry = reflog.get_entry_from_index(0); + libgitg/gitg-repository-list-box.vala | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/libgitg/gitg-repository-list-box.vala b/libgitg/gitg-repository-list-box.vala +index 8dd5b33..393b29e 100644 +--- a/libgitg/gitg-repository-list-box.vala ++++ b/libgitg/gitg-repository-list-box.vala +@@ -494,14 +494,13 @@ namespace Gitg + d_row = row; + } + +- protected override bool transfer_progress(Ggit.TransferProgress stats) throws Error ++ protected override void transfer_progress(Ggit.TransferProgress stats) + { + var recvobj = stats.get_received_objects(); + var indxobj = stats.get_indexed_objects(); + var totaobj = stats.get_total_objects(); + + d_row.fraction = (recvobj + indxobj) / (double)(2 * totaobj); +- return true; + } + } + |