[arch-commits] Commit in qt/repos (6 files)

Sat May 31 11:22:08 UTC 2008

Date: Saturday, May 31, 2008 @ 07:22:08
  Author: pierre
Revision: 2308

Merged revisions 2215-2307 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/qt/trunk

........
  r2217 | pierre | 2008-05-29 13:09:45 +0000 (Do, 29 Mai 2008) | 1 line
  
  removed unused files
........
  r2307 | pierre | 2008-05-31 11:21:34 +0000 (Sa, 31 Mai 2008) | 2 lines
  
  upgpkg: qt 4.4.0-3
      added qt-copy-patches from KDE
........

Modified:
  qt/repos/testing-x86_64/	(properties)
  qt/repos/testing-x86_64/PKGBUILD
Deleted:
  qt/repos/testing-x86_64/qt.install
  qt/repos/testing-x86_64/qt4-assistant.desktop
  qt/repos/testing-x86_64/qt4-designer.desktop
  qt/repos/testing-x86_64/qt4-linguist.desktop

-----------------------+
 PKGBUILD              |   26 ++++++++++++++++----------
 qt.install            |   24 ------------------------
 qt4-assistant.desktop |   10 ----------
 qt4-designer.desktop  |   11 -----------
 qt4-linguist.desktop  |   11 -----------
 5 files changed, 16 insertions(+), 66 deletions(-)


Property changes on: qt/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /qt/trunk:1-2214
   + /qt/trunk:1-2307

Modified: testing-x86_64/PKGBUILD
===================================================================

--- testing-x86_64/PKGBUILD	2008-05-31 11:21:34 UTC (rev 2307)
+++ testing-x86_64/PKGBUILD	2008-05-31 11:22:08 UTC (rev 2308)
@@ -2,7 +2,7 @@
 
 pkgname=qt
 pkgver=4.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="The QT gui toolkit."
 arch=('i686' 'x86_64')
 url="http://www.trolltech.com/products/qt"
@@ -15,16 +15,22 @@
 replaces=('qt4')
 conflicts=('qt4')
 _pkgfqn=qt-x11-opensource-src-$pkgver
-source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.gz")
-md5sums=('f13ad0aa75efad314715930e663bad55')
+# svn export svn://anonsvn.kde.org/home/kde/trunk/qt-copy/patches/ qt-copy-patches
+source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.gz" 'ftp://ftp.archlinux.org/other/qt/qt-copy-patches-814804.tar.bz2')
+md5sums=('f13ad0aa75efad314715930e663bad55' '3342aa7114bda3cb814cbf5ca8d4cb91')
 
 build() {
 	unset QMAKESPEC
-	export QT4DIR=$startdir/src/$_pkgfqn
+	export QT4DIR=$srcdir/$_pkgfqn
 	export PATH=${QT4DIR}/bin:${PATH}
 	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-	cd $startdir/src/$_pkgfqn
 
+	cd $srcdir/$_pkgfqn
+	for i in $srcdir/qt-copy-patches/*.diff; do
+		echo "applying $i"
+		patch -p0 -i $i || return 1
+	done
+
 	# remove unwanted mkspecs
 	cd mkspecs/
 	find . -maxdepth 1 -regextype posix-egrep -type d ! -regex "./linux.*|./common|./features|./qws" -exec rm -rf "{}" \;
@@ -54,11 +60,11 @@
 		-optimized-qmake || return 1
 
 	make || return 1
-	make INSTALL_ROOT=$startdir/pkg install || return 1
+	make INSTALL_ROOT=$pkgdir install || return 1
 
 	# lots of cleanup and path fixes - thanks to crazy (frugalware)
-	find $startdir/pkg/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
-	sed -i -e "s|-L$startdir/src/${_pkgfqn}/lib||g" $startdir/pkg/usr/lib/pkgconfig/*.pc
-	sed -i -e "s|$startdir/src/${_pkgfqn}/bin/moc|/usr/bin/moc|g" $startdir/pkg/usr/lib/pkgconfig/*.pc
-	sed -i -e "s|$startdir/src/${_pkgfqn}/bin/uic|/usr/bin/uic|g" $startdir/pkg/usr/lib/pkgconfig/*.pc
+	find $pkgdir/usr/lib -type f -name '*prl' -print -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \;
+	sed -i -e "s|-L$srcdir/${_pkgfqn}/lib||g" $pkgdir/usr/lib/pkgconfig/*.pc
+	sed -i -e "s|$srcdir/${_pkgfqn}/bin/moc|/usr/bin/moc|g" $pkgdir/usr/lib/pkgconfig/*.pc
+	sed -i -e "s|$srcdir/${_pkgfqn}/bin/uic|/usr/bin/uic|g" $pkgdir/usr/lib/pkgconfig/*.pc
 }
\ No newline at end of file

Deleted: testing-x86_64/qt.install
===================================================================
--- testing-x86_64/qt.install	2008-05-31 11:21:34 UTC (rev 2307)
+++ testing-x86_64/qt.install	2008-05-31 11:22:08 UTC (rev 2308)
@@ -1,24 +0,0 @@
-post_install() {
-  if ! [ `grep '/opt/qt/lib' etc/ld.so.conf` ]; then
-    echo "/opt/qt/lib" >>etc/ld.so.conf
-    sbin/ldconfig -r .
-  fi
-  echo "INFORMATION:"
-  echo "Documentation is seperated it's called qt-doc"
-}
-
-post_upgrade() {
-  /bin/true
-}
-
-pre_remove() {
-  cat etc/ld.so.conf | grep -v '/opt/qt/lib' >/tmp/.pacqt
-  mv /tmp/.pacqt etc/ld.so.conf
-  chmod 644 etc/ld.so.conf
-  sbin/ldconfig -r .
-}
-
-op=$1
-shift
-
-$op $*

Deleted: testing-x86_64/qt4-assistant.desktop
===================================================================
--- testing-x86_64/qt4-assistant.desktop	2008-05-31 11:21:34 UTC (rev 2307)
+++ testing-x86_64/qt4-assistant.desktop	2008-05-31 11:22:08 UTC (rev 2308)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/assistant
-Name=Qt 4 Assistant
-GenericName=Qt4 Document Browser
-X-KDE-StartupNotify=true
-Icon=assistant
-Terminal=false
-Type=Application
-Categories=Qt;Development;Documentation

Deleted: testing-x86_64/qt4-designer.desktop
===================================================================
--- testing-x86_64/qt4-designer.desktop	2008-05-31 11:21:34 UTC (rev 2307)
+++ testing-x86_64/qt4-designer.desktop	2008-05-31 11:22:08 UTC (rev 2308)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/designer
-Name=Qt 4 Designer
-GenericName=Interface Designer
-X-KDE-StartupNotify=true
-MimeType=application/x-designer
-Icon=designer
-Terminal=false
-Type=Application
-Categories=Qt;Development;GUIDesigner

Deleted: testing-x86_64/qt4-linguist.desktop
===================================================================
--- testing-x86_64/qt4-linguist.desktop	2008-05-31 11:21:34 UTC (rev 2307)
+++ testing-x86_64/qt4-linguist.desktop	2008-05-31 11:22:08 UTC (rev 2308)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/linguist
-Name=Qt 4 Linguist
-GenericName=Translation Tool
-X-KDE-StartupNotify=true
-MimeType=application/x-linguist
-Terminal=false
-Type=Application
-Icon=linguist
-Categories=Qt;Development;Translation



