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

[Pierre Schmitz]

    Date: Wednesday, July 16, 2008 @ 05:18:30
  Author: pierre
Revision: 5470

Merged revisions 2-5469 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/qscintilla/trunk

........
  r356 | aaron | 2008-04-18 22:56:27 +0000 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r5438 | douglas | 2008-07-16 01:19:35 +0000 (Wed, 16 Jul 2008) | 2 lines
  
  upgpkg: qscintilla 2.2-1
      Updated for i686: 2.2
........

Added:
  qscintilla/repos/extra-x86_64/ChangeLog
    (from rev 5438, qscintilla/trunk/ChangeLog)
Modified:
  qscintilla/repos/extra-x86_64/	(properties)
  qscintilla/repos/extra-x86_64/PKGBUILD

-----------+
 ChangeLog |    5 +++++
 PKGBUILD  |   27 ++++++++++++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)


Property changes on: qscintilla/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /qscintilla/trunk:1
   + /qscintilla/trunk:1-5469

Copied: qscintilla/repos/extra-x86_64/ChangeLog (from rev 5438, qscintilla/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog	                        (rev 0)
+++ extra-x86_64/ChangeLog	2008-07-16 09:18:30 UTC (rev 5470)
@@ -0,0 +1,5 @@
+
+2008-07-06  Douglas Soares de Andrade  <douglas at archlinux.org>
+
+	* Updated for i686: 2.2
+

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-16 09:16:15 UTC (rev 5469)
+++ extra-x86_64/PKGBUILD	2008-07-16 09:18:30 UTC (rev 5470)
@@ -4,8 +4,8 @@
 # Bug #8577 Modifications made by DaNiMoTh <jjdanimoth.aur at gmail.com>
 
 pkgname=qscintilla
-pkgver=2.1
-pkgrel=3
+pkgver=2.2
+pkgrel=1
 license=('GPL')
 pkgdesc="QScintilla2 is a port to Qt4 of Neil Hodgson's Scintilla C++ editor class."
 arch=('i686' 'x86_64')
@@ -14,24 +14,21 @@
 provides=('qscintilla2')
 conflicts=('qscintilla2')
 replaces=('qscintilla2')
-source=(http://www.riverbankcomputing.com/Downloads/QScintilla2/QScintilla-1.73-gpl-$pkgver.tar.gz)
+source=(http://riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-$pkgver.tar.gz)
 
-md5sums=('13049717628391ca4db43f7ede0eeeb4')
+md5sums=('a6056c444494f3f849020d241f86c286')
 
 build() {
-  	cd $startdir/src/QScintilla-1.73-gpl-$pkgver/Qt4
+  	cd $startdir/src/QScintilla-gpl-$pkgver/Qt4
   	sed -i "s|DESTDIR = .*|DESTDIR = $startdir/pkg/usr/lib|g" qscintilla.pro
   	sed -i "s|header.path = .*|header.path = $startdir/pkg/usr/include|g" qscintilla.pro
   	sed -i "s|trans.path = .*|trans.path = $startdir/pkg/usr/share/qt/translations|g" qscintilla.pro
     sed -i "s|qsci.path = .*|qsci.path = $startdir/pkg/usr/share/qt/translations|g" qscintilla.pro
+
     qmake qscintilla.pro
     sed -i 's|$(MOVE) $(TARGET)|$(COPY) $(TARGET)|g' Makefile
     make || return 1
     make DESTDIR=$startdir/pkg install
-    rm -rf $startdir/pkg/usr/lib/libqscintilla2.so.2 
-    pushd $startdir/pkg/usr/lib/
-    ln -s libqscintilla2.so.2.2 libqscintilla2.so.2
-    popd
     
     cd ../designer-Qt4
 
@@ -43,4 +40,16 @@
     qmake designer.pro
     make || return 1
     cp libqscintillaplugin.so $startdir/pkg/usr/lib/qt/plugins/designer/
+
+    msg "Installing the libs to the right place"
+
+    cd ../Qt4
+
+    cp libqscintilla2.so.3.0.0 $startdir/pkg/usr/lib/
+
+    pushd $startdir/pkg/usr/lib/
+        ln -s libqscintilla2.so.3.0.0 libqscintilla2.so
+        ln -s libqscintilla2.so.3.0.0 libqscintilla2.so.3
+        ln -s libqscintilla2.so.3.0.0 libqscintilla2.so.3.0
+    popd
 }