[arch-commits] Commit in epiphany/trunk (3 files)

Jan de Groot jgc at archlinux.org
Thu Feb 17 08:41:43 UTC 2011


    Date: Thursday, February 17, 2011 @ 03:41:43
  Author: jgc
Revision: 110168

Update to 2.91.6
Remove introspection patch
Remove old gconf schemas if they exist. We do not depend on gconf because we assume that it is present when an older version is installed.

Modified:
  epiphany/trunk/PKGBUILD
  epiphany/trunk/epiphany.install
Deleted:
  epiphany/trunk/fix-introspection.patch

-------------------------+
 PKGBUILD                |   22 +++++++---------------
 epiphany.install        |   17 ++++++-----------
 fix-introspection.patch |   21 ---------------------
 3 files changed, 13 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-02-17 07:12:43 UTC (rev 110167)
+++ PKGBUILD	2011-02-17 08:41:43 UTC (rev 110168)
@@ -2,34 +2,26 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=epiphany
-pkgver=2.30.6
-pkgrel=2
+pkgver=2.91.6
+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.2.4' 'iso-codes>=3.10.1' 'desktop-file-utils' 'libxslt>=1.1.24' 'libnotify>=0.4.5' 'avahi>=0.6.27' 'libsoup-gnome>=2.32.0' 'nss>=3.12.8' 'ca-certificates' 'gconf>=2.32.0' 'gobject-introspection>=0.9.8')
-makedepends=('gnome-doc-utils>=0.20.1' 'pkgconfig' 'networkmanager' 'intltool' 'startup-notification' 'gnome-common')
+depends=('libsoup-gnome' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection')
+makedepends=('intltool' 'networkmanager' 'gnome-doc-utils' 'startup-notification')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
-        fix-introspection.patch)
-sha256sums=('278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc'
-            'fed862407db7d971aa759168f889e68e914c4e6d80d7768f3db549bc36bd8dbf')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('478b6afa8c8d7700de6bb1c70f0eb9c0a23035551670306cd2884f2feae25ada')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}/fix-introspection.patch"
-  autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --disable-scrollkeeper \
       --enable-network-manager
   make
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  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
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  make DESTDIR="${pkgdir}" install
 }

Modified: epiphany.install
===================================================================
--- epiphany.install	2011-02-17 07:12:43 UTC (rev 110167)
+++ epiphany.install	2011-02-17 08:41:43 UTC (rev 110168)
@@ -1,25 +1,20 @@
-pkgname=epiphany
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  glib-compile-schemas usr/share/glib-2.0/schemas
 
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+  if [ -f usr/share/gconf/schemas/epiphany.schemas ]; then
+    usr/sbin/gconfpkg --uninstall epiphany
+  fi
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }

Deleted: fix-introspection.patch
===================================================================
--- fix-introspection.patch	2011-02-17 07:12:43 UTC (rev 110167)
+++ fix-introspection.patch	2011-02-17 08:41:43 UTC (rev 110168)
@@ -1,21 +0,0 @@
-From 78b9eac0fca36e27c83c7678b18962ba286f041b Mon Sep 17 00:00:00 2001
-From: Vincent Untz <vuntz at gnome.org>
-Date: Fri, 01 Oct 2010 16:36:23 +0000
-Subject: introspection: Fix build by telling g-ir-scanner what the prefix is
-
-https://bugzilla.gnome.org/show_bug.cgi?id=631119
----
-diff --git a/src/Makefile.am b/src/Makefile.am
-index e9d3715..acbf8ff 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -350,6 +350,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILE
- 		--include=WebKit-1.0 \
- 		--program=./epiphany \
- 		--output $@ \
-+		--strip-prefix=Ephy \
- 		--pkg epiphany-$(EPIPHANY_API_VERSION) \
- 		-DEPIPHANY_COMPILATION \
- 		-I$(top_srcdir)/embed \
---
-cgit v0.8.3.1




More information about the arch-commits mailing list