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

Pierre Schmitz pierre at archlinux.org
Sat May 31 19:15:01 UTC 2008 

    Date: Saturday, May 31, 2008 @ 15:15:01
  Author: pierre
Revision: 2311

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

........
  r2213 | pierre | 2008-05-29 13:08:34 +0000 (Do, 29 Mai 2008) | 2 lines
  
  upgpkg: qt 4.4.0-2
      cleanup; disabled phonon (will be provided by kdelibs-4)
........
  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-i686/	(properties)
  qt/repos/testing-i686/PKGBUILD
Deleted:
  qt/repos/testing-i686/qt.install
  qt/repos/testing-i686/qt4-assistant.desktop
  qt/repos/testing-i686/qt4-designer.desktop
  qt/repos/testing-i686/qt4-linguist.desktop

-----------------------+
 PKGBUILD              |  116 +++++++++++++++++++++---------------------------
 qt.install            |   24 ---------
 qt4-assistant.desktop |   10 ----
 qt4-designer.desktop  |   11 ----
 qt4-linguist.desktop  |   11 ----
 5 files changed, 52 insertions(+), 120 deletions(-)


Property changes on: qt/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /qt/trunk:1-1985
   + /qt/trunk:1-2310

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-05-31 15:15:19 UTC (rev 2310)
+++ testing-i686/PKGBUILD	2008-05-31 19:15:01 UTC (rev 2311)
@@ -1,82 +1,70 @@
 # $Id$
-# Contributer: Vinay S Shastry (vinayshastry at gmail.com)
+
 pkgname=qt
 pkgver=4.4.0
-pkgrel=1
+pkgrel=3
 pkgdesc="The QT gui toolkit."
 arch=('i686' 'x86_64')
 url="http://www.trolltech.com/products/qt"
-license=('GPL2')
-options=('!libtool' 'docs')
-depends=('libpng' 'libjpeg' 'libxi' 'libxcursor' 'libxinerama' 'mesa' \
-         'fontconfig' 'libxrandr' 'dbus' 'glib2')
-makedepends=('mysql' 'unixodbc' 'libmng' 'libtiff')
+license=('GPL3')
+options=('!libtool')
+depends=('libpng' 'libxi' 'mesa' 'fontconfig' 'libxrandr' 'glib2' 'libtiff' 'libmng')
+optdepends=('libmysqlclient' 'unixodbc' 'sqlite3')
+makedepends=('mysql' 'unixodbc' 'sqlite3')
 provides=("qt4=${pkgver}")
 replaces=('qt4')
 conflicts=('qt4')
 _pkgfqn=qt-x11-opensource-src-$pkgver
-source=("ftp://ftp.trolltech.com/qt/source/${_pkgfqn}.tar.gz" \
-        'qt4-assistant.desktop' 'qt4-designer.desktop' 'qt4-linguist.desktop')
-md5sums=('f13ad0aa75efad314715930e663bad55'
-         '67adab60dd87270e733d25552a826950'
-         '40a36635b14c32bd2923e408c2e877bf'
-         'cd6e1c951e079e2eace67bce5e63966c')
+# 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 PATH=${QT4DIR}/bin:${PATH}
-  export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-  cd $startdir/src/$_pkgfqn
+	unset QMAKESPEC
+	export QT4DIR=$srcdir/$_pkgfqn
+	export PATH=${QT4DIR}/bin:${PATH}
+	export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
 
-  # remove docs
-  rm -rf doc
+	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
-  rm -rf mkspecs/{*aix*,*bsd*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,sco*,solaris*,tru64*,unixware*,win32*}
-  rm -rf mkspecs/qws/{*bsd*,linux-{arm,cellon,ipaq,mips,sharp,zylonite}*,mac*,solaris*}
+	# remove unwanted mkspecs
+	cd mkspecs/
+	find . -maxdepth 1 -regextype posix-egrep -type d ! -regex "./linux.*|./common|./features|./qws" -exec rm -rf "{}" \;
+	cd qws
+	find . -maxdepth 1 -regextype posix-egrep -type d ! -regex "./linux.*" -exec rm -rf "{}" \;
+	cd ../../
 
