# HG changeset patch # User Rohit Joshi # Date 1272566550 14400 # Node ID 6a0db6c0b0fea6de94bff92e9768aabf28d5b988 # Parent 0be5201ab431de513e5986ad698f52141de74ade rename qt-everywhere* to simple qt4; improve all receipts; tazwok need to work with SOURCE and WANTED (feature not patched for quite long now); improve compile options and add libQtOpenGL back diff -r 0be5201ab431 -r 6a0db6c0b0fe Qt4-dev/receipt --- a/Qt4-dev/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/Qt4-dev/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -12,12 +12,14 @@ SUGGESTED="libmng nvidia" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/include $fs/usr cp -a $_pkg/usr/lib/pkgconfig $fs/usr/lib cp -a $_pkg/usr/lib/*.*a $fs/usr/lib/ @@ -29,8 +31,8 @@ cp -a $_pkg/usr/bin $fs/usr rm $fs/usr/bin/qmake rm $fs/usr/bin/designer - # Linguist and assistant are not yet seperate packages - #rm $fs/usr/bin/linguist - #rm $fs/usr/bin/assistant + # Linguist and assistant are now part of QTDesigner packages + rm $fs/usr/bin/linguist + rm $fs/usr/bin/assistant } diff -r 0be5201ab431 -r 6a0db6c0b0fe QtDesigner/receipt --- a/QtDesigner/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/QtDesigner/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -5,22 +5,34 @@ CATEGORY="development" SHORT_DESC="Qt Designer" MAINTAINER="allan316@gmail.com" -DEPENDS="libQtCore libQtGui libQtNetwork libQtSvg libQtXml libQtScript \ +DEPENDS="libQtCore libQtGui libQtNetwork libQtSvg libQtXml libQtDesigner libQtScript \ expat fontconfig freetype glib xorg-libICE xorg-libSM xorg-libX11 xorg-libXau \ xorg-libXdmcp xorg-libXext xorg-libXi xorg-libXrandr xorg-libXrender zlib \ libpng gcc-lib-base" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" TAGS="qt" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/bin - mkdir -p $fs/usr/lib + mkdir -p $fs/usr/bin \ + $fs/usr/share/pixmaps \ + $fs/usr/share/applications + src="$WOK/$WANTED/$SOURCE-$VERSION" + _pkg="$src/_pkg" cp -a $_pkg/usr/bin/designer* $fs/usr/bin - cp -a $_pkg/usr/lib/libQtDesigner*.so* $fs/usr/lib - strip -s $fs/usr/bin/* + cp -a $_pkg/usr/bin/linguist* $fs/usr/bin + cp -a $_pkg/usr/bin/assistant* $fs/usr/bin + + # add missing icons + cp -a $src/tools/assistant/tools/assistant/images/assistant.png $fs/usr/share/pixmaps + cp -a $src/tools/designer/src/designer/images/designer.png $fs/usr/share/pixmaps + cp -a $src/tools/linguist/linguist/images/icons/linguist-16-32.png $fs/usr/share/pixmaps + + # add .desktop files + cp -a stuff/* $fs/usr/share/applications } diff -r 0be5201ab431 -r 6a0db6c0b0fe QtDesigner/stuff/qtassistant.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QtDesigner/stuff/qtassistant.desktop Thu Apr 29 14:42:30 2010 -0400 @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/assistant +Name=Qt Assistant +GenericName=Qt Document Browser +Icon=assistant +Terminal=false +Type=Application +Categories=Application;Development;Documentation diff -r 0be5201ab431 -r 6a0db6c0b0fe QtDesigner/stuff/qtdesigner.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QtDesigner/stuff/qtdesigner.desktop Thu Apr 29 14:42:30 2010 -0400 @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/designer +Icon=designer +Name=Qt Designer +StartupNotify=false +Terminal=false +Type=Application +Categories=Application;Development; diff -r 0be5201ab431 -r 6a0db6c0b0fe QtDesigner/stuff/qtlinguist.desktop --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/QtDesigner/stuff/qtlinguist.desktop Thu Apr 29 14:42:30 2010 -0400 @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Exec=/usr/bin/linguist +Name=Qt Linguist +GenericName=Translation Tool +MimeType=application/x-linguist +Terminal=false +Type=Application +Icon=linguist +Categories=Application;Development; diff -r 0be5201ab431 -r 6a0db6c0b0fe libQt3Support/receipt --- a/libQt3Support/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQt3Support/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,11 +8,13 @@ DEPENDS="libQtGui libQtSql libQtXml" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQt3Support.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtClucene/receipt --- a/libQtClucene/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtClucene/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,11 +8,13 @@ DEPENDS="libQtCore" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtCLucene.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtCore/receipt --- a/libQtCore/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtCore/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,12 +8,14 @@ DEPENDS="glib zlib gcc-lib-base" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtCore.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtDBus/receipt --- a/libQtDBus/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtDBus/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,11 +8,13 @@ DEPENDS="libQtXml" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtDBus.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtDesigner/receipt --- a/libQtDesigner/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtDesigner/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,13 +8,14 @@ DEPENDS="libQtCore libQtGui libQtScript libQtXml" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://www.trolltech.com" -#WGET_URL="" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtDesigner*.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtGui/receipt --- a/libQtGui/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtGui/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -10,13 +10,15 @@ xorg-libXrender libpng" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtGui.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtHelp/receipt --- a/libQtHelp/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtHelp/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,11 +8,13 @@ DEPENDS="libQtGui libQtClucene libQtSql libQtXml" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtHelp.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtNetwork/receipt --- a/libQtNetwork/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtNetwork/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,12 +8,14 @@ DEPENDS="libQtCore" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtNetwork.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtOpenGL/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libQtOpenGL/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -0,0 +1,21 @@ +# SliTaz package receipt. + +PACKAGE="libQtOpenGL" +VERSION="4.6.2" +CATEGORY="development" +SHORT_DESC="Qt Network Library" +MAINTAINER="allan316@gmail.com" +DEPENDS="libQtGui libgl libglu xorg-libXxf86vm xorg-libXdamage libdrm" +TARBALL="$PACKAGE-$VERSION.tar.gz" +WEB_SITE="http://qt.nokia.com/" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" + cp -a $_pkg/usr/lib/libQtOpenGL.so* $fs/usr/lib +} + diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtScript/receipt --- a/libQtScript/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtScript/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,12 +8,14 @@ DEPENDS="libQtCore" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtScript.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtSql/receipt --- a/libQtSql/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtSql/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,11 +8,13 @@ DEPENDS="libQtCore" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtSql.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtSvg/receipt --- a/libQtSvg/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtSvg/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,12 +8,14 @@ DEPENDS="libQtCore libQtGui libQtXml libpng" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtSvg.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtWebkit/receipt --- a/libQtWebkit/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtWebkit/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,12 +8,14 @@ DEPENDS="libQtCore libQtGui libQtNetwork libpng" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" #Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtWebKit.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe libQtXml/receipt --- a/libQtXml/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/libQtXml/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,12 +8,14 @@ DEPENDS="libQtNetwork" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { mkdir -p $fs/usr/lib + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/lib/libQtXml.so* $fs/usr/lib cp -a $_pkg/usr/lib/libQtXmlPatterns.so* $fs/usr/lib } diff -r 0be5201ab431 -r 6a0db6c0b0fe qmake/receipt --- a/qmake/receipt Thu Apr 29 07:57:28 2010 -0400 +++ b/qmake/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -8,7 +8,8 @@ DEPENDS="zlib gcc-lib-base" TARBALL="$PACKAGE-$VERSION.tar.gz" WEB_SITE="http://qt.nokia.com/" -WANTED="qt-everywhere-opensource-src" +WANTED="qt4" +SOURCE="qt-everywhere-opensource-src" TAGS="qt" @@ -16,6 +17,7 @@ genpkg_rules() { mkdir -p $fs/usr/bin + _pkg="$WOK/$WANTED/$SOURCE-$VERSION/_pkg" cp -a $_pkg/usr/bin/qmake $fs/usr/bin cp -a $_pkg/usr/bin/moc $fs/usr/bin cp -a $_pkg/usr/bin/uic $fs/usr/bin diff -r 0be5201ab431 -r 6a0db6c0b0fe qt-everywhere-opensource-src/receipt --- a/qt-everywhere-opensource-src/receipt Thu Apr 29 07:57:28 2010 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="qt-everywhere-opensource-src" -VERSION="4.6.2" -CATEGORY="meta" -SHORT_DESC="qt x11 toolkit" -MAINTAINER="allan316@gmail.com" -DEPENDS="glibc-locale" -BUILD_DEPENDS="xorg-libX11-dev dbus-dev slitaz-dev-pkgs" -TARBALL="$PACKAGE-$VERSION.tar.gz" -WEB_SITE="http://qt.nokia.com/" -WGET_URL="ftp://ftp.qt.nokia.com/qt/source/$TARBALL" -PROVIDE="qt-x11-opensource-src" -TAGS="qt" - -# Rules to configure and make the package. -compile_rules() -{ - cd $src - ./configure \ - -prefix /usr \ - -confirm-license \ - -silent \ - -sysconfdir /etc \ - -plugindir /usr/lib/qt/plugins \ - -translationdir /usr/share/qt/translations \ - -datadir /usr/share/qt \ - -docdir /usr/share/doc/qt \ - -examplesdir /usr/share/doc/qt/examples \ - -demosdir /usr/share/doc/qt/demos \ - -no-separate-debug-info \ - -nomake demos \ - -nomake examples \ - -nomake docs \ - -no-phonon \ - -optimized-qmake && - make && - make INSTALL_ROOT=$PWD/_pkg install -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - # dummy tree to avoid 'tazwok cmp --cook' building loop - mkdir $fs/etc - # pkgconfig path fixes - sed -i -e "s|-L$src/_pkg/usr/lib||g" $_pkg/usr/lib/pkgconfig/*.pc - sed -i -e "s|$src/_pkg/usr/bin/moc|/usr/bin/moc|g" $_pkg/usr/lib/pkgconfig/*.pc - sed -i -e "s|$src/_pkg/usr/bin/uic|/usr/bin/uic|g" $_pkg/usr/lib/pkgconfig/*.pc -} - diff -r 0be5201ab431 -r 6a0db6c0b0fe qt4/receipt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt4/receipt Thu Apr 29 14:42:30 2010 -0400 @@ -0,0 +1,55 @@ +# SliTaz package receipt. + +PACKAGE="qt4" +SOURCE="qt-everywhere-opensource-src" +VERSION="4.6.2" +CATEGORY="meta" +SHORT_DESC="qt x11 toolkit" +MAINTAINER="allan316@gmail.com" +DEPENDS="glibc-locale libQtCore libQtGui libQtNetwork libQtSvg libQtXml libQtDesigner libQtScript \ +libQt3Support libQtClucene libQtDBus libQtHelp libQtOpenGL libQtSql libQtWebkit" +BUILD_DEPENDS="xorg-libX11-dev dbus-dev slitaz-dev-pkgs" +TARBALL="$SOURCE-$VERSION.tar.gz" +WEB_SITE="http://qt.nokia.com/" +WGET_URL="ftp://ftp.qt.nokia.com/qt/source/$TARBALL" +PROVIDE="qt-x11-opensource-src" +TAGS="qt" + +# Rules to configure and make the package. +compile_rules() +{ + cd $src + ./configure \ + -prefix /usr \ + -confirm-license -opensource \ + -silent \ + -sysconfdir /etc \ + -plugindir /usr/lib/qt/plugins \ + -translationdir /usr/share/qt/translations \ + -datadir /usr/share/qt \ + -docdir /usr/share/doc/qt \ + -examplesdir /usr/share/doc/qt/examples \ + -demosdir /usr/share/doc/qt/demos \ + -no-separate-debug-info \ + -nomake demos \ + -nomake examples \ + -nomake docs \ + -no-phonon \ + -optimized-qmake \ + -opengl \ + -gtkstyle && + make && + make INSTALL_ROOT=$PWD/_pkg install +} + +# Rules to gen a SliTaz package suitable for Tazpkg. +genpkg_rules() +{ + # dummy tree to avoid 'tazwok cmp --cook' building loop + mkdir $fs/etc + # pkgconfig path fixes + sed -i -e "s|-L$src/_pkg/usr/lib||g" $_pkg/usr/lib/pkgconfig/*.pc + sed -i -e "s|$src/_pkg/usr/bin/moc|/usr/bin/moc|g" $_pkg/usr/lib/pkgconfig/*.pc + sed -i -e "s|$src/_pkg/usr/bin/uic|/usr/bin/uic|g" $_pkg/usr/lib/pkgconfig/*.pc +} +