Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=60866ab0969630fe7c6977b8a1638b6a143e728e
commit 60866ab0969630fe7c6977b8a1638b6a143e728e Author: James Buren <[email protected]> Date: Tue Aug 21 13:21:34 2012 -0500 qt-3.3.8-16-x86_64 * remove package diff --git a/source/xlib-extra/qt/01-qt-gcc4.patch b/source/xlib-extra/qt/01-qt-gcc4.patch deleted file mode 100644 index 61abfc6..0000000 --- a/source/xlib-extra/qt/01-qt-gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.5/src/kernel/qsizepolicy.h 2005-09-02 14:43:02.000000000 +0200 -+++ qt-x11-free-3.3.5-patched/src/kernel/qsizepolicy.h 2005-09-29 01:09:28.000000000 +0200 -@@ -88,7 +88,7 @@ - } - - void setHorData( SizeType d ) { data = (Q_UINT32)(data & ~HMask) | d; } -- void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~(HMask << HSize)) | -+ void setVerData( SizeType d ) { data = (Q_UINT32)(data & ~VMask) | - (d << HSize); } - - void setHeightForWidth( bool b ) { data = b ? (Q_UINT32)( data | ( 1 << 2*HSize ) ) diff --git a/source/xlib-extra/qt/02-qt-rpath+FW.patch b/source/xlib-extra/qt/02-qt-rpath+FW.patch deleted file mode 100644 index 6ff56e0..0000000 --- a/source/xlib-extra/qt/02-qt-rpath+FW.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Naur qt-x11-free-3.3.5/configure qt-x11-free-3.3.5-kill-off-sed/configure ---- qt-x11-free-3.3.5/configure 2005-08-22 11:31:26.000000000 +0200 -+++ qt-x11-free-3.3.5-kill-off-sed/configure 2006-02-22 13:11:22.000000000 +0100 -@@ -2351,7 +2351,7 @@ - else - echo "Do you accept the terms of $affix license? \c" - fi -- read acceptance -+ acceptance=yes - echo - if [ "$acceptance" = "yes" ]; then - break -@@ -2395,7 +2395,7 @@ - else - echo "Do you accept the terms of the license? \c" - fi -- read acceptance -+ acceptance=yes - echo - if [ "$acceptance" = "yes" ]; then - break -@@ -2476,7 +2476,7 @@ - else - echo "Do you accept the terms of the $Platform License? \c" - fi -- read acceptance -+ acceptance=yes - echo - if [ "$acceptance" = "yes" ]; then - break -diff -Naur qt-x11-free-3.3.5/Makefile qt-x11-free-3.3.5-kill-off-sed/Makefile ---- qt-x11-free-3.3.5/Makefile 2005-01-03 17:08:00.000000000 +0100 -+++ qt-x11-free-3.3.5-kill-off-sed/Makefile 2006-02-22 13:11:22.000000000 +0100 -@@ -11,7 +11,7 @@ - install: FORCE - @$(MAKE) qt.install - --all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples -+all: symlinks src-qmake src-moc sub-src sub-tools - @echo - @echo "The Qt library is now built in ./lib" - @echo "The Qt examples are built in the directories in ./examples" -diff -Naur qt-x11-free-3.3.5/mkspecs/linux-g++/qmake.conf qt-x11-free-3.3.5-kill-off-sed/mkspecs/linux-g++/qmake.conf ---- qt-x11-free-3.3.5/mkspecs/linux-g++/qmake.conf 2005-09-02 14:43:37.000000000 +0200 -+++ qt-x11-free-3.3.5-kill-off-sed/mkspecs/linux-g++/qmake.conf 2006-02-22 13:15:35.000000000 +0100 -@@ -21,7 +21,7 @@ - QMAKE_CFLAGS_DEPS = -M - QMAKE_CFLAGS_WARN_ON = -Wall -W - QMAKE_CFLAGS_WARN_OFF = -w --QMAKE_CFLAGS_RELEASE = -O2 -+QMAKE_CFLAGS_RELEASE = DUMMY -fPIC - QMAKE_CFLAGS_DEBUG = -g - QMAKE_CFLAGS_SHLIB = -fPIC - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -@@ -56,7 +56,7 @@ - QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB - QMAKE_LFLAGS_SONAME = -Wl,-soname, - QMAKE_LFLAGS_THREAD = --QMAKE_RPATH = -Wl,-rpath, -+QMAKE_RPATH = - - QMAKE_LIBS = - QMAKE_LIBS_DYNLOAD = -ldl -diff -Naur qt-x11-free-3.3.5/qmake/Makefile.unix qt-x11-free-3.3.5-kill-off-sed/qmake/Makefile.unix ---- qt-x11-free-3.3.5/qmake/Makefile.unix 2004-09-13 20:24:42.000000000 +0200 -+++ qt-x11-free-3.3.5-kill-off-sed/qmake/Makefile.unix 2006-02-22 13:14:00.000000000 +0100 -@@ -48,8 +48,7 @@ - [ -d @QT_INSTALL_BINS@ ] || mkdir -p @QT_INSTALL_BINS@ - -cp -f @BUILD_PATH@/bin/qmake @QT_INSTALL_BINS@ - [ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@ -- -cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@ -- -ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default -+ - - clean:: - rm -f $(OBJS) $(QOBJS) diff --git a/source/xlib-extra/qt/04-qt-visibility.patch b/source/xlib-extra/qt/04-qt-visibility.patch deleted file mode 100644 index ae2e140..0000000 --- a/source/xlib-extra/qt/04-qt-visibility.patch +++ /dev/null @@ -1,128 +0,0 @@ -diff -Naur qt-x11-free-3.3.5/include/qglobal.h qt-x11-free-3.3.5-patched/include/qglobal.h ---- qt-x11-free-3.3.5/include/qglobal.h 2005-09-02 14:42:53.000000000 +0200 -+++ qt-x11-free-3.3.5-patched/include/qglobal.h 2005-09-29 00:55:30.000000000 +0200 -@@ -865,6 +865,10 @@ - # define Q_TEMPLATE_EXTERN - # undef Q_DISABLE_COPY /* avoid unresolved externals */ - # endif -+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4 -+# define Q_EXPORT __attribute__((visibility("default"))) -+# undef QT_MAKEDLL /* ignore these for other platforms */ -+# undef QT_DLL - #else - # undef QT_MAKEDLL /* ignore these for other platforms */ - # undef QT_DLL -diff -Naur qt-x11-free-3.3.5/include/qgplugin.h qt-x11-free-3.3.5-patched/include/qgplugin.h ---- qt-x11-free-3.3.5/include/qgplugin.h 2005-09-02 14:43:05.000000000 +0200 -+++ qt-x11-free-3.3.5-patched/include/qgplugin.h 2005-09-29 00:52:27.000000000 +0200 -@@ -90,35 +90,19 @@ - return i->iface(); \ - } - --# ifdef Q_WS_WIN --# ifdef Q_CC_BOR --# define Q_EXPORT_PLUGIN(PLUGIN) \ -- Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C __declspec(dllexport) \ -- const char * __stdcall qt_ucm_query_verification_data() \ -- { return qt_ucm_verification_data; } \ -- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \ -- __stdcall ucm_instantiate() \ -- Q_PLUGIN_INSTANTIATE( PLUGIN ) --# else --# define Q_EXPORT_PLUGIN(PLUGIN) \ -- Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C __declspec(dllexport) \ -- const char *qt_ucm_query_verification_data() \ -- { return qt_ucm_verification_data; } \ -- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \ -- Q_PLUGIN_INSTANTIATE( PLUGIN ) --# endif --# else --# define Q_EXPORT_PLUGIN(PLUGIN) \ -- Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C \ -- const char *qt_ucm_query_verification_data() \ -+#if defined(Q_WS_WIN) && defined(Q_CC_BOR) -+# define Q_STDCALL __stdcall -+#else -+# define Q_STDCALL -+#endif -+ -+#define Q_EXPORT_PLUGIN(PLUGIN) \ -+ Q_PLUGIN_VERIFICATION_DATA \ -+ Q_EXTERN_C Q_EXPORT \ -+ const char * Q_STDCALL qt_ucm_query_verification_data() \ - { return qt_ucm_verification_data; } \ -- Q_EXTERN_C QUnknownInterface* ucm_instantiate() \ -+ Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \ - Q_PLUGIN_INSTANTIATE( PLUGIN ) --# endif -- - #endif - - struct QUnknownInterface; -diff -Naur qt-x11-free-3.3.5/src/kernel/qgplugin.h qt-x11-free-3.3.5-patched/src/kernel/qgplugin.h ---- qt-x11-free-3.3.5/src/kernel/qgplugin.h 2005-09-02 14:43:05.000000000 +0200 -+++ qt-x11-free-3.3.5-patched/src/kernel/qgplugin.h 2005-09-29 00:52:27.000000000 +0200 -@@ -90,35 +90,19 @@ - return i->iface(); \ - } - --# ifdef Q_WS_WIN --# ifdef Q_CC_BOR --# define Q_EXPORT_PLUGIN(PLUGIN) \ -- Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C __declspec(dllexport) \ -- const char * __stdcall qt_ucm_query_verification_data() \ -- { return qt_ucm_verification_data; } \ -- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \ -- __stdcall ucm_instantiate() \ -- Q_PLUGIN_INSTANTIATE( PLUGIN ) --# else --# define Q_EXPORT_PLUGIN(PLUGIN) \ -- Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C __declspec(dllexport) \ -- const char *qt_ucm_query_verification_data() \ -- { return qt_ucm_verification_data; } \ -- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \ -- Q_PLUGIN_INSTANTIATE( PLUGIN ) --# endif --# else --# define Q_EXPORT_PLUGIN(PLUGIN) \ -- Q_PLUGIN_VERIFICATION_DATA \ -- Q_EXTERN_C \ -- const char *qt_ucm_query_verification_data() \ -+#if defined(Q_WS_WIN) && defined(Q_CC_BOR) -+# define Q_STDCALL __stdcall -+#else -+# define Q_STDCALL -+#endif -+ -+#define Q_EXPORT_PLUGIN(PLUGIN) \ -+ Q_PLUGIN_VERIFICATION_DATA \ -+ Q_EXTERN_C Q_EXPORT \ -+ const char * Q_STDCALL qt_ucm_query_verification_data() \ - { return qt_ucm_verification_data; } \ -- Q_EXTERN_C QUnknownInterface* ucm_instantiate() \ -+ Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \ - Q_PLUGIN_INSTANTIATE( PLUGIN ) --# endif -- - #endif - - struct QUnknownInterface; -diff -Naur qt-x11-free-3.3.5/src/tools/qglobal.h qt-x11-free-3.3.5-patched/src/tools/qglobal.h ---- qt-x11-free-3.3.5/src/tools/qglobal.h 2005-09-02 14:42:53.000000000 +0200 -+++ qt-x11-free-3.3.5-patched/src/tools/qglobal.h 2005-09-29 00:55:30.000000000 +0200 -@@ -865,6 +865,10 @@ - # define Q_TEMPLATE_EXTERN - # undef Q_DISABLE_COPY /* avoid unresolved externals */ - # endif -+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4 -+# define Q_EXPORT __attribute__((visibility("default"))) -+# undef QT_MAKEDLL /* ignore these for other platforms */ -+# undef QT_DLL - #else - # undef QT_MAKEDLL /* ignore these for other platforms */ - # undef QT_DLL diff --git a/source/xlib-extra/qt/FrugalBuild b/source/xlib-extra/qt/FrugalBuild deleted file mode 100644 index fa791c7..0000000 --- a/source/xlib-extra/qt/FrugalBuild +++ /dev/null @@ -1,105 +0,0 @@ -# Compiling Time: 4.49 SBU -# Maintainer: crazy <[email protected]> -# Contributor: Kapolnasi Tamas <[email protected]> - -pkgname=qt -pkgver=3.3.8 -extraver=b -pkgrel=16 -pkgmore=x11-free -pkgdesc="The QT GUI toolkit." -url="http://www.trolltech.com/products/qt"; -depends=('libxml2>=2.7.8' 'libxrandr>=1.3.0' 'libgl' 'libglu' 'libxmu' 'libxft>=2.1.11-3' 'libmng' 'libxcursor' 'libxinerama' 'libsm' 'imake' 'libjpeg>=8a' 'libpng>=1.4.1' 'libxtst') -makedepends=('mysql>=5.0.15' 'postgresql>=8.2' 'sqlite3' 'cups' 'bison') -groups=('xlib-extra') -archs=('i686' 'x86_64') -options=('nodocs' 'scriptlet') -removes=('usr/lib/qt/mkspecs/default') -up2date="lynx -dump ftp://ftp.trolltech.com/qt/source|grep '.tar.gz$'|grep 'qt-x11-free-'|sort -n -r|head -n 1|sed 's/.*-\(.*\).t.*/\1/'|sed 's/$extraver//'" -source=(ftp://ftp.trolltech.com/qt/source/$pkgname-$pkgmore-$pkgver$extraver.tar.gz \ - http://ftp.frugalware.org/pub/other/sources/qt/patches-765767.tar.bz2 \ - qt.sh apply_patches \ - 01-qt-gcc4.patch \ - gcc-4.6.patch \ - 02-qt-rpath+FW.patch \ - 04-qt-visibility.patch \ - qt3-png14.patch \ - qtrc) -sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' \ - '70546384b9979091d58f5ca49e9a39dd91173050' \ - 'e281176c76dc9ef0f06aba57f107ccb074eb317d' \ - '7562323175ec47483dcb45c2857519f6276e0a51' \ - '54d37e3988c4b195ae960ef2c59e678151115211' \ - 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f' \ - '0d5fcbe569723792700bad3c82abe34d5e5163c4' \ - '0e88e4f3a184b0f0544bd0cbd8302e55aaf14871' \ - 'c8ea644266f4d6d6be9adf894f03138b8eca3fc2' \ - '6bdfefcc75f1dc4c9c643beefd62ff1969242050') - -export QTDIR=$startdir/src/$pkgname-$pkgmore-$pkgver$extraver -export PATH=${QTDIR}/bin:${PATH} -export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} -export YACC='yacc -d' - -subpkgs=('qt-docs') -subdescs=('QT Documentation') -subdepends=('') -subgroups=('docs-extra') -subarchs=('i686 x86_64') - -build() -{ - unset MAKEFLAGS - Fcd $pkgname-$pkgmore-$pkgver$extraver - Fpatchall - Fsed "DUMMY" "${CFLAGS} -fno-strict-aliasing" mkspecs/linux-g++/qmake.conf - mv $Fsrcdir/{patches,apply_patches} $Fsrcdir/$pkgname-$pkgmore-$pkgver$extraver - chmod +x apply_patches || Fdie - ./apply_patches || return 1 - ./configure \ - -v -platform linux-g++ \ - -prefix /usr/lib/qt \ - -release -shared -qt-gif \ - -system-libpng -system-libjpeg -system-libmng -system-zlib \ - -plugin-imgfmt-png -plugin-imgfmt-jpeg -plugin-imgfmt-mng -largefile \ - -plugin-sql-mysql -plugin-sql-psql -plugin-sql-sqlite \ - -thread -stl -no-g++-exceptions \ - -enable-{dialogs,iconview,workspace,network,tools,kernel,widgets,opengl,stl,canvas,table,xml,sql,input} \ - -nis -pch -sm -tablet -xft -xinerama -xrender -xkb -ipv6 \ - -I /usr/include -L /usr/lib || return 1 - Fmkdir usr/lib/qt/mkspecs usr/lib/qt/etc/settings - Fln /usr/lib/qt/etc/settings etc/qt3 - Ffile /usr/lib/qt/etc/settings/qtrc - cp -r mkspecs/linux-g++ $Fdestdir/usr/lib/qt/mkspecs/linux-g++ || Fdie - ##Fixme need patch## - cd $Fsrcdir/$pkgname-$pkgmore-$pkgver$extraver/plugins/src/sqldrivers/mysql || Fdie - qmake -o Makefile "INCLUDEPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro - - cd $Fsrcdir/$pkgname-$pkgmore-$pkgver$extraver/plugins/src/sqldrivers/psql || Fdie - qmake -o Makefile "INCLUDEPATH+=/usr/include/postgresql/server /usr/include" "LIBS+=-L/usr/lib -lpq" psql.pro - - cd $Fsrcdir/$pkgname-$pkgmore-$pkgver$extraver || Fdie - make || return 1 - make INSTALL_ROOT=$Fdestdir install || Fdie - Fmkdir etc/ld.so.conf.d - echo "/usr/lib/qt/lib" > ${Fdestdir}/etc/ld.so.conf.d/qt.conf - Fmkdir /usr/lib/$pkgname/man - cp -r $Fsrcdir/$pkgname-$pkgmore-$pkgver$extraver/doc/man/{man1,man3} $Fdestdir/usr/lib/$pkgname/man || Fdie - Fsed "-L$startdir/src/$pkgname-$pkgmore-$pkgver$extraver/lib" "" $Fdestdir/usr/lib/$pkgname/lib/*.prl - Fexe /etc/profile.d/qt.sh - (cd $Fdestdir/usr/lib/qt/mkspecs; ln -sf linux-g++ default) - Fmkdir /usr/lib/pkgconfig - Fcp /usr/lib/qt/lib/pkgconfig/* /usr/lib/pkgconfig - (cd $Fdestdir/usr/lib/pkgconfig; ln -sf qt-mt.pc qt.pc) - if [ "$CARCH" == "x86_64" ]; then - Fln /usr/lib/qt/lib /usr/lib/qt/lib64 - fi - # symlinks for who don't care about ld.so.conf (OpenOffice.org) - #Fln qt/lib/libqt-mt.so.3 /usr/lib/libqt-mt.so.3 - #Fln qt/lib/libqui.so.1 /usr/lib/libqui.so.1 - Fsplit qt-docs usr/lib/qt/phrasebooks - Fsplit qt-docs usr/lib/qt/templates - Fsplit qt-docs usr/lib/qt/doc -} - -# optimization OK diff --git a/source/xlib-extra/qt/apply_patches b/source/xlib-extra/qt/apply_patches deleted file mode 100644 index c64f75a..0000000 --- a/source/xlib-extra/qt/apply_patches +++ /dev/null @@ -1,149 +0,0 @@ -#! /usr/bin/env bash -# Script to apply patches from qt-copy/patches/. -# See README.qt-copy for details. -# -# Lubos Lunak <[email protected]> -# Oswald Buddenhagen <[email protected]> -# - -if ! test -d patches; then - echo "No patches directory found." - exit 1 -fi - -revert=false reverse= -clever=false -verbose=true silent= -for i; do - case $i in - -r|-R|--reverse) revert=true; reverse=--reverse;; - -c|--clever) clever=true;; - -s|--silent|-q|--quiet) verbose=false; silent=--silent;; - *) echo "Unknown option '$i'." >&2; exit 1;; - esac -done - -b=../.${PWD##*/} - -if $clever; then - if ! $revert; then - pdir=$b.patched - odir=$b.cvs - else - pdir=$b.cvs - odir=$b.patched - fi - $verbose && echo -n "Creating temporary copy ... " - tdir=$b.temp - test -d $tdir || { rm -rf $tdir.t; cp -al . $tdir.t && mv $tdir.t $tdir; } || exit - $verbose && echo "done." -fi - -plist=.applied_patches -wlist=$plist.work -test -f $wlist -o ! -f $plist || cp $plist $wlist || exit -patches=`cd patches/ >/dev/null && ls [0-9]*-* $reverse` -applied= -already= -skipped= -disabled= -for file in $patches; do - # skip files that aren't *.diff or *.patch - test "${file%.patch}" = "$file" -a "${file%.diff}" = "$file" && continue - pnum=${file%%-*} - if ! $revert || ! test -f $plist; then - # skip those having 'applied: yes' in the header - if head -n 5 patches/$file | grep -iq '^[\t ]*applied[\t ]*:[\t ]*yes[\t ]*$'; then - already="$already $file\n" - continue; - fi - # skip disabled - if grep -q "^[\\t ]*$pnum[\\t ]*\$" patches/DISABLED; then - disabled="$disabled $file\n" - continue; - fi - fi - if test -f $plist; then - grep -q $pnum $wlist && listed=true || listed=false - if test $listed != $revert; then - skipped="$skipped $file\n" - continue; - fi - fi - $verbose && echo -e "\nApplying: $file" - if $clever; then - if ! patch -b -z .touched $silent $reverse -p0 < patches/$file; then - echo -e "\n\nPatch $file failed!" - while :; do - read -p "[A]bort, [c]ontinue, or [r]ollback all? " sel - case $sel in - a) exit 1;; - c) continue 2;; - r) - $verbose && echo -ne "Deleting working directory ... " - rm -rf $PWD/* - rm -f $wlist - $verbose && echo -ne "done.\nSubstituting with temporary directory ... " - mv $tdir/* $PWD - rm -rf $tdir - $verbose && echo "done." - exit 2;; - esac - done - fi - else - if ! patch $silent $reverse -p0 < patches/$file; then - echo -e "\n\nPatch $file failed!" - while :; do - read -p "[A]bort or [c]ontinue? " sel - case $sel in - a) exit 1;; - c) continue 2;; - esac - done - fi - fi - if ! $revert; then - echo $pnum >> $wlist - elif test -f $wlist; then - grep -v $pnum $wlist > $wlist.new - mv $wlist.new $wlist - fi - applied="$applied $file\n" -done -touch $wlist -mv $wlist $plist - -$verbose && echo -e "\n\n\nDone.\n -Applied patches:\n$applied -Previously applied patches:\n$skipped -Disabled patches:\n$disabled -Already merged patches:\n$already" - -if $clever; then - $verbose && echo -n "Creating backup ... " - test -f $odir/.cleanme && rm -rf $odir - for j in $(find -name \*.touched); do - rj=${j%.touched} - if ! test -f "$odir/$rj"; then - mkdir -p "$odir/${rj%/*}" || exit - ln "$tdir/$rj" "$odir/$rj" || exit - fi - rm "$j" - done - $verbose && echo -ne "done.\nDeleting temporary directory ... " - mv $tdir $tdir.t && rm -rf $tdir.t - if test -d $pdir; then - $verbose && echo -ne "done.\nRestoring previous backup ... " - for j in $(find $pdir -type f); do - rj=${j#"$pdir/"} - cmp -s "$j" "$rj" && { mv "$j" "$rj" || exit; } - done - $verbose && echo -ne "done.\nCleaning previous backup ... " - find $pdir -type d | sort -r | xargs -r rmdir 2> /dev/null - touch $pdir/.cleanme 2> /dev/null - fi - $verbose && echo "done." -fi - -exit 0 diff --git a/source/xlib-extra/qt/gcc-4.6.patch b/source/xlib-extra/qt/gcc-4.6.patch deleted file mode 100644 index bcbffce..0000000 --- a/source/xlib-extra/qt/gcc-4.6.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h ---- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600 -@@ -49,6 +49,7 @@ - #include "qvaluelist.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <iterator> - #include <map> -diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h ---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600 -@@ -47,6 +47,7 @@ - #include "qdatastream.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <iterator> - #include <list> -diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h ---- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600 -+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600 -@@ -45,6 +45,7 @@ - #include "qdatastream.h" - #endif // QT_H - -+#include <cstddef> - #ifndef QT_NO_STL - #include <vector> - #endif diff --git a/source/xlib-extra/qt/qt.install b/source/xlib-extra/qt/qt.install deleted file mode 100644 index 4235daf..0000000 --- a/source/xlib-extra/qt/qt.install +++ /dev/null @@ -1,27 +0,0 @@ -update() -{ - sed '\|^/usr/lib/qt/lib|d' -i /etc/ld.so.conf - sbin/ldconfig -r . -} - -post_install() -{ - update -} - -post_upgrade() -{ - update -} - -post_remove() -{ - update -} - -op=$1 -shift - -$op $* - -# vim: ft=sh diff --git a/source/xlib-extra/qt/qt.sh b/source/xlib-extra/qt/qt.sh deleted file mode 100644 index c1f3297..0000000 --- a/source/xlib-extra/qt/qt.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -export QTDIR=/usr/lib/qt -export PATH=$PATH:$QTDIR/bin -export UIC_PATH=$QTDIR/bin/uic -export QT_XFT=true -export MANPATH=$MANPATH:$QTDIR/man -if [ -z "$PKG_CONFIG_PATH" ]; then - export PKG_CONFIG_PATH=$QTDIR/lib/pkgconfig -else - export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/lib/pkgconfig -fi - diff --git a/source/xlib-extra/qt/qt3-png14.patch b/source/xlib-extra/qt/qt3-png14.patch deleted file mode 100644 index e8a1945..0000000 --- a/source/xlib-extra/qt/qt3-png14.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- src/kernel/qpngio.cpp.orig 2010-01-16 22:02:41.000000000 +0100 -+++ src/kernel/qpngio.cpp 2010-01-16 22:03:56.000000000 +0100 -@@ -159,7 +159,7 @@ - image.setColor( i, qRgba(c,c,c,0xff) ); - } - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { -- const int g = info_ptr->trans_values.gray; -+ const int g = info_ptr->trans_color.gray; - if (g < ncols) { - image.setAlphaBuffer(TRUE); - image.setColor(g, image.color(g) & RGB_MASK); -@@ -187,7 +187,7 @@ - info_ptr->palette[i].red, - info_ptr->palette[i].green, - info_ptr->palette[i].blue, -- info_ptr->trans[i] -+ info_ptr->trans_alpha[i] - ) - ); - i++; -@@ -321,9 +321,9 @@ - png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) - if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { - QRgb trans = 0xFF000000 | qRgb( -- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff, -- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff, -- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff); -+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff, -+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff); - for (uint y=0; y<height; y++) { - for (uint x=0; x<info_ptr->width; x++) { - if (((uint**)jt)[y][x] == trans) { diff --git a/source/xlib-extra/qt/qtrc b/source/xlib-extra/qt/qtrc deleted file mode 100644 index 484d8ba..0000000 --- a/source/xlib-extra/qt/qtrc +++ /dev/null @@ -1,37 +0,0 @@ -[3.3] -libraryPath=/usr/lib/kde3/plugins/:/usr/lib/qt/bin:/usr/lib/qt/plugins - - -[General] -XIMInputStyle=On The Spot -cursorFlashTime=1000 -doubleClickInterval=400 -embedFonts=true -enableXft=true -font=DejaVu Sans,12,-1,5,50,0,0,0,0,0 -fontPath=\0 -globalStrut=0^e0^e -resolveSymlinks=true -style=qtcurve -useRtlExtensions=true -useXft=true -wheelScrollLines=3 - - -[KWinPalette] -activeBackground=#4978ca -activeBlend=#3e91eb -activeForeground=#ffffff -activeTitleBtnBg=#eeeee6 -frame=#eeeee6 -inactiveBackground=#4978ca -inactiveBlend=#3e91eb -inactiveForeground=#ffffff -inactiveFrame=#eeeee6 -inactiveTitleBtnBg=#eeeee6 - -[Palette] -active=#000000^e#f6f4f4^e#ffffff^e#ffffff^e#535252^e#c3c1c1^e#000000^e#ffffff^e#000000^e#ffffff^e#ebe9e9^e#000000^e#86aadc^e#000000^e#0000c0^e#800080^e -disabled=#808080^e#f6f4f4^e#ffffff^e#ffffff^e#535252^e#c3c1c1^e#c3c1c1^e#ffffff^e#808080^e#ffffff^e#ebe9e9^e#000000^e#6f8db7^e#ffffff^e#0000c0^e#800080^e -inactive=#000000^e#f6f4f4^e#ffffff^e#ffffff^e#535252^e#c3c1c1^e#000000^e#ffffff^e#000000^e#ffffff^e#ebe9e9^e#000000^e#86aadc^e#000000^e#0000c0^e#800080^e - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
