summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2015-11-15 10:19:34 +0100
committerPacho Ramos <pacho@gentoo.org>2015-11-15 11:29:29 +0100
commit2f5fbad3a6cb35c8dd7b0d5b9ea25636124efe9a (patch)
tree1bf5baca8a7266f1bb6104045782ffd34f0bed82 /dev-libs/libgit2-glib/files
parentdev-vcs/gitg: Drop old (diff)
downloadgentoo-2f5fbad3a6cb35c8dd7b0d5b9ea25636124efe9a.tar.gz
gentoo-2f5fbad3a6cb35c8dd7b0d5b9ea25636124efe9a.tar.bz2
gentoo-2f5fbad3a6cb35c8dd7b0d5b9ea25636124efe9a.zip
dev-libs/libgit2-glib: Drop old
Package-Manager: portage-2.2.24
Diffstat (limited to 'dev-libs/libgit2-glib/files')
-rw-r--r--dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch75
-rw-r--r--dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch93
2 files changed, 0 insertions, 168 deletions
diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch
deleted file mode 100644
index 5c3904cc0062..000000000000
--- a/dev-libs/libgit2-glib/files/libgit2-glib-0.0.24-automagic-ssh.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8c1559c..94175c9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,32 +79,44 @@ dnl ===========================================================================
- dnl Check for libgit2 ssh support
- dnl ===========================================================================
-
--AC_MSG_CHECKING([for libgit2 ssh support])
--
--cflags_save="${CFLAGS}"
--libs_save="${LIBS}"
--
--CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
--LIBS="${LIBGIT2_GLIB_LIBS}"
--
--AC_TRY_RUN([
-- #include <git2.h>
-- int
-- main(int argc, const char *argv[])
-- {
-- git_threads_init ();
-- return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
-- }
--],[
-- AC_MSG_RESULT([yes])
-- git_ssh=yes
--],[
-- AC_MSG_RESULT([no])
-- git_ssh=no
--])
--
--CFLAGS="${cflags_save}"
--LIBS="${libs_save}"
-+AC_ARG_ENABLE([ssh],
-+ AS_HELP_STRING([--enable-ssh[=@<:@no/auto/yes@:>@]],[Build with libgit2 ssh support]),
-+ [enable_ssh=$enableval],
-+ [enable_ssh="auto"])
-+
-+git_ssh=no
-+
-+if test "x$enable_ssh" != "xno"; then
-+ AC_MSG_CHECKING([for libgit2 ssh support])
-+
-+ cflags_save="${CFLAGS}"
-+ libs_save="${LIBS}"
-+
-+ CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
-+ LIBS="${LIBGIT2_GLIB_LIBS}"
-+
-+ AC_TRY_RUN([
-+ #include <git2.h>
-+ int
-+ main(int argc, const char *argv[])
-+ {
-+ git_threads_init ();
-+ return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
-+ }
-+ ],[
-+ AC_MSG_RESULT([yes])
-+ git_ssh=yes
-+ ],[
-+ AC_MSG_RESULT([no])
-+ git_ssh=no
-+ if test "x$enable_ssh" = "xyes"; then
-+ AC_MSG_ERROR([libgit2 ssh support was requiested, but not found])
-+ fi
-+ ])
-+
-+ CFLAGS="${cflags_save}"
-+ LIBS="${libs_save}"
-+fi
-
- if test "x$git_ssh" = "xyes"; then
- LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1"
diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch
deleted file mode 100644
index 9ec626486f66..000000000000
--- a/dev-libs/libgit2-glib/files/libgit2-glib-0.22.0-automagic-ssh.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From e67a9ba456bc7f4b6b8c4899179d6b7a2863d592 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
-Date: Tue, 20 Jan 2015 08:12:41 +0100
-Subject: [PATCH] configure: Add flag to force on or off SSH support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Remove an automagic dependency on libgit2's SSH support.
-
-Signed-off-by: RĂ©mi Cardona <remi@gentoo.org>
----
- configure.ac | 64 ++++++++++++++++++++++++++++++++++++------------------------
- 1 file changed, 38 insertions(+), 26 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1bd96bc..61744db 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -79,32 +79,44 @@ dnl ===========================================================================
- dnl Check for libgit2 ssh support
- dnl ===========================================================================
-
--AC_MSG_CHECKING([for libgit2 ssh support])
--
--cflags_save="${CFLAGS}"
--libs_save="${LIBS}"
--
--CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
--LIBS="${LIBGIT2_GLIB_LIBS}"
--
--AC_TRY_RUN([
-- #include <git2.h>
-- int
-- main(int argc, const char *argv[])
-- {
-- git_libgit2_init ();
-- return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
-- }
--],[
-- AC_MSG_RESULT([yes])
-- git_ssh=yes
--],[
-- AC_MSG_RESULT([no])
-- git_ssh=no
--])
--
--CFLAGS="${cflags_save}"
--LIBS="${libs_save}"
-+AC_ARG_ENABLE([ssh],
-+ AS_HELP_STRING([--enable-ssh[=@<:@no/auto/yes@:>@]],[Build with libgit2 ssh support]),
-+ [enable_ssh=$enableval],
-+ [enable_ssh="auto"])
-+
-+git_ssh=no
-+
-+if test "x$enable_ssh" != "xno"; then
-+ AC_MSG_CHECKING([for libgit2 ssh support])
-+
-+ cflags_save="${CFLAGS}"
-+ libs_save="${LIBS}"
-+
-+ CFLAGS="${LIBGIT2_GLIB_CFLAGS}"
-+ LIBS="${LIBGIT2_GLIB_LIBS}"
-+
-+ AC_TRY_RUN([
-+ #include <git2.h>
-+ int
-+ main(int argc, const char *argv[])
-+ {
-+ git_libgit2_init ();
-+ return ((git_libgit2_features() & GIT_FEATURE_SSH) != 0) ? 0 : 1;
-+ }
-+ ],[
-+ AC_MSG_RESULT([yes])
-+ git_ssh=yes
-+ ],[
-+ AC_MSG_RESULT([no])
-+ git_ssh=no
-+ if test "x$enable_ssh" = "xyes"; then
-+ AC_MSG_ERROR([libgit2 ssh support was requiested, but not found])
-+ fi
-+ ])
-+
-+ CFLAGS="${cflags_save}"
-+ LIBS="${libs_save}"
-+fi
-
- if test "x$git_ssh" = "xyes"; then
- LIBGIT2_GLIB_CFLAGS="${LIBGIT2_GLIB_CFLAGS} -DGIT_SSH=1"
---
-2.2.1
-