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

[daniel at archlinux.org]

    Date: Monday, November 3, 2008 @ 14:02:34
  Author: daniel
Revision: 18293

Merged revisions 16857,18292 via svnmerge from 
svn+ssh://daniel@svn.archlinux.org/home/svn-packages/opera/trunk

........
  r16857 | daniel | 2008-10-22 19:53:34 +0200 (Wed, 22 Oct 2008) | 1 line
  
  upgpkg: opera 9.61-1
........
  r18292 | daniel | 2008-11-03 20:01:24 +0100 (Mon, 03 Nov 2008) | 1 line
  
  upgpkg: opera 9.62-1
........

Modified:
  opera/repos/extra-x86_64/	(properties)
  opera/repos/extra-x86_64/PKGBUILD
  opera/repos/extra-x86_64/opera-qt4-theme.patch

-----------------------+
 PKGBUILD              |   12 ++++++------
 opera-qt4-theme.patch |   25 ++++++++++---------------
 2 files changed, 16 insertions(+), 21 deletions(-)


Property changes on: opera/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /opera/trunk:1-16855
   + /opera/trunk:1-18292

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-03 19:01:24 UTC (rev 18292)
+++ extra-x86_64/PKGBUILD	2008-11-03 19:02:34 UTC (rev 18293)
@@ -3,7 +3,7 @@
 # Contributor: dorphell <dorphell at archlinux.org>
 
 pkgname=opera
-pkgver=9.61
+pkgver=9.62
 pkgrel=1
 pkgdesc="The Opera web browser"
 url="http://www.opera.com/"
@@ -11,21 +11,21 @@
 license=('custom:opera')
 arch=('i686' 'x86_64')
 source=(http://ftp.opera.com/pub/opera/linux/${pkgver/./}/final/en/i386/opera-${pkgver}.gcc4-qt4.i386.tar.bz2 opera.desktop opera_logo48.png opera-qt4-theme.patch)
-md5sums=('ef895e80f26915fdedc0c5eaee486009'
+md5sums=('d7018a3ddbb06e1dcad883a9c198563e'
          'f99bef1a9200abe5a5cda78665cddc84'
          'a270c65b8d4f8e2e76439f417ea44265'
-         '5dc264cf69f297c5c006c72872eab082')
+         'e977071ea5f09b36820367bf6e4dc3e1')
 
 [ "$CARCH" = "x86_64" ] && depends=('qt3')
 [ "$CARCH" = "x86_64" ] && source=(http://ftp.opera.com/pub/opera/linux/${pkgver/./}/final/en/x86_64/opera-${pkgver}.gcc4-shared-qt3.x86_64.tar.bz2 opera.desktop opera_logo48.png)
-[ "$CARCH" = "x86_64" ] &&  md5sums=('ab7d0fa42a1579d8dcf0f865f43e5504'
+[ "$CARCH" = "x86_64" ] && md5sums=('59385904f503e1ecdb36377051ba9f45'
          'f99bef1a9200abe5a5cda78665cddc84'
          'a270c65b8d4f8e2e76439f417ea44265')
 build() {
 if [ "$CARCH" = "x86_64" ]; then
-       cd ${startdir}/src/opera-${pkgver}-2456.gcc4-shared-qt3.x86_64
+       cd ${startdir}/src/opera-${pkgver}-2466.gcc4-shared-qt3.x86_64
        sed 's|/usr/X11R6/lib/mozilla/plugins=1|/usr/lib/mozilla/plugins=1|' -i usr/share/opera/ini/pluginpath.ini || return 1
-  else cd ${startdir}/src/opera-${pkgver}-2456.gcc4-qt4.i386
+  else cd ${startdir}/src/opera-${pkgver}-2466.gcc4-qt4.i386
        sed 's|/usr/X11R6/lib/mozilla/plugins=1|/usr/lib/mozilla/plugins=1|' -i usr/share/opera/ini/pluginpath.ini || return 1
 fi
    ./install.sh DESTDIR=${startdir}/pkg

Modified: extra-x86_64/opera-qt4-theme.patch
===================================================================
--- extra-x86_64/opera-qt4-theme.patch	2008-11-03 19:01:24 UTC (rev 18292)
+++ extra-x86_64/opera-qt4-theme.patch	2008-11-03 19:02:34 UTC (rev 18293)
@@ -1,16 +1,11 @@
---- opera.orig	2008-05-29 15:30:05.436910051 -0300
-+++ opera	2008-05-29 15:30:29.337109130 -0300
+--- opera.orig	2008-10-22 19:37:21.000000000 +0200
++++ opera	2008-10-22 19:38:13.000000000 +0200
 @@ -30,7 +30,7 @@
-  done
-    test -z "$toset" || die Missing parameter for $arg
-    
-    -test "${_QTSTYLE_FROM_CMDLINE_}" = 'NO' && test -f "$HOME/.qt/qtrc" &&  
-    _OPERA_QTSTYLE=`sed -n 's/^style=//p' $HOME/.qt/qtrc` && test  
-    "$_OPERA_QTSTYLE" && set -- "$@" -style "$_OPERA_QTSTYLE"
-    +test "${_QTSTYLE_FROM_CMDLINE_}" = 'NO' && test -f  
-    "$HOME/.config/Trolltech.conf" && _OPERA_QTSTYLE=`sed -n 's/^style=//p'  
-    $HOME/.config/Trolltech.conf` && test "$_OPERA_QTSTYLE" && set -- "$@"  
-    -style "$_OPERA_QTSTYLE"
-    
-    
-      # Add ending path divider "/" if missing, so execution won't fail
+ done
+ test -z "$toset" || die Missing parameter for $arg
+ 
+-test "${_QTSTYLE_FROM_CMDLINE_}" = 'NO' && test -f "$HOME/.qt/qtrc" && _OPERA_QTSTYLE=`sed -n 's/^style=//p' $HOME/.qt/qtrc` && test "$_OPERA_QTSTYLE" && set -- "$@" -style "$_OPERA_QTSTYLE"
++test "${_QTSTYLE_FROM_CMDLINE_}" = 'NO' && test -f "$HOME/.config/Trolltech.conf" && _OPERA_QTSTYLE=`sed -n 's/^style=//p' $HOME/.config/Trolltech.conf` && test "$_OPERA_QTSTYLE" && set -- "$@" -style "$_OPERA_QTSTYLE"
+ 
+ 
+ # Add ending path divider "/" if missing, so execution won't fail