Date: Sunday, February 21, 2010 @ 08:30:57 Author: jgc Revision: 69606
Fix bug 18375 Added: epiphany/repos/extra-i686/PKGBUILD (from rev 69605, epiphany/repos/extra-x86_64/PKGBUILD) epiphany/repos/extra-i686/bug605860.patch (from rev 69605, epiphany/repos/extra-x86_64/bug605860.patch) Deleted: epiphany/repos/extra-i686/PKGBUILD -----------------+ PKGBUILD | 71 ++++++++++++++++++++++++++++-------------------------- bug605860.patch | 25 +++++++++++++++++++ 2 files changed, 62 insertions(+), 34 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2010-02-21 13:27:07 UTC (rev 69605) +++ PKGBUILD 2010-02-21 13:30:57 UTC (rev 69606) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@archlinux.org> - -pkgname=epiphany -pkgver=2.28.2 -pkgrel=1 -install=epiphany.install -pkgdesc="A GNOME2 web browser based on the WebKit rendering engine." -arch=(i686 x86_64) -license=('GPL') -depends=('libwebkit>=1.1.15.4-2' 'startup-notification>=0.10' 'iso-codes>=3.10.1' 'desktop-file-utils' 'libxslt>=1.1.24' 'libnotify>=0.4.5' 'avahi>=0.6.25' 'libsoup-gnome>=2.28.2') -makedepends=('gnome-doc-utils>=0.18.0' 'pkgconfig' 'networkmanager' 'intltool') -options=('!libtool' '!emptydirs') -groups=('gnome') -url="http://www.gnome.org/projects/epiphany/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2 - ephy-download-mime.patch) -sha256sums=('98b7a60bb42fa5c8ebdec1bf623319ae730e5674ddbcfaf51649093adb079490' - '3e8a13d14afd5fb16486fffbafdd8bc47b117d948e13870712bd067586133728') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/ephy-download-mime.patch" || return 1 - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-scrollkeeper \ - --enable-network-manager || return 1 - make || return 1 - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain epiphany ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} Copied: epiphany/repos/extra-i686/PKGBUILD (from rev 69605, epiphany/repos/extra-x86_64/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2010-02-21 13:30:57 UTC (rev 69606) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> + +pkgname=epiphany +pkgver=2.28.2 +pkgrel=2 +install=epiphany.install +pkgdesc="A GNOME2 web browser based on the WebKit rendering engine." +arch=(i686 x86_64) +license=('GPL') +depends=('libwebkit>=1.1.15.4-2' 'startup-notification>=0.10' 'iso-codes>=3.10.1' 'desktop-file-utils' 'libxslt>=1.1.24' 'libnotify>=0.4.5' 'avahi>=0.6.25' 'libsoup-gnome>=2.28.2') +makedepends=('gnome-doc-utils>=0.18.0' 'pkgconfig' 'networkmanager' 'intltool') +options=('!libtool' '!emptydirs') +groups=('gnome') +url="http://www.gnome.org/projects/epiphany/" +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2 + ephy-download-mime.patch + bug605860.patch) +sha256sums=('98b7a60bb42fa5c8ebdec1bf623319ae730e5674ddbcfaf51649093adb079490' + '3e8a13d14afd5fb16486fffbafdd8bc47b117d948e13870712bd067586133728' + '52bb77728780eaa8998b769d84beb89f97cb4476db265b7c38a1c2e6c548a4a3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/ephy-download-mime.patch" || return 1 + patch -Np1 -i "${srcdir}/bug605860.patch" || return 1 + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-scrollkeeper \ + --enable-network-manager || return 1 + make || return 1 + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1 + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain epiphany ${pkgdir}/etc/gconf/schemas/*.schemas || return 1 + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} Copied: epiphany/repos/extra-i686/bug605860.patch (from rev 69605, epiphany/repos/extra-x86_64/bug605860.patch) =================================================================== --- bug605860.patch (rev 0) +++ bug605860.patch 2010-02-21 13:30:57 UTC (rev 69606) @@ -0,0 +1,25 @@ +From 7ba0a952949410eeb2b0ae81427d31697bbd7886 Mon Sep 17 00:00:00 2001 +From: Diego Escalante Urrelo <descala...@igalia.com> +Date: Wed, 13 Jan 2010 23:43:58 +0000 +Subject: Use g_mkdir_with_parents instead of just mkdir + +This ensures that if .gnome2/ doesn't exist, we don't fail instead of just +creating the dir. + +Bug #605860 +--- +diff --git a/lib/ephy-file-helpers.c b/lib/ephy-file-helpers.c +index 8777c96..271d362 100644 +--- a/lib/ephy-file-helpers.c ++++ b/lib/ephy-file-helpers.c +@@ -372,7 +372,7 @@ ephy_ensure_dir_exists (const char *dir, + } + + if (!g_file_test (dir, G_FILE_TEST_EXISTS) && +- mkdir (dir, 488) != 0) ++ g_mkdir_with_parents (dir, 488) != 0) + { + g_set_error (error, + EPHY_FILE_HELPERS_ERROR_QUARK, +-- +cgit v0.8.3.1