-  # start compiling qt
-  sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
-  sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
-  # do not compile demos and examples
-  sed -i 's|CFG_NOBUILD_PARTS=""|CFG_NOBUILD_PARTS="demos examples"|' configure
+	sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
+	sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++.conf
+	# do not compile demos, examples and docs
+	sed -i 's|CFG_NOBUILD_PARTS=""|CFG_NOBUILD_PARTS="demos examples docs"|' configure
 
-  ./configure -confirm-license \
-    -prefix /usr \
-    -docdir /usr/share/doc/qt \
-    -plugindir /usr/lib/qt/plugins \
-    -datadir /usr/share/qt \
-    -translationdir /usr/share/qt/translations \
-    -sysconfdir /etc/qt \
-    -examplesdir /usr/share/doc/qt/examples \
-    -demosdir /usr/share/doc/qt/demos \
-    -no-exceptions \
-    -release \
-    -platform linux-g++ \
-    -system-zlib \
-    -system-libpng \
-    -system-libjpeg \
-    -qt-gif \
-    -shared -sm -nis -stl \
-    -plugin-sql-{mysql,sqlite,odbc} \
-    -no-separate-debug-info \
-    -glib -qdbus \
-    -optimized-qmake \
-    -fast || return 1
+	./configure -confirm-license \
+		-prefix /usr \
+		-docdir /usr/share/doc/qt \
+		-plugindir /usr/lib/qt/plugins \
+		-datadir /usr/share/qt \
+		-translationdir /usr/share/qt/translations \
+		-sysconfdir /etc \
+		-examplesdir /usr/share/doc/qt/examples \
+		-demosdir /usr/share/doc/qt/demos \
+		-no-exceptions \
+		-plugin-sql-{mysql,sqlite,odbc} \
+		-system-sqlite \
+		-no-phonon \
+		-no-separate-debug-info \
+		-optimized-qmake || return 1
 
-  make || return 1
-  make INSTALL_ROOT=$startdir/pkg install || return 1
+	make || return 1
+	make INSTALL_ROOT=$pkgdir install || return 1
 
-  # install images and .desktop files
-  mkdir $startdir/pkg/usr/share/{pixmaps,applications}
-  cp tools/assistant/images/{linguist,designer,assistant}.png $startdir/pkg/usr/share/pixmaps
-  cp $startdir/src/qt4-{linguist,designer,assistant}.desktop $startdir/pkg/usr/share/applications
-
-  # 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|-L$startdir/src/${_pkgfqn}/lib||g" $startdir/pkg/usr/lib/*.prl $startdir/pkg/usr/share/doc/qt/demos/shared/libdemo_shared.prl
-  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
-}
+	# lots of cleanup and path fixes - thanks to crazy (frugalware)
+	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-i686/qt.install
===================================================================
--- testing-i686/qt.install	2008-05-31 15:15:19 UTC (rev 2310)
+++ testing-i686/qt.install	2008-05-31 19:15:01 UTC (rev 2311)
@@ -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-i686/qt4-assistant.desktop
===================================================================
--- testing-i686/qt4-assistant.desktop	2008-05-31 15:15:19 UTC (rev 2310)
+++ testing-i686/qt4-assistant.desktop	2008-05-31 19:15:01 UTC (rev 2311)
@@ -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-i686/qt4-designer.desktop
===================================================================
--- testing-i686/qt4-designer.desktop	2008-05-31 15:15:19 UTC (rev 2310)
+++ testing-i686/qt4-designer.desktop	2008-05-31 19:15:01 UTC (rev 2311)
@@ -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-i686/qt4-linguist.desktop
===================================================================
--- testing-i686/qt4-linguist.desktop	2008-05-31 15:15:19 UTC (rev 2310)
+++ testing-i686/qt4-linguist.desktop	2008-05-31 19:15:01 UTC (rev 2311)
@@ -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

More information about the arch-commits mailing list