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

[Jan de Groot]

    Date: Tuesday, July 8, 2008 @ 13:47:45
  Author: jgc
Revision: 4674

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

........
  r4673 | jgc | 2008-07-08 17:47:31 +0000 (Tue, 08 Jul 2008) | 1 line
  
  upgpkg: epiphany 2.22.3-1
........

Modified:
  epiphany/repos/extra-x86_64/	(properties)
  epiphany/repos/extra-x86_64/PKGBUILD
Deleted:
  epiphany/repos/extra-x86_64/98a_xul_b5_rc1_api_transition.patch

-------------------------------------+
 98a_xul_b5_rc1_api_transition.patch |   47 ----------------------------------
 PKGBUILD                            |   15 ++++------
 2 files changed, 6 insertions(+), 56 deletions(-)


Property changes on: epiphany/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /epiphany/trunk:1-3418
   + /epiphany/trunk:1-4673

Deleted: extra-x86_64/98a_xul_b5_rc1_api_transition.patch
===================================================================
--- extra-x86_64/98a_xul_b5_rc1_api_transition.patch	2008-07-08 17:47:31 UTC (rev 4673)
+++ extra-x86_64/98a_xul_b5_rc1_api_transition.patch	2008-07-08 17:47:45 UTC (rev 4674)
@@ -1,47 +0,0 @@
----
- 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-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-08 17:47:31 UTC (rev 4673)
+++ extra-x86_64/PKGBUILD	2008-07-08 17:47:45 UTC (rev 4674)
@@ -2,25 +2,22 @@
 # Maintainer: dale <dale at archlinux.org>
 
 pkgname=epiphany
-pkgver=2.22.2
-pkgrel=2
+pkgver=2.22.3
+pkgrel=1
 install=epiphany.install
 pkgdesc="A GNOME2 web browser based on the mozilla rendering engine."
 arch=(i686 x86_64)
 license=('GPL')
-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')
+depends=('xulrunner>=1.9' 'gnome-desktop>=2.22.3' '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.1' '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
-	98a_xul_b5_rc1_api_transition.patch)
-md5sums=('f90dc0a01dae58dfa393b17bce717d3c'
-	 '29153a94a51024c8766df9f1f6b15213')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.22/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('7d058b57cb3e992889e456848fcc89a9')
 
 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 \