From 0515e3be9e1e400207b50d977f11f11249b1b09a Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 3 Nov 2008 06:51:37 +0000 Subject: Remove superfluous patches. --- security/seahorse/patches/patch-ab | 75 -------------------------------------- security/seahorse/patches/patch-ac | 15 -------- security/seahorse/patches/patch-ae | 18 --------- security/seahorse/patches/patch-ah | 22 ----------- security/seahorse/patches/patch-ai | 12 ------ security/seahorse/patches/patch-aj | 22 ----------- 6 files changed, 164 deletions(-) delete mode 100644 security/seahorse/patches/patch-ab delete mode 100644 security/seahorse/patches/patch-ac delete mode 100644 security/seahorse/patches/patch-ae delete mode 100644 security/seahorse/patches/patch-ah delete mode 100644 security/seahorse/patches/patch-ai delete mode 100644 security/seahorse/patches/patch-aj (limited to 'security/seahorse') diff --git a/security/seahorse/patches/patch-ab b/security/seahorse/patches/patch-ab deleted file mode 100644 index 50dbe3a1df4..00000000000 --- a/security/seahorse/patches/patch-ab +++ /dev/null @@ -1,75 +0,0 @@ -$NetBSD: patch-ab,v 1.8 2007/11/05 19:49:04 drochner Exp $ - ---- configure.orig 2007-09-19 05:47:31.000000000 +0200 -+++ configure -@@ -38698,12 +38698,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GEDIT_CFLAGS="$GEDIT_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gedit-2.16 >= 2.15.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "gedit-2.16 >= 2.15.0") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gedit-2.20 >= 2.15.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "gedit-2.20 >= 2.15.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GEDIT_CFLAGS=`$PKG_CONFIG --cflags "gedit-2.16 >= 2.15.0" 2>/dev/null` -+ pkg_cv_GEDIT_CFLAGS=`$PKG_CONFIG --cflags "gedit-2.20 >= 2.15.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -38716,12 +38716,12 @@ if test -n "$PKG_CONFIG"; then - pkg_cv_GEDIT_LIBS="$GEDIT_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gedit-2.16 >= 2.15.0\"") >&5 -- ($PKG_CONFIG --exists --print-errors "gedit-2.16 >= 2.15.0") 2>&5 -+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gedit-2.20 >= 2.15.0\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "gedit-2.20 >= 2.15.0") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_GEDIT_LIBS=`$PKG_CONFIG --libs "gedit-2.16 >= 2.15.0" 2>/dev/null` -+ pkg_cv_GEDIT_LIBS=`$PKG_CONFIG --libs "gedit-2.20 >= 2.15.0" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -38740,9 +38740,9 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gedit-2.16 >= 2.15.0"` -+ GEDIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gedit-2.20 >= 2.15.0"` - else -- GEDIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gedit-2.16 >= 2.15.0"` -+ GEDIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gedit-2.20 >= 2.15.0"` - fi - # Put the nasty error message in config.log where it belongs - echo "$GEDIT_PKG_ERRORS" >&5 -@@ -43517,7 +43517,7 @@ _ACEOF - - fi - -- if test "$enable_ssh" == "yes"; then -+ if test "$enable_ssh" = "yes"; then - WITH_SSH_TRUE= - WITH_SSH_FALSE='#' - else -@@ -43605,7 +43605,7 @@ fi - SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $EBOOK_CFLAGS" - SEAHORSE_LIBS="$SEAHORSE_LIBS $EBOOK_LIBS" - -- if test "$enable_ebook" == "yes"; then -+ if test "$enable_ebook" = "yes"; then - WITH_EBOOK_TRUE= - WITH_EBOOK_FALSE='#' - else -@@ -43662,7 +43662,7 @@ if test "$enable_tests" != "yes"; then - enable_tests="no" - fi - -- if test "$enable_tests" == "yes"; then -+ if test "$enable_tests" = "yes"; then - WITH_TESTS_TRUE= - WITH_TESTS_FALSE='#' - else diff --git a/security/seahorse/patches/patch-ac b/security/seahorse/patches/patch-ac deleted file mode 100644 index 660d8bd7f5e..00000000000 --- a/security/seahorse/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2007/06/12 20:09:11 joerg Exp $ - ---- Makefile.in.orig 2007-06-12 19:57:56.000000000 +0000 -+++ Makefile.in -@@ -343,8 +343,8 @@ SUBDIRS = libcryptui \ - help \ - pixmaps \ - plugins \ -- $(AGENT_DIR) \ -- daemon -+ daemon \ -+ $(AGENT_DIR) - - EXTRA_DIST = \ - AUTHORS \ diff --git a/security/seahorse/patches/patch-ae b/security/seahorse/patches/patch-ae deleted file mode 100644 index d657febc752..00000000000 --- a/security/seahorse/patches/patch-ae +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ae,v 1.2 2007/04/11 21:48:03 drochner Exp $ - ---- libseahorse/seahorse-server-source.c.orig 2006-08-24 22:13:08.000000000 +0200 -+++ libseahorse/seahorse-server-source.c -@@ -346,11 +346,12 @@ static guint - seahorse_server_source_get_state (SeahorseKeySource *src) - { - SeahorseServerSource *ssrc; -+ guint state; - - g_assert (SEAHORSE_IS_SERVER_SOURCE (src)); - ssrc = SEAHORSE_SERVER_SOURCE (src); - -- guint state = SKSRC_REMOTE; -+ state = SKSRC_REMOTE; - if (seahorse_operation_is_running (SEAHORSE_OPERATION (ssrc->priv->mop))) - state |= SKSRC_LOADING; - return state; diff --git a/security/seahorse/patches/patch-ah b/security/seahorse/patches/patch-ah deleted file mode 100644 index 4ac387667b9..00000000000 --- a/security/seahorse/patches/patch-ah +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ah,v 1.1 2007/04/11 21:48:03 drochner Exp $ - ---- plugins/gedit/Makefile.in.orig 2006-05-03 18:35:46.000000000 +0200 -+++ plugins/gedit/Makefile.in -@@ -61,7 +61,7 @@ pluginLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(plugin_LTLIBRARIES) - am__DEPENDENCIES_1 = - libseahorse_pgp_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -- $(am__DEPENDENCIES_1) $(top_builddir)/libcryptui/libcryptui.la -+ $(am__DEPENDENCIES_1) - am__libseahorse_pgp_la_SOURCES_DIST = seahorse-gedit.c \ - seahorse-gedit.h seahorse-gedit-plugin.c \ - seahorse-gedit-bonobo.c -@@ -319,7 +319,7 @@ plugin_LTLIBRARIES = libseahorse-pgp.la - libseahorse_pgp_la_SOURCES = seahorse-gedit.c seahorse-gedit.h $(PLUGIN_SRCS) - libseahorse_pgp_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) - libseahorse_pgp_la_LIBADD = $(GEDIT_LIBS) $(LIBCRYPTUI_LIBS) \ -- $(top_builddir)/libcryptui/libcryptui.la -+ -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lcryptui - - plugin_in_files = seahorse-pgp.gedit-plugin.desktop.in - plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin) diff --git a/security/seahorse/patches/patch-ai b/security/seahorse/patches/patch-ai deleted file mode 100644 index d78664926e1..00000000000 --- a/security/seahorse/patches/patch-ai +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ai,v 1.1 2007/04/11 21:48:04 drochner Exp $ - ---- libseahorse/seahorse-ssh-operation.c.orig 2006-08-24 22:13:08.000000000 +0200 -+++ libseahorse/seahorse-ssh-operation.c -@@ -24,6 +24,7 @@ - #include - #include - #include -+#include - - #include "seahorse-ssh-operation.h" - #include "seahorse-util.h" diff --git a/security/seahorse/patches/patch-aj b/security/seahorse/patches/patch-aj deleted file mode 100644 index ad0d622dc90..00000000000 --- a/security/seahorse/patches/patch-aj +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aj,v 1.1 2007/11/05 19:49:05 drochner Exp $ - ---- plugins/epiphany/Makefile.in.orig 2007-04-18 21:42:58.000000000 +0200 -+++ plugins/epiphany/Makefile.in -@@ -61,7 +61,7 @@ extensionLTLIBRARIES_INSTALL = $(INSTALL - LTLIBRARIES = $(extension_LTLIBRARIES) - am__DEPENDENCIES_1 = - libseahorseextension_la_DEPENDENCIES = mozilla/libsbmozilla.la \ -- $(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1) -+ $(am__DEPENDENCIES_1) - am_libseahorseextension_la_OBJECTS = \ - libseahorseextension_la-seahorse-extension.lo \ - libseahorseextension_la-seahorse.lo -@@ -373,7 +373,7 @@ libseahorseextension_la_CFLAGS = \ - - libseahorseextension_la_LIBADD = \ - mozilla/libsbmozilla.la \ -- $(top_builddir)/libcryptui/libcryptui.la \ -+ -lcryptui \ - $(MOZILLA_COMPONENT_LIBS) - - libseahorseextension_la_LDFLAGS = \ -- cgit v1.2.3