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

[Jan de Groot]

    Date: Saturday, June 21, 2008 @ 19:05:31
  Author: jgc
Revision: 3298

Merged revisions 2586-3296 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/epiphany/trunk

........
  r3296 | jgc | 2008-06-21 23:03:41 +0000 (Sat, 21 Jun 2008) | 1 line
  
  upgpkg: epiphany 2.22.2-2
........

Added:
  epiphany/repos/extra-i686/98a_xul_b5_rc1_api_transition.patch
    (from rev 3296, epiphany/trunk/98a_xul_b5_rc1_api_transition.patch)
Modified:
  epiphany/repos/extra-i686/	(properties)
  epiphany/repos/extra-i686/PKGBUILD

-------------------------------------+
 98a_xul_b5_rc1_api_transition.patch |   47 ++++++++++++++++++++++++++++++++++
 PKGBUILD                            |   17 +++++++-----
 2 files changed, 57 insertions(+), 7 deletions(-)


Property changes on: epiphany/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /epiphany/trunk:1-2585
   + /epiphany/trunk:1-3296

Copied: epiphany/repos/extra-i686/98a_xul_b5_rc1_api_transition.patch (from rev 3296, epiphany/trunk/98a_xul_b5_rc1_api_transition.patch)
===================================================================
--- extra-i686/98a_xul_b5_rc1_api_transition.patch	                        (rev 0)
+++ extra-i686/98a_xul_b5_rc1_api_transition.patch	2008-06-21 23:05:31 UTC (rev 3298)
@@ -0,0 +1,47 @@
+---
+ embed/mozilla/ContentHandler.cpp |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+Index: epiphany-browser-2.22.1.1/embed/mozilla/ContentHandler.cpp
+===================================================================
+--- epiphany-browser-2.22.1.1.orig/embed/mozilla/ContentHandler.cpp
++++ epiphany-browser-2.22.1.1/embed/mozilla/ContentHandler.cpp
+@@ -124,34 +124,36 @@
+ }
+ 
+ /* nsILocalFile promptForSaveToFile (in nsISupports aWindowContext, in wstring aDefaultFile, in wstring aSuggestedFileExtension); */
+ NS_IMETHODIMP GContentHandler::PromptForSaveToFile(
+ 				    nsIHelperAppLauncher *aLauncher,			    
+ 				    nsISupports *aWindowContext,
+ 				    const PRUnichar *aDefaultFile,
+ 				    const PRUnichar *aSuggestedFileExtension,
++				    PRBool aForcePrompt,
+ 				    nsILocalFile **_retval)
+ {
+ 	EphyFileChooser *dialog;
+ 	int response;
+ 	char *filename = NULL;
+ 	nsCString defaultFile;
+ 
+ 	NS_UTF16ToCString (nsString (aDefaultFile),
+ 			   NS_CSTRING_ENCODING_UTF8, defaultFile);
+ 
+-	if (mAction != CONTENT_ACTION_SAVEAS)
++	if (!aForcePrompt &&
++	    mAction != CONTENT_ACTION_SAVEAS)
+ 	{
+ 		return BuildDownloadPath (defaultFile.get(), _retval);
+ 	}
+ 	nsCOMPtr<nsIDOMWindow> parentDOMWindow (do_GetInterface (aWindowContext));
+ 
+         AutoModalDialog modalDialog (parentDOMWindow, PR_FALSE);
+-        if (!modalDialog.ShouldShow ())
++        if (!aForcePrompt && !modalDialog.ShouldShow ())
+           return NS_ERROR_FAILURE;
+ 
+ 	GtkWindow *parentWindow = modalDialog.GetParent ();
+ 
+ 	dialog = ephy_file_chooser_new (_("Save"), GTK_WIDGET (parentWindow),
+ 					GTK_FILE_CHOOSER_ACTION_SAVE,
+ 					CONF_STATE_SAVE_DIR,
+ 					EPHY_FILE_FILTER_ALL);

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-06-21 23:04:01 UTC (rev 3297)
+++ extra-i686/PKGBUILD	2008-06-21 23:05:31 UTC (rev 3298)
@@ -3,31 +3,34 @@
 
 pkgname=epiphany
 pkgver=2.22.2
-pkgrel=1
+pkgrel=2
 install=epiphany.install
 pkgdesc="A GNOME2 web browser based on the mozilla rendering engine."
 arch=(i686 x86_64)
 license=('GPL')
-depends=('xulrunner>=1.8.1.14' 'gnome-desktop>=2.22.2' 'iso-codes>=2.0' 'desktop-file-utils' 'libxslt>=1.1.24' 'enchant>=1.4.2' 'libnotify>=0.4.4')
-makedepends=('perlxml' 'gnome-doc-utils>=0.12.2' 'gnome-python>=2.22.0' 'pkgconfig' 'libnetworkmanager>=0.6.6')
+depends=('xulrunner>=1.9' 'gnome-desktop>=2.22.2' 'iso-codes>=2.0' 'desktop-file-utils' 'libxslt>=1.1.24' 'enchant>=1.4.2' 'libnotify>=0.4.4')
+makedepends=('perlxml' 'gnome-doc-utils>=0.12.2' 'gnome-python>=2.22.' 'pkgconfig' 'libnetworkmanager>=0.6.6')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f90dc0a01dae58dfa393b17bce717d3c')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2
+	98a_xul_b5_rc1_api_transition.patch)
+md5sums=('f90dc0a01dae58dfa393b17bce717d3c'
+	 '29153a94a51024c8766df9f1f6b15213')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ${startdir}/src/98a_xul_b5_rc1_api_transition.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
         --localstatedir=/var \
         --enable-python \
   	--enable-certificate-manager \
 	--enable-dbus \
+        --with-gecko=libxul-embedding \
 	--disable-scrollkeeper \
-	--with-mozilla=xulrunner \
 	--enable-network-manager \
 	--enable-spell-checker || return 1
-  make LDFLAGS+="-R /usr/lib/xulrunner" || return 1
+  make || return 1
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
 
   install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas