[arch-commits] Commit in seahorse/trunk (09_xul1.9.patch PKGBUILD)
Jan de Groot
jgc at archlinux.org
Sat Oct 11 18:15:38 UTC 2008
Date: Saturday, October 11, 2008 @ 14:15:37
Author: jgc
Revision: 14937
upgpkg: seahorse 2.24.0-1
Modified:
seahorse/trunk/PKGBUILD
Deleted:
seahorse/trunk/09_xul1.9.patch
-----------------+
09_xul1.9.patch | 189 ------------------------------------------------------
PKGBUILD | 23 ++----
2 files changed, 10 insertions(+), 202 deletions(-)
Deleted: 09_xul1.9.patch
===================================================================
--- 09_xul1.9.patch 2008-10-11 18:09:54 UTC (rev 14936)
+++ 09_xul1.9.patch 2008-10-11 18:15:37 UTC (rev 14937)
@@ -1,189 +0,0 @@
----
- configure.in | 7 +++++++
- m4/gecko.m4 | 31 ++++++++++++++++++++++++++++---
- 2 files changed, 35 insertions(+), 3 deletions(-)
-
-Index: seahorse-2.21.91/m4/gecko.m4
-===================================================================
---- seahorse-2.21.91.orig/m4/gecko.m4
-+++ seahorse-2.21.91/m4/gecko.m4
-@@ -46,31 +46,34 @@
-
- # ************************
- # Check which gecko to use
- # ************************
-
- AC_MSG_CHECKING([which gecko to use])
-
- AC_ARG_WITH([gecko],
-- AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner@:>@],
-+ AS_HELP_STRING([--with-gecko@<:@=mozilla|firefox|seamonkey|xulrunner|libxul-unstable@:>@],
- [Which gecko engine to use (autodetected by default)]))
-
- # Backward compat
- AC_ARG_WITH([mozilla],[],[with_gecko=$withval],[])
-
- gecko_cv_gecko=$with_gecko
-
- # Autodetect gecko
--_geckos="firefox mozilla-firefox seamonkey mozilla xulrunner"
-+_geckos="firefox mozilla-firefox seamonkey mozilla xulrunner libxul-unstable"
- if test -z "$gecko_cv_gecko"; then
- for lizard in $_geckos; do
- if $PKG_CONFIG --exists $lizard-xpcom; then
- gecko_cv_gecko=$lizard
- break;
-+ elif $PKG_CONFIG --exists $lizard; then
-+ gecko_cv_gecko=$lizard
-+ break;
- fi
- done
- fi
-
- AC_MSG_RESULT([$gecko_cv_gecko])
-
- if test "x$gecko_cv_gecko" = "x"; then
- ifelse([$3],,[AC_MSG_ERROR([No gecko found; you may need to adjust PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package])],[$3])
-@@ -88,21 +91,28 @@
-
- if test "$gecko_cv_have_gecko" = "yes"; then
-
- case "$gecko_cv_gecko" in
- mozilla) gecko_cv_gecko_flavour=mozilla ;;
- seamonkey) gecko_cv_gecko_flavour=mozilla ;;
- *firefox) gecko_cv_gecko_flavour=toolkit ;;
- xulrunner) gecko_cv_gecko_flavour=toolkit ;;
-+libxul*) gecko_cv_gecko_flavour=toolkit ;;
- esac
-
-+if test $gecko_cv_gecko = libxul-unstable; then
-+_GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
-+_GECKO_HOME=""
-+_GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}`"
-+else
- _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}-xpcom`"
- _GECKO_HOME="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
- _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
-+fi
-
- fi # if gecko_cv_have_gecko
-
- if test "$gecko_cv_gecko_flavour" = "toolkit"; then
- AC_DEFINE([HAVE_MOZILLA_TOOLKIT],[1],[Define if mozilla is of the toolkit flavour])
- fi
-
- AM_CONDITIONAL([HAVE_MOZILLA_TOOLKIT],[test "$gecko_cv_gecko_flavour" = "toolkit"])
-@@ -349,27 +359,34 @@
- fi
-
- AC_LANG_PUSH([C++])
-
- _SAVE_CPPFLAGS="$CPPFLAGS"
- _SAVE_CXXFLAGS="$CXXFLAGS"
- _SAVE_LDFLAGS="$LDFLAGS"
- _SAVE_LIBS="$LIBS"
-+if test $gecko_cv_gecko = libxul-unstable; then
-+CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko})"
-+CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko})"
-+LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS"
-+LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko})"
-+else
- CPPFLAGS="$CPPFLAGS $_GECKO_EXTRA_CPPFLAGS -I$_GECKO_INCLUDE_ROOT $($PKG_CONFIG --cflags-only-I ${gecko_cv_gecko}-xpcom)"
- CXXFLAGS="$CXXFLAGS $_GECKO_EXTRA_CXXFLAGS $($PKG_CONFIG --cflags-only-other ${gecko_cv_gecko}-xpcom)"
- LDFLAGS="$LDFLAGS $_GECKO_EXTRA_LDFLAGS -Wl,--rpath=$_GECKO_HOME"
- LIBS="$LIBS $($PKG_CONFIG --libs ${gecko_cv_gecko}-xpcom)"
-+fi
-
- _GECKO_DISPATCH_INCLUDEDIRS="$2"
-
- # Sigh Gentoo has a rubbish header layout
- # http://bugs.gentoo.org/show_bug.cgi?id=100804
- # Mind you, it's useful to be able to test against uninstalled mozilla builds...
--_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref"
-+_GECKO_DISPATCH_INCLUDEDIRS="$_GECKO_DISPATCH_INCLUDEDIRS dom necko pref unstable"
-
- # Now add them to CPPFLAGS
- for i in $_GECKO_DISPATCH_INCLUDEDIRS; do
- CPPFLAGS="$CPPFLAGS -I$_GECKO_INCLUDE_ROOT/$i"
- done
-
- m4_indir([$1],m4_shiftn(2,$@))
-
-@@ -585,21 +602,29 @@
- #
- # Variables set:
- # XPIDL: the xpidl program
- # XPIDL_IDLDIR: the xpidl include directory
-
- AC_DEFUN([GECKO_XPIDL],
- [AC_REQUIRE([GECKO_INIT])dnl
-
-+if test $gecko_cv_gecko = libxul-unstable; then
-+_GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
-+else
- _GECKO_LIBDIR="`$PKG_CONFIG --variable=libdir ${gecko_cv_gecko}-xpcom`"
-+fi
-
- AC_PATH_PROG([XPIDL],[xpidl],[no],[$_GECKO_LIBDIR:$PATH])
-
-+if test $gecko_cv_gecko = libxul-unstable; then
-+XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}`/unstable"
-+else
- XPIDL_IDLDIR="`$PKG_CONFIG --variable=idldir ${gecko_cv_gecko}-xpcom`"
-+fi
-
- # Older geckos don't have this variable, see
- # https://bugzilla.mozilla.org/show_bug.cgi?id=240473
-
- if test -z "$XPIDL_IDLDIR" -o ! -f "$XPIDL_IDLDIR/nsISupports.idl"; then
- XPIDL_IDLDIR="`echo $_GECKO_LIBDIR | sed -e s!lib!share/idl!`"
- fi
-
-Index: seahorse-2.21.91/configure.in
-===================================================================
---- seahorse-2.21.91.orig/configure.in
-+++ seahorse-2.21.91/configure.in
-@@ -505,16 +505,17 @@
- if test "$with_epiphany_plugin" = "yes"; then
- AC_SUBST([MOZILLA])
- AC_SUBST([MOZILLA_FLAVOUR])
- AC_SUBST([MOZILLA_HOME])
- AC_SUBST([MOZILLA_PREFIX])
- AC_SUBST([MOZILLA_INCLUDE_ROOT])
-
- case "$MOZILLA" in
-+ libxul-unstable) min_version=1.9 ;;
- xulrunner) min_version=1.8 ;;
- *firefox) min_version=1.5 ;;
- *) AC_MSG_ERROR([Unsupported gecko "$gecko_cv_gecko"]) ;;
- esac
-
- PKG_CHECK_MODULES([EPIPHANY_DEPENDENCY], [\
- libxml-2.0 >= $EPIPHANY_LIBXML_REQUIRED \
- libglade-2.0 \
-@@ -587,19 +588,25 @@
- 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"])])])])])])])])])
- else
- echo "disabling epiphany plugin"
- fi
-
- if test "$with_epiphany_plugin" = "yes"; then
-+ if test $gecko_cv_gecko = libxul-unstable; then
-+ PKG_CHECK_MODULES([MOZILLA_COMPONENT],
-+ [${gecko_cv_gecko} >= $min_version $gecko_cv_extra_pkg_dependencies],
-+ [with_epiphany_plugin=yes],[with_epiphany_plugin=no echo "disabling epiphany plugin"])
-+ else
- PKG_CHECK_MODULES([MOZILLA_COMPONENT],
- [${gecko_cv_gecko}-xpcom >= $min_version $gecko_cv_extra_pkg_dependencies],
- [with_epiphany_plugin=yes],[with_epiphany_plugin=no echo "disabling epiphany plugin"])
-+ fi
- fi
-
- 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
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-10-11 18:09:54 UTC (rev 14936)
+++ PKGBUILD 2008-10-11 18:15:37 UTC (rev 14937)
@@ -3,26 +3,23 @@
# Contributor: Michel Brabants <michel.linux at tiscali.be>
pkgname=seahorse
-pkgver=2.22.3
+pkgver=2.24.0
pkgrel=1
pkgdesc="GNOME application for managing PGP keys."
arch=(i686 x86_64)
license=('GPL')
url="http://seahorse.sourceforge.net/"
-depends=('libgnomeui>=2.22.1' 'libnotify>=0.4.4' 'libsoup>=2.4.1' 'gpgme' 'desktop-file-utils' 'zip')
-makedepends=('gettext' 'libldap' 'perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'nautilus>=2.22.4' 'epiphany>=2.22.2' 'gnome-panel>=2.22.2' 'gedit>=2.22.3' 'xulrunner>=1.9')
+depends=('gnome-keyring>=2.24.0' 'libglade>=2.6.3' 'avahi>=0.6.23' 'libnotify>=0.4.4' 'libsoup>=2.24.0' 'gpgme' 'desktop-file-utils' 'zip')
+makedepends=('gettext' 'libldap' 'perlxml' 'pkgconfig' 'gnome-doc-utils>=0.14.0' 'nautilus>=2.24.0' 'epiphany>=2.24.0' 'gnome-panel>=2.24.0' 'gedit>=2.24.0' 'xulrunner>=1.9.0.3')
options=('!libtool' '!emptydirs')
groups=('gnome-extra')
replaces=('gnome-keyring-manager')
install=seahorse.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.22/seahorse-${pkgver}.tar.bz2
- 09_xul1.9.patch)
-md5sums=('7fdab30dbf8684881199e15246c3765a' '5c9265042821fa3e481c6cc31c3c849a')
+source=(http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.24/seahorse-${pkgver}.tar.bz2)
+md5sums=('e8a7836c63b3a6f5b6c1311c86b7520b')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
- patch -Np1 -i ${startdir}/src/09_xul1.9.patch || return 1
- autoconf || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--enable-ldap --enable-hkp \
@@ -31,9 +28,9 @@
--with-gecko=libxul-unstable \
--disable-scrollkeeper --disable-update-mime-database || return 1
make || return 1
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
- install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
- gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
- rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+ install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+ rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
}
More information about the arch-commits
mailing list