rpms/seahorse-plugins/devel epiphany-2.26.patch, NONE, 1.1 seahorse-plugins.spec, 1.19, 1.20 epiphany-2.23.patch, 1.1, NONE gettext-domain.patch, 1.1, NONE
Matthias Clasen
mclasen at fedoraproject.org
Fri Feb 27 05:27:43 UTC 2009
Author: mclasen
Update of /cvs/pkgs/rpms/seahorse-plugins/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17472
Modified Files:
seahorse-plugins.spec
Added Files:
epiphany-2.26.patch
Removed Files:
epiphany-2.23.patch gettext-domain.patch
Log Message:
fix the build
epiphany-2.26.patch:
--- NEW FILE epiphany-2.26.patch ---
--- seahorse-plugins/plugins/epiphany/seahorse-extension.c 2009/02/03 18:41:47 2759
+++ seahorse-plugins/plugins/epiphany/seahorse-extension.c 2009/02/04 18:19:05 2760
@@ -603,44 +603,22 @@
}
-#if EPHY_NOTAB == 1
static void
impl_attach_tab (EphyExtension *extension,
EphyWindow *window,
EphyEmbed *embed)
{
-#else
-static void
-impl_attach_tab (EphyExtension *extension,
- EphyWindow *window,
- EphyTab *tab)
-{
- EphyEmbed *embed;
-
- embed = ephy_tab_get_embed (tab);
-#endif
g_return_if_fail (EPHY_IS_EMBED (embed));
g_signal_connect (embed, "ge_context_menu",
G_CALLBACK (context_menu_cb), window);
}
-#if EPHY_NOTAB == 1
static void
impl_detach_tab (EphyExtension *extension,
EphyWindow *window,
EphyEmbed *embed)
{
-#else
-static void
-impl_detach_tab (EphyExtension *extension,
- EphyWindow *window,
- EphyTab *tab)
-{
- EphyEmbed *embed;
-
- embed = ephy_tab_get_embed (tab);
-#endif
g_return_if_fail (EPHY_IS_EMBED (embed));
g_signal_handlers_disconnect_by_func
--- seahorse-plugins/configure.in 2009/02/03 18:41:47 2759
+++ seahorse-plugins/configure.in 2009/02/04 18:19:05 2760
@@ -5,7 +5,7 @@
dnl ****************************************************************************
dnl MAIN SEAHORSE VERSION (update after release)
-AC_INIT(seahorse-plugins, 2.25.90)
+AC_INIT(seahorse-plugins, 2.25.91)
dnl ****************************************************************************
@@ -284,8 +284,7 @@
with_epiphany_plugin="no"
-EPIPHANY_API_VERSION=2.14
-EPIPHANY_REQUIRED=2.14.0
+EPIPHANY_REQUIRED=2.24.0
EPIPHANY_LIBXML_REQUIRED=2.6.0
EPIPHANY_LIBGLIB_REQUIRED=2.10.0
EPIPHANY_LIBGTK_REQUIRED=2.8.0
@@ -339,63 +338,28 @@
*firefox) min_version=1.5 ;;
*) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
esac
+
+AC_MSG_CHECKING([for Epiphany API version])
+apis="2.26 2.25 2.24"
+epiphany_api_version=
+for api in $apis; do
+ PKG_CHECK_EXISTS([epiphany-$api],[epiphany_api_version=$api; break],[])
+done
+AC_MSG_RESULT([$epiphany_api_version])
+
+if test -z "$epiphany_api_version"; then
+ AC_MSG_ERROR([epiphany not found])
+fi
- PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.24 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.24 e_api_minor=24],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.23 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.23 e_api_minor=23],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.22 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.22 e_api_minor=22],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.20 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.20 e_api_minor=20],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.18 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.18 e_api_minor=18],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY],[\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.16 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.16 e_api_minor=16],
- [PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY],[\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
- glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
- gmodule-2.0 \
- gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
- epiphany-2.14 >= $EPIPHANY_REQUIRED],
- [with_epiphany_plugin=yes E_API_VERSION=2.14 e_api_minor=14],[with_epiphany_plugin=no; echo "no"; echo "disabling epiphany plugin"])])])])])])])
+ PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
+ libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
+ libglade-2.0 \
+ glib-2.0 >= $EPIPHANY_LIBGLIB_REQUIRED \
+ gmodule-2.0 \
+ gtk+-2.0 >= $EPIPHANY_LIBGTK_REQUIRED \
+ epiphany-$epiphany_api_version >= $EPIPHANY_REQUIRED],
+ [with_epiphany_plugin=yes E_API_VERSION=$epiphany_api_version],
+ [with_epiphany_plugin=no; echo "no"; echo "disabling epiphany plugin"])
else
echo "disabling epiphany plugin"
fi
@@ -415,12 +379,6 @@
if test "$with_epiphany_plugin" = "yes"; then
echo "enabling epiphany plugin"
- if test "$e_api_minor" -ge 21; then
- AC_DEFINE([EPHY_NOTAB], 1, [Defines whether EphyTab exists in the API])
- else
- AC_DEFINE([EPHY_NOTAB], 0, [Defines whether EphyTab exists in the API])
- fi
-
EPIPHANY_EXTENSION_INIT([$E_API_VERSION], [$EPIPHANY_REQUIRED])
AC_SUBST([E_API_VERSION])
Index: seahorse-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/seahorse-plugins/devel/seahorse-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- seahorse-plugins.spec 26 Feb 2009 20:56:27 -0000 1.19
+++ seahorse-plugins.spec 27 Feb 2009 05:27:13 -0000 1.20
@@ -1,6 +1,6 @@
Name: seahorse-plugins
Version: 2.25.90
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Plugins and utilities for encryption in GNOME
Group: User Interface/Desktops
License: GPLv2+ and GFDL
@@ -53,6 +53,8 @@
Requires(postun): shared-mime-info
Requires(postun): GConf2
+Patch0: epiphany-2.26.patch
+
%description
The plugins and utilities in this package integrate seahorse into
the GNOME desktop environment and allow users to perform operations
@@ -60,8 +62,9 @@
%prep
%setup -q
+%patch0 -p1 -b .epiphany
-autoreconf
+autoreconf -i -f
# cleanup permissions for files that go into debuginfo
find . -type f -name "*.c" -exec chmod a-x {} ';'
--- epiphany-2.23.patch DELETED ---
--- gettext-domain.patch DELETED ---
More information about the scm-commits
mailing list