Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
commit
6548b41394
@ -0,0 +1,35 @@
|
|||||||
|
diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
|
||||||
|
index 4dfb247..cd8f4b0 100644
|
||||||
|
--- a/klaptopdaemon/acpi.cpp
|
||||||
|
+++ b/klaptopdaemon/acpi.cpp
|
||||||
|
@@ -178,7 +178,7 @@ void AcpiConfig::setupHelper()
|
||||||
|
proc << tdesu;
|
||||||
|
proc << "-u";
|
||||||
|
proc << "root";
|
||||||
|
- proc << "chown root "+helper+"; chmod +s "+helper;
|
||||||
|
+ proc << "dpkg-statoverride --update --add root root 6755 "+helper;
|
||||||
|
proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
|
||||||
|
index 9de0c85..e348943 100644
|
||||||
|
--- a/klaptopdaemon/apm.cpp
|
||||||
|
+++ b/klaptopdaemon/apm.cpp
|
||||||
|
@@ -166,7 +166,7 @@ void ApmConfig::setupHelper()
|
||||||
|
proc << tdesu;
|
||||||
|
proc << "-u";
|
||||||
|
proc << "root";
|
||||||
|
- proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name;
|
||||||
|
+ proc << TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name;
|
||||||
|
proc.start(KProcess::Block); // run it sync so has_apm below sees the results
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
@@ -200,7 +200,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend
|
||||||
|
proc << tdesu;
|
||||||
|
proc << "-u";
|
||||||
|
proc << "root";
|
||||||
|
- proc << "chown root "+helper+"; chmod +s "+helper;
|
||||||
|
+ proc << "dpkg-statoverride --update --add root root 6755 "+helper;
|
||||||
|
proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
|
||||||
|
}
|
||||||
|
} else {
|
@ -0,0 +1,35 @@
|
|||||||
|
diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
|
||||||
|
index 4dfb247..cd8f4b0 100644
|
||||||
|
--- a/klaptopdaemon/acpi.cpp
|
||||||
|
+++ b/klaptopdaemon/acpi.cpp
|
||||||
|
@@ -178,7 +178,7 @@ void AcpiConfig::setupHelper()
|
||||||
|
proc << tdesu;
|
||||||
|
proc << "-u";
|
||||||
|
proc << "root";
|
||||||
|
- proc << "chown root "+helper+"; chmod +s "+helper;
|
||||||
|
+ proc << "dpkg-statoverride --update --add root root 6755 "+helper;
|
||||||
|
proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
|
||||||
|
index 9de0c85..e348943 100644
|
||||||
|
--- a/klaptopdaemon/apm.cpp
|
||||||
|
+++ b/klaptopdaemon/apm.cpp
|
||||||
|
@@ -166,7 +166,7 @@ void ApmConfig::setupHelper()
|
||||||
|
proc << tdesu;
|
||||||
|
proc << "-u";
|
||||||
|
proc << "root";
|
||||||
|
- proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name;
|
||||||
|
+ proc << TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name;
|
||||||
|
proc.start(KProcess::Block); // run it sync so has_apm below sees the results
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
@@ -200,7 +200,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend
|
||||||
|
proc << tdesu;
|
||||||
|
proc << "-u";
|
||||||
|
proc << "root";
|
||||||
|
- proc << "chown root "+helper+"; chmod +s "+helper;
|
||||||
|
+ proc << "dpkg-statoverride --update --add root root 6755 "+helper;
|
||||||
|
proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
|
||||||
|
}
|
||||||
|
} else {
|
@ -0,0 +1,2 @@
|
|||||||
|
UPPKG=dbus-1-tqt
|
||||||
|
SUPKG=libdbus-1-tqt0
|
@ -0,0 +1,5 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 27 23:51:01 UTC 2012 - robxu9@gmail.com
|
||||||
|
|
||||||
|
- update dbus-1-tqt/libdbus-1-tqt0 for suse12.1
|
||||||
|
|
@ -0,0 +1,2 @@
|
|||||||
|
UPPKG=dbus-tqt
|
||||||
|
SUPKG=libdbus-tqt-1-0
|
@ -0,0 +1,2 @@
|
|||||||
|
UPPKG=tqtinterface
|
||||||
|
SUPKG=libtqt4
|
@ -0,0 +1,5 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 27 21:44:09 UTC 2012 - robxu9@gmail.com
|
||||||
|
|
||||||
|
- update tqtinterface/libtqt4 for suse12.1
|
||||||
|
|
@ -0,0 +1,2 @@
|
|||||||
|
UPPKG=qt3
|
||||||
|
SUPKG=qt3
|
@ -0,0 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 27 20:45:24 UTC 2012 - robxu9@gmail.com
|
||||||
|
|
||||||
|
- update qt3 for suse12.1
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 27 20:30:25 UTC 2012 - robxu9@gmail.com
|
||||||
|
|
||||||
|
- update
|
||||||
|
|
@ -0,0 +1,2 @@
|
|||||||
|
UPPKG=tqt3
|
||||||
|
SUPKG=tqt3
|
@ -0,0 +1,39 @@
|
|||||||
|
qt-bugs@ issue :
|
||||||
|
bugs.kde.org number :
|
||||||
|
applied: yes
|
||||||
|
author: Waldo Bastian <bastian@kde.org>
|
||||||
|
|
||||||
|
QTextEdit::zoomIn /QTextEdit::zoomOut does not work if the original
|
||||||
|
font had its size specified in pixels instead of points.
|
||||||
|
pointSize() returns 0 in such case.
|
||||||
|
|
||||||
|
Index: src/widgets/qtextedit.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/widgets/qtextedit.cpp.orig
|
||||||
|
+++ src/widgets/qtextedit.cpp
|
||||||
|
@@ -5774,7 +5774,11 @@ void TQTextEdit::setFont( const TQFont &
|
||||||
|
void TQTextEdit::zoomIn( int range )
|
||||||
|
{
|
||||||
|
TQFont f( TQScrollView::font() );
|
||||||
|
- f.setPointSize( TQFontInfo(f).pointSize() + range );
|
||||||
|
+ TQFontInfo fi(f);
|
||||||
|
+ if (fi.pointSize() <= 0)
|
||||||
|
+ f.setPixelSize( fi.pixelSize() + range );
|
||||||
|
+ else
|
||||||
|
+ f.setPointSize( fi.pointSize() + range );
|
||||||
|
setFont( f );
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -5789,7 +5793,11 @@ void TQTextEdit::zoomIn( int range )
|
||||||
|
void TQTextEdit::zoomOut( int range )
|
||||||
|
{
|
||||||
|
TQFont f( TQScrollView::font() );
|
||||||
|
- f.setPointSize( TQMAX( 1, TQFontInfo(f).pointSize() - range ) );
|
||||||
|
+ TQFontInfo fi(f);
|
||||||
|
+ if (fi.pointSize() <= 0)
|
||||||
|
+ f.setPixelSize( TQMAX( 1, fi.pixelSize() - range ) );
|
||||||
|
+ else
|
||||||
|
+ f.setPointSize( TQMAX( 1, fi.pointSize() - range ) );
|
||||||
|
setFont( f );
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,13 @@
|
|||||||
|
Index: src/qt.pro
|
||||||
|
===================================================================
|
||||||
|
--- src/qt.pro.orig
|
||||||
|
+++ src/qt.pro
|
||||||
|
@@ -41,6 +41,8 @@ INPUTMETHOD_CPP = inputmethod
|
||||||
|
XML_CPP = xml
|
||||||
|
STYLES_CPP = styles
|
||||||
|
EMBEDDED_CPP = embedded
|
||||||
|
+TQMAKE_CFLAGS += -fno-strict-aliasing
|
||||||
|
+TQMAKE_CFLAGS_MT += -fno-strict-aliasing
|
||||||
|
|
||||||
|
win32 {
|
||||||
|
contains(QT_PRODUCT,qt-internal) {
|
@ -0,0 +1,10 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Categories=Qt;Development;
|
||||||
|
Encoding=UTF-8
|
||||||
|
Exec=/usr/lib/qt3/bin/assistant
|
||||||
|
Name=Qt Assistant
|
||||||
|
GenericName=Document Browser
|
||||||
|
X-KDE-StartupNotify=true
|
||||||
|
Icon=assistant3
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
After Width: | Height: | Size: 2.3 KiB |
@ -0,0 +1,72 @@
|
|||||||
|
summary.qt3 A library for developing applications with graphical user interfaces
|
||||||
|
summary.qt3-devel Include Files and Libraries mandatory for Development
|
||||||
|
summary.qt3-devel-doc Documentation for the Qt 3 Development Kit
|
||||||
|
summary.qt3-devel-examples Programming Examples for Qt 3
|
||||||
|
summary.qt3-devel-tools User Interface Builder and other tools (designer, assistant, linguist)
|
||||||
|
summary.qt3-extensions Qt3 Extensions
|
||||||
|
summary.qt3-man Qt 3 Man Pages
|
||||||
|
summary.qt3-mysql MySQL Plug-In for Qt
|
||||||
|
summary.qt3-postgresql A PostgreSQL Plug-In for Qt
|
||||||
|
summary.qt3-sqlite SQLite Database Plug-In for Qt
|
||||||
|
summary.qt3-unixODBC A UnixODBC Plug-In for Qt
|
||||||
|
+description.qt3
|
||||||
|
Qt is a program library for developing applications with graphical user
|
||||||
|
interfaces. It allows you to rapidly develop professional programs. The
|
||||||
|
Qt library is available not only for Linux but for a great number of
|
||||||
|
Unices and even for Windows. Thus it is possible to write programs that
|
||||||
|
may be easily ported to those platforms.
|
||||||
|
|
||||||
|
You need a license for using Qt with a non-GPL application, which can
|
||||||
|
be acquired from sales@trolltech.com.
|
||||||
|
|
||||||
|
See /usr/share/doc/packages/qt3 for details about the new features of
|
||||||
|
the current Qt library!
|
||||||
|
-description.qt3
|
||||||
|
+description.qt3-devel
|
||||||
|
You need this package if you want to compile programs with Qt 3. It
|
||||||
|
contains the "Qt Crossplatform Development Kit 2". Under /usr/lib/qt3
|
||||||
|
you will find include files.
|
||||||
|
|
||||||
|
You need a license for using Qt with a non-GPL application. A license
|
||||||
|
can be acquired at sales@trolltech.com.
|
||||||
|
-description.qt3-devel
|
||||||
|
+description.qt3-devel-doc
|
||||||
|
This package contains the documentation for the Qt 3 Development Kit.
|
||||||
|
|
||||||
|
You will find documentation, precompiled examples, and a tutorial for
|
||||||
|
getting started with Qt in /usr/lib/qt3/doc.
|
||||||
|
-description.qt3-devel-doc
|
||||||
|
+description.qt3-devel-examples
|
||||||
|
This package contains small executables with code to demonstrate Qt
|
||||||
|
programming.
|
||||||
|
|
||||||
|
Have a look in /usr/share/doc/packages/qt3/examples/.
|
||||||
|
-description.qt3-devel-examples
|
||||||
|
+description.qt3-devel-tools
|
||||||
|
The designer creates .ui files. The uic generates C++ code from these
|
||||||
|
files. The package also contains the Qt Assistant (Qt documentation
|
||||||
|
browser) and the Qt Linguist (for translations).
|
||||||
|
-description.qt3-devel-tools
|
||||||
|
+description.qt3-extensions
|
||||||
|
This package contains extension libraries for Qt 3, such as the
|
||||||
|
Netscape plug-in modules.
|
||||||
|
-description.qt3-extensions
|
||||||
|
+description.qt3-man
|
||||||
|
This package contains all the man pages for all the Qt 3 classes.
|
||||||
|
-description.qt3-man
|
||||||
|
+description.qt3-mysql
|
||||||
|
Plug-in for using the MySQL database with the generic Qt database
|
||||||
|
interface.
|
||||||
|
-description.qt3-mysql
|
||||||
|
+description.qt3-postgresql
|
||||||
|
A Plug-in for using the PostgreSQL database with the generic Qt
|
||||||
|
database interface.
|
||||||
|
-description.qt3-postgresql
|
||||||
|
+description.qt3-sqlite
|
||||||
|
The Qt database supports SQLite with this plug-in. (No configured and
|
||||||
|
running daemon is required.)
|
||||||
|
-description.qt3-sqlite
|
||||||
|
+description.qt3-unixODBC
|
||||||
|
A plug-in for using UnixODBC supported databases with the generic Qt
|
||||||
|
database interface.
|
||||||
|
-description.qt3-unixODBC
|
@ -0,0 +1,12 @@
|
|||||||
|
qt3
|
||||||
|
qt3-devel
|
||||||
|
arch ppc package qt3-devel-doc
|
||||||
|
arch sparcv9 package qt3-devel-doc
|
||||||
|
arch ppc package qt3-devel-tools
|
||||||
|
arch sparcv9 package qt3-devel-tools
|
||||||
|
arch ppc package qt3-mysql
|
||||||
|
arch sparcv9 package qt3-mysql
|
||||||
|
arch ppc package qt3-postgresql
|
||||||
|
arch sparcv9 package qt3-postgresql
|
||||||
|
arch ppc package qt3-unixODBC
|
||||||
|
arch sparcv9 package qt3-unixODBC
|
@ -0,0 +1,100 @@
|
|||||||
|
|
||||||
|
function fix_qconfig_h {
|
||||||
|
mv include/qconfig.h include/qconfig.h.orig
|
||||||
|
sed -e '1i\
|
||||||
|
#ifndef SuSE_QCONFIG_ALREADY_INCLUDED \
|
||||||
|
#define SuSE_QCONFIG_ALREADY_INCLUDED 1 \
|
||||||
|
#define PLUGIN_PATH_EXTENSION "'$PLUGIN_PATH'" \
|
||||||
|
' -e s@${RPM_BUILD_ROOT}@/@ -e '$a\
|
||||||
|
#endif' include/qconfig.h.orig \
|
||||||
|
> include/qconfig.h
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
function call_configure {
|
||||||
|
EXTRA_OPTIONS=$@
|
||||||
|
OPENGL="-dlopen-opengl"
|
||||||
|
case $EXTRA_OPTIONS in
|
||||||
|
*-static*)
|
||||||
|
OPENGL="-no-dlopen-opengl"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
[ "$WLIB" == "lib64" ] && PLATFORM=linux-g++-64 || PLATFORM=linux-g++
|
||||||
|
LARGEFILE="-largefile"
|
||||||
|
XCURSOR="-xcursor"
|
||||||
|
XFT="-xft -xrender -I/usr/include/freetype2/ "
|
||||||
|
[ -e /usr/$WLIB/libmng.so ] && LIBMNG="-system-libmng -plugin-imgfmt-mng" || LIBMNG="-qt-libmng "
|
||||||
|
PGSQL="-plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server"
|
||||||
|
ODBC="-plugin-sql-odbc"
|
||||||
|
|
||||||
|
if [ -f /.buildenv ] && grep -q BUILD_BASENAME=beta- /.buildenv ; then
|
||||||
|
export NO_BRP_STRIP_DEBUG=true
|
||||||
|
export DEBUG="-debug"
|
||||||
|
else
|
||||||
|
export DEBUG="-release"
|
||||||
|
fi
|
||||||
|
|
||||||
|
PREFIX=/usr/lib/qt3/
|
||||||
|
export LD_LIBRARY_PATH="/${PWD}/lib/"
|
||||||
|
ORACLE="/opt/oracle/product/8.1.6/rdbms/demo/"
|
||||||
|
[ -d $ORACLE ] && \
|
||||||
|
ORACLE="-plugin-sql-oci -I$ORACLE" || \
|
||||||
|
ORACLE=""
|
||||||
|
|
||||||
|
for i in mkspecs/linux-*/qmake.conf ; do
|
||||||
|
sed \
|
||||||
|
-e "s,QMAKE_CFLAGS_RELEASE[\t ]*=.*,QMAKE_CFLAGS_RELEASE = $RPM_OPT_FLAGS," \
|
||||||
|
-e "s,QMAKE_CFLAGS[\t ]*=.*,QMAKE_CFLAGS = -pipe $RPM_OPT_FLAGS," \
|
||||||
|
-e "s,QMAKE_INCDIR[\t ]*=.*,QMAKE_INCDIR = /usr/include/," \
|
||||||
|
-e "s,QMAKE_LIBDIR[\t ]*=.*,QMAKE_LIBDIR = /usr/$WLIB/," \
|
||||||
|
-e "s,QMAKE_LIBDIR_X11[\t ]*=.*,QMAKE_LIBDIR_X11 = /usr/X11R6/$WLIB/," \
|
||||||
|
-e "s,QMAKE_LIBDIR_QT[\t ]*=.*,QMAKE_LIBDIR_QT = \$(QTDIR)/$WLIB/," \
|
||||||
|
-e "s,QMAKE_INCDIR_OPENGL[\t ]*=.*,QMAKE_INCDIR_OPENGL = /usr/include/," \
|
||||||
|
-e "s,QMAKE_LIBDIR_OPENGL[\t ]*=.*,QMAKE_LIBDIR_OPENGL = /usr/$WLIB/," \
|
||||||
|
$i > ${i}.new &&\
|
||||||
|
mv ${i}.new $i
|
||||||
|
done
|
||||||
|
sed -e "s/^CXXFLAGS=/CXXFLAGS= $RPM_OPT_FLAGS/" < qmake/Makefile.unix > qmake/Makefile.unix.tmp && mv qmake/Makefile.unix.tmp qmake/Makefile.unix
|
||||||
|
# ld -Bsymbolic-functions -v >& /dev/null && perl -pi -e 's/^QMAKE_VARS=$/QMAKE_VARS="QMAKE_LFLAGS=-Wl,-Bdirect QMAKE_LFLAGS+=-Wl,-Bsymbolic-functions"/' configure
|
||||||
|
|
||||||
|
# png is direct linked, other picture formats are loaded at runtime
|
||||||
|
OPTIONS="-platform $PLATFORM -qt-gif -stl $DEBUG \
|
||||||
|
-system-zlib -system-libjpeg -system-libpng \
|
||||||
|
-plugin-imgfmt-jpeg -inputmethod \
|
||||||
|
-nis -cups -ipv6 $OPENGL \
|
||||||
|
-xkb $LIBMNG -no-g++-exceptions $LARGEFILE $XCURSOR \
|
||||||
|
$XFT $XINERAMA -sm -L/usr/$WLIB -L/usr/X11R6/$WLIB \
|
||||||
|
-plugin-sql-mysql -I/usr/include/mysql/ \
|
||||||
|
-tablet $ORACLE $PGSQL $ODBC -plugin-sql-sqlite $NEWABI \
|
||||||
|
-prefix $PREFIX -libdir $PREFIX/$WLIB"
|
||||||
|
|
||||||
|
# use styles as plugins, beside platinum. leave windowsxp disabled
|
||||||
|
# nice idea, but too many dumb apps have a hardcoded style list :(
|
||||||
|
# for i in plugins/src/styles/* ; do
|
||||||
|
# if [ -d $i -a ${i##*/} != "platinum" -a ${i##*/} != "windowsxp" ]
|
||||||
|
# then OPTIONS="$OPTIONS -plugin-style-${i##*/}"
|
||||||
|
# fi
|
||||||
|
# done
|
||||||
|
|
||||||
|
[ -e /usr/$WLIB/mysql/ ] && OPTIONS="$OPTIONS -L/usr/$WLIB/mysql/"
|
||||||
|
|
||||||
|
# get sure we use the lib from the system
|
||||||
|
rm -rf src/3rdparty/{libjpeg,libmng,libpng,sqlite,zlib}
|
||||||
|
|
||||||
|
export PATH=$PWD/bin:$PATH
|
||||||
|
echo yes|./configure $OPTIONS $EXTRA_OPTIONS
|
||||||
|
|
||||||
|
# make sure we don't have a crippled qt
|
||||||
|
cp -v include/qconfig-dist.h include/qconfig.h
|
||||||
|
#grep -q "full-config\"" include/qconfig.h || { echo "build key is wrong"; exit 42; }
|
||||||
|
}
|
||||||
|
|
||||||
|
function post_install {
|
||||||
|
if echo $RPM_OPT_FLAGS | grep -q -- -g ; then
|
||||||
|
export NO_BRP_STRIP_DEBUG=true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Encoding=UTF-8
|
||||||
|
Exec=designer
|
||||||
|
Name=Qt Designer
|
||||||
|
GenericName=Interface Designer
|
||||||
|
X-KDE-StartupNotify=true
|
||||||
|
MimeType=application/x-designer;
|
||||||
|
Icon=designer
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
|
After Width: | Height: | Size: 324 B |
@ -0,0 +1,82 @@
|
|||||||
|
Index: plugins/src/sqldrivers/sqlite/sqlite.pro
|
||||||
|
===================================================================
|
||||||
|
--- plugins/src/sqldrivers/sqlite/sqlite.pro.orig
|
||||||
|
+++ plugins/src/sqldrivers/sqlite/sqlite.pro
|
||||||
|
@@ -10,6 +10,9 @@ SOURCES = smain.cpp \
|
||||||
|
|
||||||
|
unix {
|
||||||
|
OBJECTS_DIR = .obj
|
||||||
|
+ !contains( LIBS, .*sqlite.* ) {
|
||||||
|
+ LIBS *= -lsqlite
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
win32 {
|
||||||
|
@@ -23,54 +26,6 @@ win32 {
|
||||||
|
# }
|
||||||
|
}
|
||||||
|
|
||||||
|
-!contains( LIBS, .*sqlite.* ) {
|
||||||
|
- INCLUDEPATH += ../../../../src/3rdparty/sqlite
|
||||||
|
-
|
||||||
|
- HEADERS += ../../../../src/3rdparty/sqlite/btree.h \
|
||||||
|
- ../../../../src/3rdparty/sqlite/config.h \
|
||||||
|
- ../../../../src/3rdparty/sqlite/hash.h \
|
||||||
|
- ../../../../src/3rdparty/sqlite/opcodes.h \
|
||||||
|
- ../../../../src/3rdparty/sqlite/os.h \
|
||||||
|
- ../../../../src/3rdparty/sqlite/pager.h \
|
||||||
|
- ../../../../src/3rdparty/sqlite/parse.h \
|
||||||
|
- ../../../../src/3rdparty/sqlite/sqlite.h \
|
||||||
|
- ../../../../src/3rdparty/sqlite/sqliteInt.h \
|
||||||
|
- ../../../../src/3rdparty/sqlite/vdbe.h \
|
||||||
|
- ../../../../src/3rdparty/sqlite/vdbeInt.h
|
||||||
|
-
|
||||||
|
- SOURCES += ../../../../src/3rdparty/sqlite/attach.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/auth.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/btree.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/btree_rb.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/build.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/copy.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/date.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/delete.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/expr.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/func.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/hash.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/insert.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/main.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/opcodes.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/os.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/pager.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/parse.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/pragma.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/printf.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/random.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/select.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/shell.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/table.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/tokenize.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/trigger.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/update.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/util.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/vacuum.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/vdbe.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/vdbeaux.c \
|
||||||
|
- ../../../../src/3rdparty/sqlite/where.c
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
REQUIRES = sql
|
||||||
|
|
||||||
|
target.path += $$plugins.path/sqldrivers
|
||||||
|
Index: src/tools/qcstring.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/tools/qcstring.cpp.orig
|
||||||
|
+++ src/tools/qcstring.cpp
|
||||||
|
@@ -53,7 +53,7 @@
|
||||||
|
#include <ctype.h>
|
||||||
|
#include <limits.h>
|
||||||
|
#ifndef QT_NO_COMPRESS
|
||||||
|
-#include "../3rdparty/zlib/zlib.h"
|
||||||
|
+#include <zlib.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/*****************************************************************************
|
@ -0,0 +1,10 @@
|
|||||||
|
--- plugins/src/accessible/widgets/widgets.pro
|
||||||
|
+++ plugins/src/accessible/widgets/widgets.pro
|
||||||
|
@@ -13,3 +13,7 @@
|
||||||
|
|
||||||
|
HEADERS += qaccessiblewidget.h \
|
||||||
|
qaccessiblemenu.h
|
||||||
|
+
|
||||||
|
+target.path += $$plugins.path/accessible
|
||||||
|
+INSTALLS += target
|
||||||
|
+
|
@ -0,0 +1,13 @@
|
|||||||
|
Index: tools/assistant/lib/qassistantclient.cpp
|
||||||
|
===================================================================
|
||||||
|
--- tools/assistant/lib/qassistantclient.cpp.orig
|
||||||
|
+++ tools/assistant/lib/qassistantclient.cpp
|
||||||
|
@@ -135,7 +135,7 @@ TQAssistantClient::TQAssistantClient( co
|
||||||
|
: TQObject( parent, name ), host ( "localhost" )
|
||||||
|
{
|
||||||
|
if ( path.isEmpty() )
|
||||||
|
- assistantCommand = "assistant";
|
||||||
|
+ assistantCommand = "/usr/lib/qt3/bin/assistant";
|
||||||
|
else {
|
||||||
|
TQFileInfo fi( path );
|
||||||
|
if ( fi.isDir() )
|
@ -0,0 +1,11 @@
|
|||||||
|
--- src/kernel/qtranslator.cpp
|
||||||
|
+++ src/kernel/qtranslator.cpp
|
||||||
|
@@ -1015,7 +1015,7 @@
|
||||||
|
char con[256];
|
||||||
|
for ( ;; ) {
|
||||||
|
t >> len;
|
||||||
|
- if ( len == 0 )
|
||||||
|
+ if ( len == 0 || t.atEnd())
|
||||||
|
return TQTranslatorMessage();
|
||||||
|
t.readRawBytes( con, len );
|
||||||
|
con[len] = '\0';
|
@ -0,0 +1,43 @@
|
|||||||
|
Index: src/kernel/qtaddons_x11.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/kernel/qtaddons_x11.cpp.orig
|
||||||
|
+++ src/kernel/qtaddons_x11.cpp
|
||||||
|
@@ -22,6 +22,10 @@
|
||||||
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
+#ifndef TQT_CLEAN_NAMESPACE
|
||||||
|
+#define TQT_CLEAN_NAMESPACE
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include "qt_x11_p.h"
|
||||||
|
|
||||||
|
#if !defined(QT_NO_XFTFREETYPE) && !defined(QT_XFT2)
|
||||||
|
Index: src/kernel/qt_x11_p.h
|
||||||
|
===================================================================
|
||||||
|
--- src/kernel/qt_x11_p.h.orig
|
||||||
|
+++ src/kernel/qt_x11_p.h
|
||||||
|
@@ -86,7 +86,7 @@
|
||||||
|
|
||||||
|
|
||||||
|
// the wacom tablet (currently just the IRIX version)
|
||||||
|
-#if defined (QT_TABLET_SUPPORT)
|
||||||
|
+#if defined (QT_TABLET_SUPPORT) && defined (TQT_CLEAN_NAMESPACE)
|
||||||
|
# include <X11/extensions/XInput.h>
|
||||||
|
#if defined (Q_OS_IRIX)
|
||||||
|
# include <wacom.h> // wacom driver defines for IRIX (quite handy)
|
||||||
|
Index: src/kernel/qwidget_x11.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/kernel/qwidget_x11.cpp.orig
|
||||||
|
+++ src/kernel/qwidget_x11.cpp
|
||||||
|
@@ -38,6 +38,10 @@
|
||||||
|
**
|
||||||
|
**********************************************************************/
|
||||||
|
|
||||||
|
+#ifndef TQT_CLEAN_NAMESPACE
|
||||||
|
+#define TQT_CLEAN_NAMESPACE
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#include "ntqapplication.h"
|
||||||
|
#include "qapplication_p.h"
|
||||||
|
#include "ntqnamespace.h"
|
@ -0,0 +1,44 @@
|
|||||||
|
Index: src/tools/qvaluevector.h
|
||||||
|
===================================================================
|
||||||
|
--- src/tools/qvaluevector.h.orig 2008-01-15 20:09:13.000000000 +0100
|
||||||
|
+++ src/tools/qvaluevector.h 2011-03-31 20:15:15.904712567 +0200
|
||||||
|
@@ -246,7 +246,7 @@ public:
|
||||||
|
typedef const value_type& const_reference;
|
||||||
|
typedef size_t size_type;
|
||||||
|
#ifndef TQT_NO_STL
|
||||||
|
- typedef ptrdiff_t difference_type;
|
||||||
|
+ typedef std::ptrdiff_t difference_type;
|
||||||
|
#else
|
||||||
|
typedef int difference_type;
|
||||||
|
#endif
|
||||||
|
Index: src/tools/qmap.h
|
||||||
|
===================================================================
|
||||||
|
--- src/tools/qmap.h.orig 2008-01-15 20:09:13.000000000 +0100
|
||||||
|
+++ src/tools/qmap.h 2011-03-31 20:24:35.802101605 +0200
|
||||||
|
@@ -108,7 +108,7 @@ class TQMapIterator
|
||||||
|
#endif
|
||||||
|
typedef T value_type;
|
||||||
|
#ifndef TQT_NO_STL
|
||||||
|
- typedef ptrdiff_t difference_type;
|
||||||
|
+ typedef std::ptrdiff_t difference_type;
|
||||||
|
#else
|
||||||
|
typedef int difference_type;
|
||||||
|
#endif
|
||||||
|
@@ -224,7 +224,7 @@ class TQMapConstIterator
|
||||||
|
#endif
|
||||||
|
typedef T value_type;
|
||||||
|
#ifndef TQT_NO_STL
|
||||||
|
- typedef ptrdiff_t difference_type;
|
||||||
|
+ typedef std::ptrdiff_t difference_type;
|
||||||
|
#else
|
||||||
|
typedef int difference_type;
|
||||||
|
#endif
|
||||||
|
@@ -605,7 +605,7 @@ public:
|
||||||
|
typedef value_type& reference;
|
||||||
|
typedef const value_type& const_reference;
|
||||||
|
#ifndef TQT_NO_STL
|
||||||
|
- typedef ptrdiff_t difference_type;
|
||||||
|
+ typedef std::ptrdiff_t difference_type;
|
||||||
|
#else
|
||||||
|
typedef int difference_type;
|
||||||
|
#endif
|
@ -0,0 +1,60 @@
|
|||||||
|
--- src/3rdparty/libmng/aclocal.m4
|
||||||
|
+++ src/3rdparty/libmng/aclocal.m4
|
||||||
|
@@ -1607,7 +1607,7 @@
|
||||||
|
# If the export-symbols file already is a .def file (1st line
|
||||||
|
# is EXPORTS), use it as is.
|
||||||
|
# If DATA tags from a recent dlltool are present, honour them!
|
||||||
|
- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
||||||
|
+ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
||||||
|
cp $export_symbols $output_objdir/$soname-def;
|
||||||
|
else
|
||||||
|
echo EXPORTS > $output_objdir/$soname-def;
|
||||||
|
@@ -3546,7 +3546,7 @@
|
||||||
|
lt_cv_file_magic_cmd='/usr/bin/file -L'
|
||||||
|
case "$host_os" in
|
||||||
|
rhapsody* | darwin1.[[012]])
|
||||||
|
- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
|
||||||
|
+ lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n 1`
|
||||||
|
;;
|
||||||
|
*) # Darwin 1.3 on
|
||||||
|
lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
|
||||||
|
--- src/3rdparty/libmng/config.guess
|
||||||
|
+++ src/3rdparty/libmng/config.guess
|
||||||
|
@@ -319,7 +319,7 @@
|
||||||
|
echo m68k-sun-sunos${UNAME_RELEASE}
|
||||||
|
exit 0 ;;
|
||||||
|
sun*:*:4.2BSD:*)
|
||||||
|
- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
|
||||||
|
+ UNAME_RELEASE=`(head -n 1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
|
||||||
|
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
|
||||||
|
case "`/bin/arch`" in
|
||||||
|
sun3)
|
||||||
|
@@ -506,7 +506,7 @@
|
||||||
|
fi
|
||||||
|
exit 0 ;;
|
||||||
|
*:AIX:*:[45])
|
||||||
|
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
|
||||||
|
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -n 1 | awk '{ print $1 }'`
|
||||||
|
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
|
||||||
|
IBM_ARCH=rs6000
|
||||||
|
else
|
||||||
|
--- src/3rdparty/libmng/configure
|
||||||
|
+++ src/3rdparty/libmng/configure
|
||||||
|
@@ -1956,7 +1956,7 @@
|
||||||
|
lt_cv_file_magic_cmd='/usr/bin/file -L'
|
||||||
|
case "$host_os" in
|
||||||
|
rhapsody* | darwin1.[012])
|
||||||
|
- lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
|
||||||
|
+ lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -n 1`
|
||||||
|
;;
|
||||||
|
*) # Darwin 1.3 on
|
||||||
|
lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
|
||||||
|
@@ -3433,7 +3433,7 @@
|
||||||
|
# If the export-symbols file already is a .def file (1st line
|
||||||
|
# is EXPORTS), use it as is.
|
||||||
|
# If DATA tags from a recent dlltool are present, honour them!
|
||||||
|
- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
|
||||||
|
+ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
|
||||||
|
cp $export_symbols $output_objdir/$soname-def;
|
||||||
|
else
|
||||||
|
echo EXPORTS > $output_objdir/$soname-def;
|
@ -0,0 +1,10 @@
|
|||||||
|
--- src/widgets/qpopupmenu.cpp
|
||||||
|
+++ src/widgets/qpopupmenu.cpp
|
||||||
|
@@ -1391,6 +1391,7 @@
|
||||||
|
performDelayedChanges();
|
||||||
|
updateSize(TRUE);
|
||||||
|
TQWidget::show();
|
||||||
|
+ updateSize();
|
||||||
|
popupActive = -1;
|
||||||
|
if(style().styleHint(TQStyle::SH_PopupMenu_SubMenuPopupDelay, this))
|
||||||
|
d->mouseMoveBuffer = TQRegion();
|
@ -0,0 +1,12 @@
|
|||||||
|
--- src/tools/qgpluginmanager.cpp
|
||||||
|
+++ src/tools/qgpluginmanager.cpp 2004/09/25 11:46:41
|
||||||
|
@@ -380,6 +380,9 @@
|
||||||
|
TQString basename = (*git).left( (*git).find( TQChar(0xfffd) ) );
|
||||||
|
++git;
|
||||||
|
|
||||||
|
+ // WARNING: this line should only exist on lib64 systems !
|
||||||
|
+ basename += ".lib64";
|
||||||
|
+
|
||||||
|
TQStringList sameBasename;
|
||||||
|
while( git != group.end() &&
|
||||||
|
basename == (*git).left( (*git).find( TQChar(0xfffd) ) ) ) {
|
@ -0,0 +1,92 @@
|
|||||||
|
Index: src/kernel/qasyncimageio.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/kernel/qasyncimageio.cpp.orig
|
||||||
|
+++ src/kernel/qasyncimageio.cpp
|
||||||
|
@@ -904,7 +904,12 @@ int TQGIFFormat::decode(TQImage& img, TQ
|
||||||
|
sheight = newtop + newheight;
|
||||||
|
|
||||||
|
if (img.isNull()) {
|
||||||
|
- img.create(swidth, sheight, 32);
|
||||||
|
+ bool ok = img.create(swidth, sheight, 32);
|
||||||
|
+ if (!ok)
|
||||||
|
+ {
|
||||||
|
+ state = Error;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
memset( img.bits(), 0, img.numBytes() );
|
||||||
|
if (consumer) consumer->setSize(swidth, sheight);
|
||||||
|
}
|
||||||
|
@@ -959,9 +964,15 @@ int TQGIFFormat::decode(TQImage& img, TQ
|
||||||
|
if (backingstore.width() < w
|
||||||
|
|| backingstore.height() < h) {
|
||||||
|
// We just use the backing store as a byte array
|
||||||
|
- backingstore.create( TQMAX(backingstore.width(), w),
|
||||||
|
+ bool ok = backingstore.create(
|
||||||
|
+ TQMAX(backingstore.width(), w),
|
||||||
|
TQMAX(backingstore.height(), h),
|
||||||
|
32);
|
||||||
|
+ if (!ok)
|
||||||
|
+ {
|
||||||
|
+ state = Error;
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
memset( img.bits(), 0, img.numBytes() );
|
||||||
|
}
|
||||||
|
for (int ln=0; ln<h; ln++) {
|
||||||
|
Index: src/kernel/qimage.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/kernel/qimage.cpp.orig
|
||||||
|
+++ src/kernel/qimage.cpp
|
||||||
|
@@ -68,6 +68,8 @@
|
||||||
|
#define QT_NO_IMAGE_16_BIT
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+int qt_max_image_height = 0;
|
||||||
|
+int qt_max_image_width = 0;
|
||||||
|
|
||||||
|
/*!
|
||||||
|
\class TQImage
|
||||||
|
@@ -1211,6 +1213,28 @@ void TQImage::setAlphaBuffer( bool enabl
|
||||||
|
data->alpha = enable;
|
||||||
|
}
|
||||||
|
|
||||||
|
+TQSize TQImage::maxImageSize()
|
||||||
|
+{
|
||||||
|
+ if (!qt_max_image_height || !qt_max_image_width)
|
||||||
|
+ return TQSize();
|
||||||
|
+ return TQSize(qt_max_image_height, qt_max_image_width);
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void TQImage::setMaxImageSize(const TQSize &size)
|
||||||
|
+{
|
||||||
|
+ if (size.isValid())
|
||||||
|
+ {
|
||||||
|
+ qt_max_image_height = size.height();
|
||||||
|
+ qt_max_image_width = size.width();
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ {
|
||||||
|
+ qt_max_image_height = 0;
|
||||||
|
+ qt_max_image_width = 0;
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
|
||||||
|
/*!
|
||||||
|
Sets the image \a width, \a height, \a depth, its number of colors
|
||||||
|
@@ -1240,6 +1264,14 @@ bool TQImage::create( int width, int hei
|
||||||
|
reset(); // reset old data
|
||||||
|
if ( width <= 0 || height <= 0 || depth <= 0 || numColors < 0 )
|
||||||
|
return FALSE; // invalid parameter(s)
|
||||||
|
+ if ( qt_max_image_height && (height > qt_max_image_height * 4))
|
||||||
|
+ return FALSE; // Too high
|
||||||
|
+ if ( qt_max_image_width && (width > qt_max_image_width * 4))
|
||||||
|
+ return FALSE; // Too wide
|
||||||
|
+ if ( qt_max_image_height && qt_max_image_width &&
|
||||||
|
+ (height * width > qt_max_image_height * qt_max_image_width))
|
||||||
|
+ return FALSE; // Too large
|
||||||
|
+
|
||||||
|
if ( depth == 1 && bitOrder == IgnoreEndian ) {
|
||||||
|
#if defined(QT_CHECK_RANGE)
|
||||||
|
tqWarning( "TQImage::create: Bit order is required for 1 bpp images" );
|
@ -0,0 +1,11 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Encoding=UTF-8
|
||||||
|
Exec=linguist
|
||||||
|
Name=Qt Linguist
|
||||||
|
GenericName=Translation Tool
|
||||||
|
X-KDE-StartupNotify=true
|
||||||
|
MimeType=application/x-linguist;
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
Icon=linguist
|
||||||
|
|
After Width: | Height: | Size: 1.9 KiB |
@ -0,0 +1,30 @@
|
|||||||
|
--- src/kernel/qmngio.cpp.sav 2007-02-23 14:01:19.000000000 +0100
|
||||||
|
+++ src/kernel/qmngio.cpp 2007-08-28 15:27:28.000000000 +0200
|
||||||
|
@@ -414,8 +414,11 @@ int QMNGFormat::decode( QImage& img, QIm
|
||||||
|
}
|
||||||
|
|
||||||
|
losttime += losingtimer.elapsed();
|
||||||
|
- if ( ndata || !length )
|
||||||
|
- mng_display_resume(handle);
|
||||||
|
+ bool needmore = false;
|
||||||
|
+ if ( ndata ) {
|
||||||
|
+ mng_retcode r = mng_display_resume(handle);
|
||||||
|
+ needmore = ( r == MNG_NEEDMOREDATA );
|
||||||
|
+ }
|
||||||
|
losingtimer.start();
|
||||||
|
|
||||||
|
image = 0;
|
||||||
|
@@ -425,6 +428,13 @@ int QMNGFormat::decode( QImage& img, QIm
|
||||||
|
// Move back unused tail
|
||||||
|
memcpy(buffer,buffer+ubuffer,nbuffer);
|
||||||
|
}
|
||||||
|
+ // "The function should return without processing all the data if it reaches the end of a frame in the input."
|
||||||
|
+ if( ndata && !needmore ) {
|
||||||
|
+ length -= ndata;
|
||||||
|
+ ndata = 0;
|
||||||
|
+ if( length == 0 ) // 0 means done, process at least one byte
|
||||||
|
+ length = ndata = 1;
|
||||||
|
+ }
|
||||||
|
if ( ndata ) {
|
||||||
|
// Not all used.
|
||||||
|
enlargeBuffer(nbuffer+ndata);
|
@ -0,0 +1,25 @@
|
|||||||
|
Index: mkspecs/linux-g++-64/qmake.conf
|
||||||
|
===================================================================
|
||||||
|
--- mkspecs/linux-g++-64/qmake.conf.orig
|
||||||
|
+++ mkspecs/linux-g++-64/qmake.conf
|
||||||
|
@@ -58,7 +58,7 @@ QMAKE_LFLAGS_SHLIB = -shared
|
||||||
|
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
|
||||||
|
Index: mkspecs/linux-g++/qmake.conf
|
||||||
|
===================================================================
|
||||||
|
--- mkspecs/linux-g++/qmake.conf.orig
|
||||||
|
+++ mkspecs/linux-g++/qmake.conf
|
||||||
|
@@ -55,7 +55,6 @@ QMAKE_LFLAGS_SHLIB = -shared
|
||||||
|
QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB
|
||||||
|
QMAKE_LFLAGS_SONAME = -Wl,-soname,
|
||||||
|
QMAKE_LFLAGS_THREAD =
|
||||||
|
-QMAKE_RPATH = -Wl,-rpath,
|
||||||
|
|
||||||
|
QMAKE_LIBS =
|
||||||
|
QMAKE_LIBS_DYNLOAD = -ldl
|
@ -0,0 +1,20 @@
|
|||||||
|
Index: src/kernel/qfontdatabase.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/kernel/qfontdatabase.cpp.orig
|
||||||
|
+++ src/kernel/qfontdatabase.cpp
|
||||||
|
@@ -2476,11 +2476,14 @@ void TQFontDatabase::parseFontName(const
|
||||||
|
int i = name.find('[');
|
||||||
|
int li = name.findRev(']');
|
||||||
|
|
||||||
|
- if (i < li) {
|
||||||
|
+ if (i > 0 && i + 1 < li) {
|
||||||
|
foundry = name.mid(i + 1, li - i - 1);
|
||||||
|
if (name[i - 1] == ' ')
|
||||||
|
i--;
|
||||||
|
family = name.left(i);
|
||||||
|
+ } else {
|
||||||
|
+ foundry = TQString::null;
|
||||||
|
+ family = name;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
foundry = TQString::null;
|
@ -0,0 +1,11 @@
|
|||||||
|
--- src/tools/qgpluginmanager.cpp
|
||||||
|
+++ src/tools/qgpluginmanager.cpp
|
||||||
|
@@ -389,6 +389,8 @@
|
||||||
|
sameBasename << (*git).mid( (*git).find( TQChar(0xfffd) ) + 1 );
|
||||||
|
++git;
|
||||||
|
}
|
||||||
|
+ if( !sameBasename.isEmpty())
|
||||||
|
+ sameBasename.prepend( lib );
|
||||||
|
|
||||||
|
if ( sameBasename.isEmpty() ) {
|
||||||
|
that->addLibrary( new TQComLibrary( lib ) );
|
@ -0,0 +1,14 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# This script is called automatically during autobuild checkin.
|
||||||
|
|
||||||
|
cp -fl qt3.changes qt3-extensions.changes
|
||||||
|
cp -fl qt3.changes qt3-devel-doc.changes
|
||||||
|
|
||||||
|
for spec in qt3-extensions.spec qt3-devel-doc.spec; do
|
||||||
|
{ sed -n -e '1,/COMMON-BEGIN/p' $spec.in
|
||||||
|
sed -n -e '/COMMON-BEGIN/,/COMMON-END/p' qt3.spec
|
||||||
|
sed -n -e '/COMMON-END/,$p' $spec.in; } > $spec.tmp && perl update_spec.pl $spec.tmp attributes > $spec && rm $spec.tmp
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
|
osc service localrun format_spec_file
|
@ -0,0 +1,52 @@
|
|||||||
|
Index: src/kernel/qapplication.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/kernel/qapplication.cpp.orig
|
||||||
|
+++ src/kernel/qapplication.cpp
|
||||||
|
@@ -320,6 +320,7 @@ void tqt_init( int *, char **, TQApplica
|
||||||
|
void tqt_cleanup();
|
||||||
|
#if defined(Q_WS_X11)
|
||||||
|
void tqt_init( Display* dpy, TQt::HANDLE, TQt::HANDLE );
|
||||||
|
+void tqt_init( int *, char **, Display* dpy, TQt::HANDLE, TQt::HANDLE );
|
||||||
|
#endif
|
||||||
|
Q_EXPORT bool tqt_tryModalHelper( TQWidget *widget, TQWidget **rettop );
|
||||||
|
|
||||||
|
@@ -909,6 +910,7 @@ TQApplication::TQApplication(Display *dp
|
||||||
|
tqt_init( &argc, argv, GuiClient );
|
||||||
|
} else {
|
||||||
|
tqt_init(dpy, visual, colormap);
|
||||||
|
+ tqt_init(&argc, argv, dpy, visual, colormap);
|
||||||
|
}
|
||||||
|
|
||||||
|
process_cmdline( &argc, argv );
|
||||||
|
Index: src/kernel/qapplication_x11.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/kernel/qapplication_x11.cpp.orig
|
||||||
|
+++ src/kernel/qapplication_x11.cpp
|
||||||
|
@@ -201,6 +201,7 @@ static bool mwIconic = FALSE; // main wi
|
||||||
|
static Display *appDpy = 0; // X11 application display
|
||||||
|
static char *appDpyName = 0; // X11 display name
|
||||||
|
static bool appForeignDpy = FALSE; // we didn't create display
|
||||||
|
+Q_EXPORT bool qt_no_foreign_hack = FALSE;
|
||||||
|
static bool appSync = FALSE; // X11 synchronization
|
||||||
|
#if defined(QT_DEBUG)
|
||||||
|
static bool appNoGrab = FALSE; // X11 grabbing enabled
|
||||||
|
@@ -1652,7 +1653,7 @@ void tqt_init_internal( int *argcptr, ch
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- if ( display ) {
|
||||||
|
+ if ( display && ! qt_no_foreign_hack ) {
|
||||||
|
// TQt part of other application
|
||||||
|
|
||||||
|
appForeignDpy = TRUE;
|
||||||
|
@@ -2465,6 +2466,10 @@ void tqt_init( Display *display, TQt::HA
|
||||||
|
tqt_init_internal( 0, 0, display, visual, colormap );
|
||||||
|
}
|
||||||
|
|
||||||
|
+void tqt_init( int *argcptr, char **argv, Display *display, TQt::HANDLE visual, TQt::HANDLE colormap )
|
||||||
|
+{
|
||||||
|
+ tqt_init_internal( argcptr, argv, display, visual, colormap );
|
||||||
|
+}
|
||||||
|
|
||||||
|
/*****************************************************************************
|
||||||
|
tqt_cleanup() - cleans up when the application is finished
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,197 @@
|
|||||||
|
#
|
||||||
|
# spec file for package qt3-devel-doc
|
||||||
|
#
|
||||||
|
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
# norootforbuild
|
||||||
|
|
||||||
|
|
||||||
|
Name: qt3-devel-doc
|
||||||
|
BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ pkgconfig qt3-devel update-desktop-files
|
||||||
|
%if %suse_version < 1130
|
||||||
|
BuildRequires: libpng-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: libpng14-devel
|
||||||
|
%endif
|
||||||
|
Url: http://www.trolltech.com/
|
||||||
|
License: GPL, QPL
|
||||||
|
AutoReqProv: on
|
||||||
|
Summary: Documentation for the Qt 3 Development Kit
|
||||||
|
Group: Documentation/HTML
|
||||||
|
Version: 3.4.0
|
||||||
|
Release: 1
|
||||||
|
PreReq: /bin/grep
|
||||||
|
BuildArch: noarch
|
||||||
|
Provides: qt3-devel-tutorial
|
||||||
|
Obsoletes: qt3-devel-tutorial
|
||||||
|
Requires: qt3-devel
|
||||||
|
# COMMON-BEGIN
|
||||||
|
# COMMON-BEGIN
|
||||||
|
Source0: qt3-%{version}.tar.bz2
|
||||||
|
Source1: build_script.sh
|
||||||
|
Source2: qtconfig3.desktop
|
||||||
|
Source3: qtrc
|
||||||
|
Source4: assistant3.png
|
||||||
|
Source6: assistant3.desktop
|
||||||
|
Source7: designer.desktop
|
||||||
|
Source8: designer.png
|
||||||
|
Source9: linguist.desktop
|
||||||
|
Source5: linguist.png
|
||||||
|
Source10: qt3.sh
|
||||||
|
Source11: qt3.csh
|
||||||
|
# Translations did not change
|
||||||
|
Source12: qt3-3.3.8b-translations.tar.bz2
|
||||||
|
Source102: baselibs.conf
|
||||||
|
Source200: attributes
|
||||||
|
Source201: update_spec.pl
|
||||||
|
Patch1: aliasing.diff
|
||||||
|
Patch2: head.diff
|
||||||
|
Patch4: qt3-never-strip.diff
|
||||||
|
Patch5: external-libs.diff
|
||||||
|
Patch12: qtrc-path.diff
|
||||||
|
Patch14: lib64-plugin-support.diff
|
||||||
|
Patch15: pluginmanager-fix.diff
|
||||||
|
Patch18: no-rpath.dif
|
||||||
|
Patch19: shut-up.diff
|
||||||
|
Patch23: fix-accessible.diff
|
||||||
|
Patch31: limit-image-size.diff
|
||||||
|
Patch35: qt-transparency.patch
|
||||||
|
Patch37: 0055-qtextedit_zoom.patch
|
||||||
|
Patch39: fix-qtranslator-crash.diff
|
||||||
|
Patch54: kmenu-search-fix.diff
|
||||||
|
Patch113: fix-assistant-path.patch
|
||||||
|
Patch117: qtimer-debug.diff
|
||||||
|
Patch127: mng-reading-fix.patch
|
||||||
|
Patch134: fix-xinput-clash.diff
|
||||||
|
Patch135: parseFontName.diff
|
||||||
|
Patch136: qt3-no-date.diff
|
||||||
|
Patch139: gcc46.diff
|
||||||
|
Patch140: revert-iodbc-to-uodbc.diff
|
||||||
|
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
|
%description
|
||||||
|
This package contains the documentation for the Qt 3 Development Kit.
|
||||||
|
|
||||||
|
You will find documentation, precompiled examples, and a tutorial for
|
||||||
|
getting started with Qt in /usr/lib/qt3/doc.
|
||||||
|
|
||||||
|
This package contains the documentation for the Qt 3 Development Kit.
|
||||||
|
|
||||||
|
You will find documentation, precompiled examples, and a tutorial for
|
||||||
|
getting started with Qt in /usr/lib/qt3/doc.
|
||||||
|
|
||||||
|
%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
%patch1
|
||||||
|
%patch2
|
||||||
|
%patch4
|
||||||
|
%patch5
|
||||||
|
%patch12
|
||||||
|
if [ "%_lib" = "lib64" ]; then
|
||||||
|
%patch14
|
||||||
|
fi
|
||||||
|
%patch15
|
||||||
|
%patch18
|
||||||
|
%patch19
|
||||||
|
%patch23
|
||||||
|
%patch31
|
||||||
|
%patch35
|
||||||
|
%patch37
|
||||||
|
%patch39
|
||||||
|
%patch54
|
||||||
|
%patch113
|
||||||
|
%patch117
|
||||||
|
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
|
||||||
|
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
|
||||||
|
ln -sf $PWD/src/kernel/qinputcontext.h include/
|
||||||
|
ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/
|
||||||
|
ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/
|
||||||
|
%patch127
|
||||||
|
%patch134
|
||||||
|
%patch135
|
||||||
|
%patch136
|
||||||
|
%patch139
|
||||||
|
%patch140
|
||||||
|
cd translations
|
||||||
|
tar xvjf %SOURCE12
|
||||||
|
cd ..
|
||||||
|
# COMMON-END
|
||||||
|
# COMMON-END
|
||||||
|
|
||||||
|
%description
|
||||||
|
This package contains the documentation for the Qt 3 Development Kit.
|
||||||
|
|
||||||
|
You will find documentation, precompiled examples, and a tutorial for
|
||||||
|
getting started with Qt in /usr/lib/qt3/doc.
|
||||||
|
|
||||||
|
This package contains the documentation for the Qt 3 Development Kit.
|
||||||
|
|
||||||
|
You will find documentation, precompiled examples, and a tutorial for
|
||||||
|
getting started with Qt in /usr/lib/qt3/doc.
|
||||||
|
|
||||||
|
%build
|
||||||
|
export VERSION=%suse_version
|
||||||
|
source %SOURCE1 %{version}
|
||||||
|
export WLIB=%_lib
|
||||||
|
export QTDIR=`pwd`
|
||||||
|
if [ %_lib == "lib64" ]; then
|
||||||
|
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DUSE_LIB64_PATHES"
|
||||||
|
fi
|
||||||
|
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
|
#
|
||||||
|
# call build from build_script.rpmrc for threaded Qt library
|
||||||
|
# only really needed tools will be builded here, all extra tools will be
|
||||||
|
# builded in qt3.spec
|
||||||
|
#
|
||||||
|
call_configure -thread -shared -no-sql-mysql -no-sql-psql -no-sql-odbc -no-sql-sqlite $OPTIONS
|
||||||
|
cd src
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
%install
|
||||||
|
export VERSION=%suse_version
|
||||||
|
export WLIB=%_lib
|
||||||
|
export QTDIR=`pwd`
|
||||||
|
source %SOURCE1 %{version}
|
||||||
|
cd src
|
||||||
|
make INSTALL_ROOT=$RPM_BUILD_ROOT install_htmldocs
|
||||||
|
cd ..
|
||||||
|
#
|
||||||
|
# install menu entries
|
||||||
|
#
|
||||||
|
%suse_update_desktop_file -i -u qtconfig3 Qt Utility DesktopSettings
|
||||||
|
%suse_update_desktop_file -i assistant3 Qt Development Documentation
|
||||||
|
|
||||||
|
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||||
|
ln -sf /usr/lib/qt3/doc/html ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||||
|
install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/doc
|
||||||
|
%doc /usr/lib/qt3/doc/html
|
||||||
|
%{_docdir}/qt3/html
|
||||||
|
/usr/share/applications/qtconfig3.desktop
|
||||||
|
/usr/share/applications/assistant3.desktop
|
||||||
|
/usr/share/pixmaps/assistant3.png
|
||||||
|
|
||||||
|
%changelog
|
@ -0,0 +1,104 @@
|
|||||||
|
#
|
||||||
|
# spec file for package qt3-devel-doc
|
||||||
|
#
|
||||||
|
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
# norootforbuild
|
||||||
|
|
||||||
|
|
||||||
|
Name: qt3-devel-doc
|
||||||
|
BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ pkgconfig update-desktop-files qt3-devel
|
||||||
|
%if %suse_version < 1130
|
||||||
|
BuildRequires: libpng-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: libpng14-devel
|
||||||
|
%endif
|
||||||
|
URL: http://www.trolltech.com/
|
||||||
|
License: GPL, QPL
|
||||||
|
Autoreqprov: on
|
||||||
|
Summary: Documentation for the Qt 3 Development Kit
|
||||||
|
Group: Documentation/HTML
|
||||||
|
Version: 3.4.0
|
||||||
|
Release: 1
|
||||||
|
PreReq: /bin/grep
|
||||||
|
BuildArch: noarch
|
||||||
|
Provides: qt3-devel-tutorial
|
||||||
|
Obsoletes: qt3-devel-tutorial
|
||||||
|
Requires: qt3-devel
|
||||||
|
# COMMON-BEGIN
|
||||||
|
# COMMON-END
|
||||||
|
|
||||||
|
%description
|
||||||
|
This package contains the documentation for the Qt 3 Development Kit.
|
||||||
|
|
||||||
|
You will find documentation, precompiled examples, and a tutorial for
|
||||||
|
getting started with Qt in /usr/lib/qt3/doc.
|
||||||
|
|
||||||
|
This package contains the documentation for the Qt 3 Development Kit.
|
||||||
|
|
||||||
|
You will find documentation, precompiled examples, and a tutorial for
|
||||||
|
getting started with Qt in /usr/lib/qt3/doc.
|
||||||
|
|
||||||
|
%build
|
||||||
|
export VERSION=%suse_version
|
||||||
|
source %SOURCE1 %{version}
|
||||||
|
export WLIB=%_lib
|
||||||
|
export QTDIR=`pwd`
|
||||||
|
if [ %_lib == "lib64" ]; then
|
||||||
|
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DUSE_LIB64_PATHES"
|
||||||
|
fi
|
||||||
|
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
|
#
|
||||||
|
# call build from build_script.rpmrc for threaded Qt library
|
||||||
|
# only really needed tools will be builded here, all extra tools will be
|
||||||
|
# builded in qt3.spec
|
||||||
|
#
|
||||||
|
call_configure -thread -shared -no-sql-mysql -no-sql-psql -no-sql-odbc -no-sql-sqlite $OPTIONS
|
||||||
|
cd src
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
cd ..
|
||||||
|
|
||||||
|
%install
|
||||||
|
export VERSION=%suse_version
|
||||||
|
export WLIB=%_lib
|
||||||
|
export QTDIR=`pwd`
|
||||||
|
source %SOURCE1 %{version}
|
||||||
|
cd src
|
||||||
|
make INSTALL_ROOT=$RPM_BUILD_ROOT install_htmldocs
|
||||||
|
cd ..
|
||||||
|
#
|
||||||
|
# install menu entries
|
||||||
|
#
|
||||||
|
%suse_update_desktop_file -i -u qtconfig3 Qt Utility DesktopSettings
|
||||||
|
%suse_update_desktop_file -i assistant3 Qt Development Documentation
|
||||||
|
|
||||||
|
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||||
|
ln -sf /usr/lib/qt3/doc/html ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||||
|
install -m 0644 %SOURCE4 $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/doc
|
||||||
|
%doc /usr/lib/qt3/doc/html
|
||||||
|
%{_docdir}/qt3/html
|
||||||
|
/usr/share/applications/qtconfig3.desktop
|
||||||
|
/usr/share/applications/assistant3.desktop
|
||||||
|
/usr/share/pixmaps/assistant3.png
|
||||||
|
|
||||||
|
%changelog
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,389 @@
|
|||||||
|
#
|
||||||
|
# spec file for package qt3-extensions
|
||||||
|
#
|
||||||
|
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
# norootforbuild
|
||||||
|
|
||||||
|
|
||||||
|
Name: qt3-extensions
|
||||||
|
BuildRequires: cups-devel krb5-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files
|
||||||
|
%if %suse_version > 1020
|
||||||
|
BuildRequires: fdupes
|
||||||
|
%endif
|
||||||
|
License: GPL, QPL
|
||||||
|
Version: 3.4.0
|
||||||
|
Release: 1
|
||||||
|
AutoReqProv: on
|
||||||
|
Requires: qt3 = %version
|
||||||
|
Group: Development/Tools/Other
|
||||||
|
Summary: Qt3 Extensions
|
||||||
|
# COMMON-BEGIN
|
||||||
|
# COMMON-BEGIN
|
||||||
|
Source0: qt3-%{version}.tar.bz2
|
||||||
|
Source1: build_script.sh
|
||||||
|
Source2: qtconfig3.desktop
|
||||||
|
Source3: qtrc
|
||||||
|
Source4: assistant3.png
|
||||||
|
Source6: assistant3.desktop
|
||||||
|
Source7: designer.desktop
|
||||||
|
Source8: designer.png
|
||||||
|
Source9: linguist.desktop
|
||||||
|
Source5: linguist.png
|
||||||
|
Source10: qt3.sh
|
||||||
|
Source11: qt3.csh
|
||||||
|
# Translations did not change
|
||||||
|
Source12: qt3-3.3.8b-translations.tar.bz2
|
||||||
|
Source102: baselibs.conf
|
||||||
|
Source200: attributes
|
||||||
|
Source201: update_spec.pl
|
||||||
|
Patch1: aliasing.diff
|
||||||
|
Patch2: head.diff
|
||||||
|
Patch4: qt3-never-strip.diff
|
||||||
|
Patch5: external-libs.diff
|
||||||
|
Patch12: qtrc-path.diff
|
||||||
|
Patch14: lib64-plugin-support.diff
|
||||||
|
Patch15: pluginmanager-fix.diff
|
||||||
|
Patch18: no-rpath.dif
|
||||||
|
Patch19: shut-up.diff
|
||||||
|
Patch23: fix-accessible.diff
|
||||||
|
Patch31: limit-image-size.diff
|
||||||
|
Patch35: qt-transparency.patch
|
||||||
|
Patch37: 0055-qtextedit_zoom.patch
|
||||||
|
Patch39: fix-qtranslator-crash.diff
|
||||||
|
Patch54: kmenu-search-fix.diff
|
||||||
|
Patch113: fix-assistant-path.patch
|
||||||
|
Patch117: qtimer-debug.diff
|
||||||
|
Patch127: mng-reading-fix.patch
|
||||||
|
Patch134: fix-xinput-clash.diff
|
||||||
|
Patch135: parseFontName.diff
|
||||||
|
Patch136: qt3-no-date.diff
|
||||||
|
Patch139: gcc46.diff
|
||||||
|
Patch140: revert-iodbc-to-uodbc.diff
|
||||||
|
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
|
%description
|
||||||
|
This package contains extension libraries for Qt 3, such as the
|
||||||
|
Netscape plug-in modules.
|
||||||
|
|
||||||
|
This package contains extension libraries for Qt 3, such as the
|
||||||
|
Netscape plug-in modules.
|
||||||
|
|
||||||
|
%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
%patch1
|
||||||
|
%patch2
|
||||||
|
%patch4
|
||||||
|
%patch5
|
||||||
|
%patch12
|
||||||
|
if [ "%_lib" = "lib64" ]; then
|
||||||
|
%patch14
|
||||||
|
fi
|
||||||
|
%patch15
|
||||||
|
%patch18
|
||||||
|
%patch19
|
||||||
|
%patch23
|
||||||
|
%patch31
|
||||||
|
%patch35
|
||||||
|
%patch37
|
||||||
|
%patch39
|
||||||
|
%patch54
|
||||||
|
%patch113
|
||||||
|
%patch117
|
||||||
|
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
|
||||||
|
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
|
||||||
|
ln -sf $PWD/src/kernel/qinputcontext.h include/
|
||||||
|
ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/
|
||||||
|
ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/
|
||||||
|
%patch127
|
||||||
|
%patch134
|
||||||
|
%patch135
|
||||||
|
%patch136
|
||||||
|
%patch139
|
||||||
|
%patch140
|
||||||
|
cd translations
|
||||||
|
tar xvjf %SOURCE12
|
||||||
|
cd ..
|
||||||
|
# COMMON-END
|
||||||
|
# COMMON-END
|
||||||
|
|
||||||
|
%description
|
||||||
|
This package contains extension libraries for Qt 3, such as the
|
||||||
|
Netscape plug-in modules.
|
||||||
|
|
||||||
|
This package contains extension libraries for Qt 3, such as the
|
||||||
|
Netscape plug-in modules.
|
||||||
|
|
||||||
|
%package -n qt3-devel-examples
|
||||||
|
Summary: Programming Examples for Qt 3
|
||||||
|
AutoReqProv: on
|
||||||
|
Group: Development/Sources
|
||||||
|
Provides: qt3-examples
|
||||||
|
Obsoletes: qt3-examples
|
||||||
|
|
||||||
|
%description -n qt3-devel-examples
|
||||||
|
This package contains small executables with code to demonstrate Qt
|
||||||
|
programming.
|
||||||
|
|
||||||
|
Have a look in /usr/share/doc/packages/qt3/examples/.
|
||||||
|
|
||||||
|
%package -n qt3-mysql
|
||||||
|
Summary: MySQL Plug-In for Qt
|
||||||
|
Provides: qt3_database_plugin
|
||||||
|
Group: Productivity/Databases/Clients
|
||||||
|
|
||||||
|
%description -n qt3-mysql
|
||||||
|
Plug-in for using the MySQL database with the generic Qt database
|
||||||
|
interface.
|
||||||
|
|
||||||
|
%package -n qt3-unixODBC
|
||||||
|
Summary: A UnixODBC Plug-In for Qt
|
||||||
|
Provides: qt3_database_plugin
|
||||||
|
Group: Productivity/Databases/Clients
|
||||||
|
|
||||||
|
%description -n qt3-unixODBC
|
||||||
|
A plug-in for using UnixODBC supported databases with the generic Qt
|
||||||
|
database interface.
|
||||||
|
|
||||||
|
%package -n qt3-postgresql
|
||||||
|
Summary: A PostgreSQL Plug-In for Qt
|
||||||
|
Provides: qt3_database_plugin
|
||||||
|
Group: Productivity/Databases/Clients
|
||||||
|
|
||||||
|
%description -n qt3-postgresql
|
||||||
|
A Plug-in for using the PostgreSQL database with the generic Qt
|
||||||
|
database interface.
|
||||||
|
|
||||||
|
%package -n qt3-sqlite
|
||||||
|
Summary: SQLite Database Plug-In for Qt
|
||||||
|
Provides: qt3_database_plugin
|
||||||
|
Group: Development/Tools/Other
|
||||||
|
|
||||||
|
%description -n qt3-sqlite
|
||||||
|
The Qt database supports SQLite with this plug-in. (No configured and
|
||||||
|
running daemon is required.)
|
||||||
|
|
||||||
|
%package -n qt3-devel-tools
|
||||||
|
Summary: User Interface Builder and other tools (designer, assistant, linguist)
|
||||||
|
AutoReqProv: on
|
||||||
|
Requires: qt3-devel = %version
|
||||||
|
Provides: qt3-designer
|
||||||
|
Obsoletes: qt3-designer
|
||||||
|
Group: Development/Tools/GUI Builders
|
||||||
|
|
||||||
|
%description -n qt3-devel-tools
|
||||||
|
The designer creates .ui files. The uic generates C++ code from these
|
||||||
|
files. The package also contains the Qt Assistant (Qt documentation
|
||||||
|
browser) and the Qt Linguist (for translations).
|
||||||
|
|
||||||
|
%package -n qt3-man
|
||||||
|
Summary: Qt 3 Man Pages
|
||||||
|
AutoReqProv: on
|
||||||
|
Requires: qt3-devel = %version
|
||||||
|
Conflicts: qtman qt-man
|
||||||
|
Group: Documentation/Man
|
||||||
|
|
||||||
|
%description -n qt3-man
|
||||||
|
This package contains all the man pages for all the Qt 3 classes.
|
||||||
|
|
||||||
|
%build
|
||||||
|
export QTDIR=/usr/lib/qt3/
|
||||||
|
export WLIB=%_lib
|
||||||
|
export VERSION=%suse_version
|
||||||
|
source %{SOURCE1} %{version}
|
||||||
|
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
|
#
|
||||||
|
# compile threaded version to build all tools.
|
||||||
|
# the lib itself becomes packaged from qt3.spec
|
||||||
|
#
|
||||||
|
call_configure -thread -shared -L$PWD/%_lib $OPTIONS
|
||||||
|
ln -sf /usr/lib/qt3/%_lib/* lib/
|
||||||
|
ln -sf /usr/lib/qt3/bin/* bin/
|
||||||
|
cd plugins/src
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||||
|
cd -
|
||||||
|
#
|
||||||
|
# build examples
|
||||||
|
#
|
||||||
|
cd tools/assistant/lib
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
cd -
|
||||||
|
cd examples
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
cd -
|
||||||
|
#
|
||||||
|
# build extra tools
|
||||||
|
#
|
||||||
|
cd tools
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||||
|
for i in qvfb qembed qconfig msg2qm mergetr ; do
|
||||||
|
cd "$i" && make %{?jobs:-j%jobs} && install -m 0755 $i ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/ && cd -
|
||||||
|
done
|
||||||
|
cd ..
|
||||||
|
install -m 0755 bin/findtr bin/qt20fix bin/qtrename140 ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/
|
||||||
|
if [ %_lib = lib64 ]; then
|
||||||
|
for i in $RPM_BUILD_ROOT/usr/lib/qt3/plugins/*/*.so; do
|
||||||
|
mv "$i" "${i%.so}.lib64.so"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
%install
|
||||||
|
export WLIB=%_lib
|
||||||
|
export VERSION=%suse_version
|
||||||
|
source %{SOURCE1}
|
||||||
|
post_install $RPM_BUILD_ROOT/usr/lib/qt3/
|
||||||
|
#
|
||||||
|
# create default doc dir
|
||||||
|
#
|
||||||
|
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_docdir}/qt3/
|
||||||
|
#
|
||||||
|
# create links in ld.so.conf path
|
||||||
|
#
|
||||||
|
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}
|
||||||
|
#install -d -m 0755 ${RPM_BUILD_ROOT}/usr/bin/
|
||||||
|
#ln -sf ../lib/qt3/bin/designer ${RPM_BUILD_ROOT}/usr/bin/designer
|
||||||
|
#ln -sf ../lib/qt3/bin/linguist ${RPM_BUILD_ROOT}/usr/bin/linguist
|
||||||
|
%suse_update_desktop_file -i designer Qt Development GUIDesigner
|
||||||
|
%suse_update_desktop_file -i linguist Qt Development Translation
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||||
|
perl -pi -e 's/Icon=designer/Icon=designer3/' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop
|
||||||
|
perl -pi -e 's,Exec=designer,Exec=/usr/lib/qt3/bin/designer,' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop
|
||||||
|
mv ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop ${RPM_BUILD_ROOT}/usr/share/applications/designer3.desktop
|
||||||
|
install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png
|
||||||
|
rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/designer.png
|
||||||
|
perl -pi -e 's,Exec=linguist,Exec=/usr/lib/qt3/bin/linguist,' ${RPM_BUILD_ROOT}/usr/share/applications/linguist.desktop
|
||||||
|
perl -pi -e 's,Icon=linguist,Icon=linguist3,' ${RPM_BUILD_ROOT}/usr/share/applications/linguist.desktop
|
||||||
|
mv ${RPM_BUILD_ROOT}/usr/share/pixmaps/linguist.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/linguist3.png
|
||||||
|
|
||||||
|
##### these files are not getting installed by "make install" ... bug ?
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# install manpages
|
||||||
|
#
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%{_mandir}
|
||||||
|
install -d $RPM_BUILD_ROOT/%{_mandir}
|
||||||
|
cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/
|
||||||
|
#
|
||||||
|
# install examples
|
||||||
|
#
|
||||||
|
install -d ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/
|
||||||
|
find ./examples/ \
|
||||||
|
-name \*.o -o -name .obj -o -name .moc -o -name Makefile \
|
||||||
|
| xargs rm -rf
|
||||||
|
cp -a examples ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/
|
||||||
|
ln -sf /usr/lib/qt3/doc/examples ${RPM_BUILD_ROOT}/%{_docdir}/qt3/
|
||||||
|
#
|
||||||
|
# to be sure we do not package files which are packaged in other qt3 packages
|
||||||
|
#
|
||||||
|
rpm -ql qt3 qt3-devel qt3-devel-doc \
|
||||||
|
| while read i ; do
|
||||||
|
[ -d "$i" ] || rm -f $RPM_BUILD_ROOT/"$i"
|
||||||
|
done
|
||||||
|
#
|
||||||
|
# we do have them in qt3-devel-doc already
|
||||||
|
#
|
||||||
|
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/bin/assistant
|
||||||
|
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/libqassistantclient.*
|
||||||
|
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/translations/assistant_de.qm
|
||||||
|
|
||||||
|
for l in $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.a; do
|
||||||
|
strip --strip-unneeded $l
|
||||||
|
done
|
||||||
|
|
||||||
|
%if %suse_version > 1020
|
||||||
|
%fdupes -s $RPM_BUILD_ROOT
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%pre
|
||||||
|
if test -L usr/lib/qt3; then
|
||||||
|
rm usr/lib/qt3
|
||||||
|
fi
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
|
%post
|
||||||
|
%run_ldconfig
|
||||||
|
|
||||||
|
%post -n qt3-devel-tools
|
||||||
|
%run_ldconfig
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
/usr/lib/qt3/bin/qembed
|
||||||
|
/usr/lib/qt3/bin/qvfb
|
||||||
|
|
||||||
|
%files -n qt3-mysql
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||||
|
/usr/lib/qt3/plugins/sqldrivers/libqsqlmysql*.so
|
||||||
|
|
||||||
|
%files -n qt3-postgresql
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||||
|
/usr/lib/qt3/plugins/sqldrivers/libqsqlpsql*.so
|
||||||
|
|
||||||
|
%files -n qt3-unixODBC
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||||
|
/usr/lib/qt3/plugins/sqldrivers/libqsqlodbc*.so
|
||||||
|
|
||||||
|
%files -n qt3-sqlite
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||||
|
/usr/lib/qt3/plugins/sqldrivers/libqsqlite*.so
|
||||||
|
|
||||||
|
%files -n qt3-devel-tools
|
||||||
|
%defattr(-,root,root)
|
||||||
|
#/usr/bin/designer
|
||||||
|
#/usr/bin/linguist
|
||||||
|
/usr/lib/qt3/bin/createcw
|
||||||
|
/usr/lib/qt3/bin/makeqpf
|
||||||
|
/usr/lib/qt3/bin/qconfig
|
||||||
|
/usr/lib/qt3/bin/findtr
|
||||||
|
/usr/lib/qt3/bin/qt20fix
|
||||||
|
/usr/lib/qt3/bin/qtrename140
|
||||||
|
/usr/lib/qt3/bin/msg2qm
|
||||||
|
/usr/lib/qt3/bin/mergetr
|
||||||
|
/usr/lib/qt3/bin/designer
|
||||||
|
/usr/lib/qt3/bin/linguist
|
||||||
|
/usr/lib/qt3/bin/qm2ts
|
||||||
|
/usr/lib/qt3/bin/lrelease
|
||||||
|
/usr/lib/qt3/bin/lupdate
|
||||||
|
/usr/lib/qt3/templates
|
||||||
|
/usr/lib/qt3/plugins/designer
|
||||||
|
/usr/lib/qt3/phrasebooks
|
||||||
|
/usr/lib/qt3/%_lib/libdesignercore.*
|
||||||
|
/usr/lib/qt3/%_lib/libeditor.*
|
||||||
|
/usr/share/applications/*
|
||||||
|
/usr/share/pixmaps/designer3.png
|
||||||
|
/usr/share/pixmaps/linguist3.png
|
||||||
|
|
||||||
|
%files -n qt3-devel-examples
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/doc
|
||||||
|
/%{_docdir}/qt3/examples
|
||||||
|
/usr/lib/qt3/doc/examples
|
||||||
|
|
||||||
|
%files -n qt3-man
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_mandir}/man*/*
|
||||||
|
|
||||||
|
%changelog
|
@ -0,0 +1,297 @@
|
|||||||
|
#
|
||||||
|
# spec file for package qt3-extensions
|
||||||
|
#
|
||||||
|
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
# norootforbuild
|
||||||
|
|
||||||
|
|
||||||
|
Name: qt3-extensions
|
||||||
|
BuildRequires: cups-devel krb5-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files
|
||||||
|
%if %suse_version > 1020
|
||||||
|
BuildRequires: fdupes
|
||||||
|
%endif
|
||||||
|
License: GPL, QPL
|
||||||
|
Version: 3.4.0
|
||||||
|
Release: 1
|
||||||
|
Autoreqprov: on
|
||||||
|
Requires: qt3 = %version
|
||||||
|
Group: Development/Tools/Other
|
||||||
|
Summary: Qt3 Extensions
|
||||||
|
# COMMON-BEGIN
|
||||||
|
# COMMON-END
|
||||||
|
|
||||||
|
%description
|
||||||
|
This package contains extension libraries for Qt 3, such as the
|
||||||
|
Netscape plug-in modules.
|
||||||
|
|
||||||
|
%package -n qt3-devel-examples
|
||||||
|
Summary: Programming Examples for Qt 3
|
||||||
|
Autoreqprov: on
|
||||||
|
Group: Development/Sources
|
||||||
|
Provides: qt3-examples
|
||||||
|
Obsoletes: qt3-examples
|
||||||
|
|
||||||
|
%description -n qt3-devel-examples
|
||||||
|
This package contains small executables with code to demonstrate Qt
|
||||||
|
programming.
|
||||||
|
|
||||||
|
Have a look in /usr/share/doc/packages/qt3/examples/.
|
||||||
|
|
||||||
|
%package -n qt3-mysql
|
||||||
|
Summary: MySQL Plug-In for Qt
|
||||||
|
Provides: qt3_database_plugin
|
||||||
|
Group: Productivity/Databases/Clients
|
||||||
|
|
||||||
|
%description -n qt3-mysql
|
||||||
|
Plug-in for using the MySQL database with the generic Qt database
|
||||||
|
interface.
|
||||||
|
|
||||||
|
%package -n qt3-unixODBC
|
||||||
|
Summary: A UnixODBC Plug-In for Qt
|
||||||
|
Provides: qt3_database_plugin
|
||||||
|
Group: Productivity/Databases/Clients
|
||||||
|
|
||||||
|
%description -n qt3-unixODBC
|
||||||
|
A plug-in for using UnixODBC supported databases with the generic Qt
|
||||||
|
database interface.
|
||||||
|
|
||||||
|
%package -n qt3-postgresql
|
||||||
|
Summary: A PostgreSQL Plug-In for Qt
|
||||||
|
Provides: qt3_database_plugin
|
||||||
|
Group: Productivity/Databases/Clients
|
||||||
|
|
||||||
|
%description -n qt3-postgresql
|
||||||
|
A Plug-in for using the PostgreSQL database with the generic Qt
|
||||||
|
database interface.
|
||||||
|
|
||||||
|
%package -n qt3-sqlite
|
||||||
|
Summary: SQLite Database Plug-In for Qt
|
||||||
|
Provides: qt3_database_plugin
|
||||||
|
Group: Development/Tools/Other
|
||||||
|
|
||||||
|
%description -n qt3-sqlite
|
||||||
|
The Qt database supports SQLite with this plug-in. (No configured and
|
||||||
|
running daemon is required.)
|
||||||
|
|
||||||
|
%package -n qt3-devel-tools
|
||||||
|
Summary: User Interface Builder and other tools (designer, assistant, linguist)
|
||||||
|
Autoreqprov: on
|
||||||
|
Requires: qt3-devel = %version
|
||||||
|
Provides: qt3-designer
|
||||||
|
Obsoletes: qt3-designer
|
||||||
|
Group: Development/Tools/GUI Builders
|
||||||
|
|
||||||
|
%description -n qt3-devel-tools
|
||||||
|
The designer creates .ui files. The uic generates C++ code from these
|
||||||
|
files. The package also contains the Qt Assistant (Qt documentation
|
||||||
|
browser) and the Qt Linguist (for translations).
|
||||||
|
|
||||||
|
%package -n qt3-man
|
||||||
|
Summary: Qt 3 Man Pages
|
||||||
|
Autoreqprov: on
|
||||||
|
Requires: qt3-devel = %version
|
||||||
|
Conflicts: qtman qt-man
|
||||||
|
Group: Documentation/Man
|
||||||
|
|
||||||
|
%description -n qt3-man
|
||||||
|
This package contains all the man pages for all the Qt 3 classes.
|
||||||
|
%build
|
||||||
|
export QTDIR=/usr/lib/qt3/
|
||||||
|
export WLIB=%_lib
|
||||||
|
export VERSION=%suse_version
|
||||||
|
source %{SOURCE1} %{version}
|
||||||
|
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
|
#
|
||||||
|
# compile threaded version to build all tools.
|
||||||
|
# the lib itself becomes packaged from qt3.spec
|
||||||
|
#
|
||||||
|
call_configure -thread -shared -L$PWD/%_lib $OPTIONS
|
||||||
|
ln -sf /usr/lib/qt3/%_lib/* lib/
|
||||||
|
ln -sf /usr/lib/qt3/bin/* bin/
|
||||||
|
cd plugins/src
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||||
|
cd -
|
||||||
|
#
|
||||||
|
# build examples
|
||||||
|
#
|
||||||
|
cd tools/assistant/lib
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
cd -
|
||||||
|
cd examples
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
cd -
|
||||||
|
#
|
||||||
|
# build extra tools
|
||||||
|
#
|
||||||
|
cd tools
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||||
|
for i in qvfb qembed qconfig msg2qm mergetr ; do
|
||||||
|
cd "$i" && make %{?jobs:-j%jobs} && install -m 0755 $i ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/ && cd -
|
||||||
|
done
|
||||||
|
cd ..
|
||||||
|
install -m 0755 bin/findtr bin/qt20fix bin/qtrename140 ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/
|
||||||
|
if [ %_lib = lib64 ]; then
|
||||||
|
for i in $RPM_BUILD_ROOT/usr/lib/qt3/plugins/*/*.so; do
|
||||||
|
mv "$i" "${i%.so}.lib64.so"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
%install
|
||||||
|
export WLIB=%_lib
|
||||||
|
export VERSION=%suse_version
|
||||||
|
source %{SOURCE1}
|
||||||
|
post_install $RPM_BUILD_ROOT/usr/lib/qt3/
|
||||||
|
#
|
||||||
|
# create default doc dir
|
||||||
|
#
|
||||||
|
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_docdir}/qt3/
|
||||||
|
#
|
||||||
|
# create links in ld.so.conf path
|
||||||
|
#
|
||||||
|
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}
|
||||||
|
#install -d -m 0755 ${RPM_BUILD_ROOT}/usr/bin/
|
||||||
|
#ln -sf ../lib/qt3/bin/designer ${RPM_BUILD_ROOT}/usr/bin/designer
|
||||||
|
#ln -sf ../lib/qt3/bin/linguist ${RPM_BUILD_ROOT}/usr/bin/linguist
|
||||||
|
%suse_update_desktop_file -i designer Qt Development GUIDesigner
|
||||||
|
%suse_update_desktop_file -i linguist Qt Development Translation
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps
|
||||||
|
perl -pi -e 's/Icon=designer/Icon=designer3/' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop
|
||||||
|
perl -pi -e 's,Exec=designer,Exec=/usr/lib/qt3/bin/designer,' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop
|
||||||
|
mv ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop ${RPM_BUILD_ROOT}/usr/share/applications/designer3.desktop
|
||||||
|
install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png
|
||||||
|
rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/designer.png
|
||||||
|
perl -pi -e 's,Exec=linguist,Exec=/usr/lib/qt3/bin/linguist,' ${RPM_BUILD_ROOT}/usr/share/applications/linguist.desktop
|
||||||
|
perl -pi -e 's,Icon=linguist,Icon=linguist3,' ${RPM_BUILD_ROOT}/usr/share/applications/linguist.desktop
|
||||||
|
mv ${RPM_BUILD_ROOT}/usr/share/pixmaps/linguist.png ${RPM_BUILD_ROOT}/usr/share/pixmaps/linguist3.png
|
||||||
|
|
||||||
|
##### these files are not getting installed by "make install" ... bug ?
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# install manpages
|
||||||
|
#
|
||||||
|
rm -rf $RPM_BUILD_ROOT/%{_mandir}
|
||||||
|
install -d $RPM_BUILD_ROOT/%{_mandir}
|
||||||
|
cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir}/
|
||||||
|
#
|
||||||
|
# install examples
|
||||||
|
#
|
||||||
|
install -d ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/
|
||||||
|
find ./examples/ \
|
||||||
|
-name \*.o -o -name .obj -o -name .moc -o -name Makefile \
|
||||||
|
| xargs rm -rf
|
||||||
|
cp -a examples ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/
|
||||||
|
ln -sf /usr/lib/qt3/doc/examples ${RPM_BUILD_ROOT}/%{_docdir}/qt3/
|
||||||
|
#
|
||||||
|
# to be sure we do not package files which are packaged in other qt3 packages
|
||||||
|
#
|
||||||
|
rpm -ql qt3 qt3-devel qt3-devel-doc \
|
||||||
|
| while read i ; do
|
||||||
|
[ -d "$i" ] || rm -f $RPM_BUILD_ROOT/"$i"
|
||||||
|
done
|
||||||
|
#
|
||||||
|
# we do have them in qt3-devel-doc already
|
||||||
|
#
|
||||||
|
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/bin/assistant
|
||||||
|
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/libqassistantclient.*
|
||||||
|
rm -f $RPM_BUILD_ROOT/usr/lib/qt3/translations/assistant_de.qm
|
||||||
|
|
||||||
|
for l in $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.a; do
|
||||||
|
strip --strip-unneeded $l
|
||||||
|
done
|
||||||
|
|
||||||
|
%if %suse_version > 1020
|
||||||
|
%fdupes -s $RPM_BUILD_ROOT
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
|
%pre
|
||||||
|
if test -L usr/lib/qt3; then
|
||||||
|
rm usr/lib/qt3
|
||||||
|
fi
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf ${RPM_BUILD_ROOT}
|
||||||
|
|
||||||
|
%post
|
||||||
|
%run_ldconfig
|
||||||
|
|
||||||
|
%post -n qt3-devel-tools
|
||||||
|
%run_ldconfig
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root)
|
||||||
|
/usr/lib/qt3/bin/qembed
|
||||||
|
/usr/lib/qt3/bin/qvfb
|
||||||
|
|
||||||
|
%files -n qt3-mysql
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||||
|
/usr/lib/qt3/plugins/sqldrivers/libqsqlmysql*.so
|
||||||
|
|
||||||
|
%files -n qt3-postgresql
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||||
|
/usr/lib/qt3/plugins/sqldrivers/libqsqlpsql*.so
|
||||||
|
|
||||||
|
%files -n qt3-unixODBC
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||||
|
/usr/lib/qt3/plugins/sqldrivers/libqsqlodbc*.so
|
||||||
|
|
||||||
|
%files -n qt3-sqlite
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/plugins/sqldrivers
|
||||||
|
/usr/lib/qt3/plugins/sqldrivers/libqsqlite*.so
|
||||||
|
|
||||||
|
%files -n qt3-devel-tools
|
||||||
|
%defattr(-,root,root)
|
||||||
|
#/usr/bin/designer
|
||||||
|
#/usr/bin/linguist
|
||||||
|
/usr/lib/qt3/bin/createcw
|
||||||
|
/usr/lib/qt3/bin/makeqpf
|
||||||
|
/usr/lib/qt3/bin/qconfig
|
||||||
|
/usr/lib/qt3/bin/findtr
|
||||||
|
/usr/lib/qt3/bin/qt20fix
|
||||||
|
/usr/lib/qt3/bin/qtrename140
|
||||||
|
/usr/lib/qt3/bin/msg2qm
|
||||||
|
/usr/lib/qt3/bin/mergetr
|
||||||
|
/usr/lib/qt3/bin/designer
|
||||||
|
/usr/lib/qt3/bin/linguist
|
||||||
|
/usr/lib/qt3/bin/qm2ts
|
||||||
|
/usr/lib/qt3/bin/lrelease
|
||||||
|
/usr/lib/qt3/bin/lupdate
|
||||||
|
/usr/lib/qt3/templates
|
||||||
|
/usr/lib/qt3/plugins/designer
|
||||||
|
/usr/lib/qt3/phrasebooks
|
||||||
|
/usr/lib/qt3/%_lib/libdesignercore.*
|
||||||
|
/usr/lib/qt3/%_lib/libeditor.*
|
||||||
|
/usr/share/applications/*
|
||||||
|
/usr/share/pixmaps/designer3.png
|
||||||
|
/usr/share/pixmaps/linguist3.png
|
||||||
|
|
||||||
|
%files -n qt3-devel-examples
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%dir /usr/lib/qt3/doc
|
||||||
|
/%{_docdir}/qt3/examples
|
||||||
|
/usr/lib/qt3/doc/examples
|
||||||
|
|
||||||
|
%files -n qt3-man
|
||||||
|
%defattr(-,root,root)
|
||||||
|
%{_mandir}/man*/*
|
||||||
|
|
||||||
|
%changelog
|
@ -0,0 +1,13 @@
|
|||||||
|
Index: qmake/generators/unix/unixmake.cpp
|
||||||
|
===================================================================
|
||||||
|
--- qmake/generators/unix/unixmake.cpp.orig
|
||||||
|
+++ qmake/generators/unix/unixmake.cpp
|
||||||
|
@@ -839,7 +839,7 @@ UnixMakefileGenerator::defaultInstall(co
|
||||||
|
ret += "\n\t";
|
||||||
|
ret += TQString(resource ? "-$(INSTALL_DIR)" : "-$(INSTALL_FILE)") + " \"" +
|
||||||
|
src_targ + "\" \"" + dst_targ + "\"";
|
||||||
|
- if(!project->isActiveConfig("debug") && !project->isEmpty("QMAKE_STRIP") &&
|
||||||
|
+ if(false && !project->isActiveConfig("debug") && !project->isEmpty("QMAKE_STRIP") &&
|
||||||
|
(project->first("TEMPLATE") != "lib" || !project->isActiveConfig("staticlib"))) {
|
||||||
|
ret += "\n\t-" + var("QMAKE_STRIP");
|
||||||
|
if(project->first("TEMPLATE") == "lib" && !project->isEmpty("QMAKE_STRIPFLAGS_LIB"))
|
@ -0,0 +1,65 @@
|
|||||||
|
--- src/moc/moc.y 2008-01-15 20:09:13.000000000 +0100
|
||||||
|
+++ src/moc/moc.y 2009-02-07 19:35:47.703930527 +0100
|
||||||
|
@@ -2833,7 +2833,7 @@
|
||||||
|
{
|
||||||
|
const char *hdr1 = "/****************************************************************************\n"
|
||||||
|
"** %s meta object code from reading C++ file '%s'\n**\n";
|
||||||
|
- const char *hdr2 = "** Created: %s\n"
|
||||||
|
+ const char *hdr2 = "** Created:\n"
|
||||||
|
const char *hdr3 = "** WARNING! All changes made in this file will be lost!\n";
|
||||||
|
const char *hdr4 = "*****************************************************************************/\n\n";
|
||||||
|
int i;
|
||||||
|
@@ -2872,7 +2872,7 @@
|
||||||
|
if ( i >= 0 )
|
||||||
|
fn = &g->fileName[i];
|
||||||
|
fprintf( out, hdr1, (const char*)qualifiedClassName(),(const char*)fn);
|
||||||
|
- fprintf( out, hdr2, (const char*)dstr );
|
||||||
|
+ fprintf( out, hdr2 );
|
||||||
|
fprintf( out, hdr3 );
|
||||||
|
fprintf( out, hdr4 );
|
||||||
|
|
||||||
|
diff -ru src/moc/moc_yacc.cpp src/moc/moc_yacc.cpp
|
||||||
|
--- src/moc/moc_yacc.cpp 2008-01-14 13:24:36.000000000 +0100
|
||||||
|
+++ src/moc/moc_yacc.cpp 2009-02-07 19:35:30.039680400 +0100
|
||||||
|
@@ -2872,7 +2872,7 @@
|
||||||
|
{
|
||||||
|
const char *hdr1 = "/****************************************************************************\n"
|
||||||
|
"** %s meta object code from reading C++ file '%s'\n**\n";
|
||||||
|
- const char *hdr2 = "** Created: %s\n"
|
||||||
|
+ const char *hdr2 = "** Created: \n"
|
||||||
|
"** by: The TQt MOC ($Id: qt/moc_yacc.cpp 3.3.8 edited Feb 2 14:59 $)\n**\n";
|
||||||
|
const char *hdr3 = "** WARNING! All changes made in this file will be lost!\n";
|
||||||
|
const char *hdr4 = "*****************************************************************************/\n\n";
|
||||||
|
@@ -2912,7 +2912,7 @@
|
||||||
|
if ( i >= 0 )
|
||||||
|
fn = &g->fileName[i];
|
||||||
|
fprintf( out, hdr1, (const char*)qualifiedClassName(),(const char*)fn);
|
||||||
|
- fprintf( out, hdr2, (const char*)dstr );
|
||||||
|
+ fprintf( out, hdr2 );
|
||||||
|
fprintf( out, hdr3 );
|
||||||
|
fprintf( out, hdr4 );
|
||||||
|
|
||||||
|
diff -ru tools/designer/uic/embed.cpp tools/designer/uic/embed.cpp
|
||||||
|
--- tools/designer/uic/embed.cpp 2008-01-15 20:09:14.000000000 +0100
|
||||||
|
+++ tools/designer/uic/embed.cpp 2009-02-07 19:36:25.950931409 +0100
|
||||||
|
@@ -137,7 +137,7 @@
|
||||||
|
for ( it = images.begin(); it != images.end(); ++it )
|
||||||
|
out << "** " << *it << "\n";
|
||||||
|
out << "**\n";
|
||||||
|
- out << "** Created: " << TQDateTime::currentDateTime().toString() << "\n";
|
||||||
|
+ out << "** Created:\n";
|
||||||
|
out << "**\n";
|
||||||
|
out << "** WARNING! All changes made in this file will be lost!\n";
|
||||||
|
out << "****************************************************************************/\n";
|
||||||
|
diff -ru tools/designer/uic/main.cpp tools/designer/uic/main.cpp
|
||||||
|
--- tools/designer/uic/main.cpp 2008-01-15 20:09:14.000000000 +0100
|
||||||
|
+++ tools/designer/uic/main.cpp 2009-02-07 19:36:36.603680916 +0100
|
||||||
|
@@ -320,7 +320,7 @@
|
||||||
|
out << "/****************************************************************************" << endl;
|
||||||
|
out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl;
|
||||||
|
out << "**" << endl;
|
||||||
|
- out << "** Created: " << TQDateTime::currentDateTime().toString() << endl;
|
||||||
|
+ out << "** Created:" << endl;
|
||||||
|
out << "**" << endl;
|
||||||
|
out << "** WARNING! All changes made in this file will be lost!" << endl;
|
||||||
|
out << "****************************************************************************/" << endl << endl;
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,2 @@
|
|||||||
|
set -l path=($path /usr/lib/qt3/bin)
|
||||||
|
setenv QTDIR /usr/lib/qt3
|
@ -0,0 +1,6 @@
|
|||||||
|
case ":${PATH}:" in
|
||||||
|
*:/usr/lib/qt3/bin:*) ;;
|
||||||
|
*) PATH=$PATH:/usr/lib/qt3/bin
|
||||||
|
esac
|
||||||
|
QTDIR=/usr/lib/qt3
|
||||||
|
export QTDIR
|
@ -0,0 +1,10 @@
|
|||||||
|
[Desktop Entry]
|
||||||
|
Categories=Qt;Settings;
|
||||||
|
Encoding=UTF-8
|
||||||
|
Exec=/usr/lib/qt3/bin/qtconfig
|
||||||
|
Name=Qt Settings
|
||||||
|
X-KDE-StartupNotify=true
|
||||||
|
Icon=designer3
|
||||||
|
Terminal=false
|
||||||
|
Type=Application
|
||||||
|
|
@ -0,0 +1,48 @@
|
|||||||
|
--- src/kernel/qeventloop_unix.cpp
|
||||||
|
+++ src/kernel/qeventloop_unix.cpp
|
||||||
|
@@ -517,6 +531,17 @@
|
||||||
|
return (tm->tv_sec*1000) + (tm->tv_usec/1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
+static TQString fullName(TQObject* obj)
|
||||||
|
+{
|
||||||
|
+ TQString oname;
|
||||||
|
+ if (obj && obj->name())
|
||||||
|
+ oname = TQString(obj->name()) + "(" + TQString(obj->className()) + ")";
|
||||||
|
+
|
||||||
|
+ if (obj && obj->parent())
|
||||||
|
+ return fullName(obj->parent()) + "/" + oname;
|
||||||
|
+ return oname;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int TQEventLoop::activateTimers()
|
||||||
|
{
|
||||||
|
if ( !timerList || !timerList->count() ) // no timers
|
||||||
|
@@ -552,9 +577,27 @@
|
||||||
|
t->timeout += t->interval;
|
||||||
|
if ( t->timeout < currentTime )
|
||||||
|
t->timeout = currentTime + t->interval;
|
||||||
|
+ // prefer system clock ticks for low resolution timers
|
||||||
|
+ // to save cpu power
|
||||||
|
+ if (t->interval.tv_sec * 1000 + t->interval.tv_usec / 1000 >= 1000) {
|
||||||
|
+ timeval drift;
|
||||||
|
+ drift.tv_sec = 0;
|
||||||
|
+ drift.tv_usec = (t->interval.tv_usec / 8) + (t->interval.tv_sec % 8) * 1000 * 1000 / 8;
|
||||||
|
+ timeval synced = t->timeout + drift;
|
||||||
|
+ if (synced.tv_usec < 2 * drift.tv_usec)
|
||||||
|
+ synced.tv_usec = 0;
|
||||||
|
+ t->timeout = synced;
|
||||||
|
+ }
|
||||||
|
insertTimer( t ); // relink timer
|
||||||
|
if ( t->interval.tv_usec > 0 || t->interval.tv_sec > 0 )
|
||||||
|
n_act++;
|
||||||
|
+
|
||||||
|
+ if (t->obj && getenv("TQT_DEBUG_TIMER"))
|
||||||
|
+ qDebug("qtimer: %ld/%s %d ms for %p/%s %s",
|
||||||
|
+ getpid(), qApp && qApp->name() ? qApp->name() : "",
|
||||||
|
+ t->interval.tv_sec * 1000 + t->interval.tv_usec / 1000,
|
||||||
|
+ t->obj, fullName(t->obj).latin1(), t->obj->className());
|
||||||
|
+
|
||||||
|
TQTimerEvent e( t->id );
|
||||||
|
TQApplication::sendEvent( t->obj, &e ); // send event
|
||||||
|
if ( timerList->findRef( begin ) == -1 )
|
@ -0,0 +1,28 @@
|
|||||||
|
[General]
|
||||||
|
font=Sans Serif,10,-1,5,50,0,0,0,0,0
|
||||||
|
style=plastik
|
||||||
|
enableXft=true
|
||||||
|
useXft=true
|
||||||
|
XIMInputStyle=On The Spot
|
||||||
|
resolveSymlinks=false
|
||||||
|
useRtlExtensions=true
|
||||||
|
|
||||||
|
[3.3]
|
||||||
|
libraryPath=/opt/kde3/lib64/kde3/plugins/:/opt/kde3/lib/kde3/plugins
|
||||||
|
|
||||||
|
[KWinPalette]
|
||||||
|
activeBackground=#3067a1
|
||||||
|
activeBlend=#2fb1dd
|
||||||
|
activeForeground=#ffffff
|
||||||
|
activeTitleBtnBg=#dcdcdc
|
||||||
|
frame=#eeeaee
|
||||||
|
inactiveBackground=#6e6e6e
|
||||||
|
inactiveBlend=#949494
|
||||||
|
inactiveForeground=#ffffff
|
||||||
|
inactiveFrame=#eeeaee
|
||||||
|
inactiveTitleBtnBg=#494949
|
||||||
|
|
||||||
|
[Palette]
|
||||||
|
active=#000000^e#f4f4f4^e#ffffff^e#ffffff^e#555555^e#c6c6c6^e#000000^e#ffffff^e#000000^e#ffffff^e#eeeaee^e#000000^e#447bcd^e#ffffff^e#535378^e#004000^e
|
||||||
|
disabled=#808080^e#f4f4f4^e#ffffff^e#ffffff^e#555555^e#c6c3c6^e#c6c3c6^e#ffffff^e#808080^e#ffffff^e#eeeaee^e#000000^e#000080^e#ffffff^e#535378^e#004000^e
|
||||||
|
inactive=#000000^e#f4f4f4^e#ffffff^e#ffffff^e#555555^e#c6c3c6^e#000000^e#ffffff^e#000000^e#ffffff^e#eeeaee^e#000000^e#447bcd^e#ffffff^e#535378^e#004000^e
|
@ -0,0 +1,49 @@
|
|||||||
|
Index: src/tools/qsettings.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/tools/qsettings.cpp.orig
|
||||||
|
+++ src/tools/qsettings.cpp
|
||||||
|
@@ -39,6 +39,7 @@
|
||||||
|
**********************************************************************/
|
||||||
|
|
||||||
|
#include "qplatformdefs.h"
|
||||||
|
+#include <stdlib.h>
|
||||||
|
|
||||||
|
// POSIX Large File Support redefines open -> open64
|
||||||
|
static inline int qt_open( const char *pathname, int flags, mode_t mode )
|
||||||
|
@@ -468,8 +469,18 @@ TQSettingsPrivate::TQSettingsPrivate( TQ
|
||||||
|
Q_UNUSED( format );
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- TQString appSettings(TQDir::homeDirPath() + "/.qt/");
|
||||||
|
- TQString defPath;
|
||||||
|
+ TQString home;
|
||||||
|
+ home = getenv("TQT_HOME_DIR");
|
||||||
|
+ if ( !home.isEmpty() ){
|
||||||
|
+ home += "/";
|
||||||
|
+ TQFileInfo i( home + "qtrc" );
|
||||||
|
+ if ( !i.isReadable() )
|
||||||
|
+ home = TQDir::homeDirPath() + "/.qt/";
|
||||||
|
+ }else
|
||||||
|
+ home = TQDir::homeDirPath() + "/.qt/";
|
||||||
|
+ TQString appSettings(home);
|
||||||
|
+
|
||||||
|
+ TQString defPath("/etc/X11/");
|
||||||
|
#ifdef Q_WS_WIN
|
||||||
|
#ifdef Q_OS_TEMP
|
||||||
|
TCHAR path[MAX_PATH];
|
||||||
|
@@ -517,6 +528,15 @@ TQSettingsPrivate::TQSettingsPrivate( TQ
|
||||||
|
|
||||||
|
if ( !!defPath )
|
||||||
|
searchPaths.append(defPath);
|
||||||
|
+
|
||||||
|
+ TQString system;
|
||||||
|
+ system = getenv("TQT_SYSTEM_DIR");
|
||||||
|
+ if ( !system.isEmpty() && system[0] == '/') {
|
||||||
|
+ TQFileInfo i( system + "/qtrc" );
|
||||||
|
+ if ( i.isReadable() )
|
||||||
|
+ searchPaths.append(system);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
searchPaths.append(dir.path());
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,22 @@
|
|||||||
|
--- src/sql/qt_sql.pri 2011-10-30 19:55:58.000000000 +0100
|
||||||
|
+++ src/sql/qt_sql.pri 2008-01-15 20:09:13.000000000 +0100
|
||||||
|
@@ -116,7 +116,7 @@
|
||||||
|
|
||||||
|
unix {
|
||||||
|
!contains( LIBS, .*odbc.* ) {
|
||||||
|
- LIBS *= -liodbc
|
||||||
|
+ LIBS *= -lodbc
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
--- plugins/src/sqldrivers/odbc/odbc.pro 2011-10-30 19:55:57.000000000 +0100
|
||||||
|
+++ plugins/src/sqldrivers/odbc/odbc.pro 2008-01-15 20:09:17.000000000 +0100
|
||||||
|
@@ -17,7 +17,7 @@
|
||||||
|
unix {
|
||||||
|
OBJECTS_DIR = .obj
|
||||||
|
!contains( LIBS, .*odbc.* ) {
|
||||||
|
- LIBS *= -liodbc
|
||||||
|
+ LIBS *= -lodbc
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,52 @@
|
|||||||
|
Index: src/kernel/qpixmap_x11.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/kernel/qpixmap_x11.cpp.orig
|
||||||
|
+++ src/kernel/qpixmap_x11.cpp
|
||||||
|
@@ -394,8 +394,9 @@ void TQPixmap::init( int w, int h, int d
|
||||||
|
{
|
||||||
|
#if defined(QT_CHECK_STATE)
|
||||||
|
if ( tqApp->type() == TQApplication::Tty ) {
|
||||||
|
- tqWarning( "TQPixmap: Cannot create a TQPixmap when no GUI "
|
||||||
|
- "is being used" );
|
||||||
|
+// tqWarning( "TQPixmap: Cannot create a TQPixmap when no GUI "
|
||||||
|
+// "is being used" );
|
||||||
|
+ ;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Index: src/tools/qcomlibrary.cpp
|
||||||
|
===================================================================
|
||||||
|
--- src/tools/qcomlibrary.cpp.orig
|
||||||
|
+++ src/tools/qcomlibrary.cpp
|
||||||
|
@@ -105,27 +105,13 @@ static bool qt_verify( const TQString& l
|
||||||
|
(const char*) TQFile::encodeName(library) );
|
||||||
|
} else if ( ( version > TQT_VERSION ) ||
|
||||||
|
( ( TQT_VERSION & 0xff0000 ) > ( version & 0xff0000 ) ) ) {
|
||||||
|
- if ( warn )
|
||||||
|
- tqWarning( "Conflict in %s:\n"
|
||||||
|
- " Plugin uses incompatible TQt library (%d.%d.%d)!",
|
||||||
|
- (const char*) TQFile::encodeName(library),
|
||||||
|
- (version&0xff0000) >> 16, (version&0xff00) >> 8, version&0xff );
|
||||||
|
+ return FALSE;
|
||||||
|
} else if ( (flags & 2) != (our_flags & 2) ) {
|
||||||
|
- if ( warn )
|
||||||
|
- tqWarning( "Conflict in %s:\n"
|
||||||
|
- " Plugin uses %s TQt library!",
|
||||||
|
- (const char*) TQFile::encodeName(library),
|
||||||
|
- (flags & 2) ? "multi threaded" : "single threaded" );
|
||||||
|
+ return FALSE;
|
||||||
|
} else if ( key != TQT_BUILD_KEY ) {
|
||||||
|
- if ( warn )
|
||||||
|
- tqWarning( "Conflict in %s:\n"
|
||||||
|
- " Plugin uses incompatible TQt library!\n"
|
||||||
|
- " expected build key \"%s\", got \"%s\".",
|
||||||
|
- (const char*) TQFile::encodeName(library),
|
||||||
|
- TQT_BUILD_KEY,
|
||||||
|
- key.isEmpty() ? "<null>" : (const char *) key );
|
||||||
|
+ return FALSE;
|
||||||
|
} else {
|
||||||
|
- return TRUE;
|
||||||
|
+ return TRUE;
|
||||||
|
}
|
||||||
|
return FALSE;
|
||||||
|
}
|
@ -0,0 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jul 28 21:19:16 UTC 2012 - robxu9@gmail.com
|
||||||
|
|
||||||
|
- initial package (failing) of tqt3 for SuSE12.1
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sat Jul 28 21:18:53 UTC 2012 - robxu9@gmail.com
|
||||||
|
|
||||||
|
- initial package (failing) of tqt3 for SuSE12.1
|
||||||
|
|
@ -0,0 +1,337 @@
|
|||||||
|
#
|
||||||
|
# spec file for package tqt3
|
||||||
|
#
|
||||||
|
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Name: tqt3
|
||||||
|
#Remember also to modify Requires in -devel package
|
||||||
|
BuildRequires: Mesa-devel c++_compiler cups-devel freetype2-devel libjpeg-devel libmng-devel pkgconfig update-desktop-files xorg-x11-devel
|
||||||
|
Url: http://www.trolltech.com/
|
||||||
|
License: GPLv2 ; GPLv3 ; QPL ..
|
||||||
|
%if %suse_version > 1120
|
||||||
|
BuildRequires: libpng14-compat-devel
|
||||||
|
%else
|
||||||
|
BuildRequires: libpng-devel
|
||||||
|
%endif
|
||||||
|
Group: System/Libraries
|
||||||
|
# bug437293
|
||||||
|
%ifarch ppc64
|
||||||
|
Obsoletes: qt3-64bit
|
||||||
|
%endif
|
||||||
|
#
|
||||||
|
Summary: A library for developing applications with graphical user interfaces
|
||||||
|
Version: 3.4.0
|
||||||
|
Release: 1
|
||||||
|
Provides: qt_library_%version
|
||||||
|
Recommends: kdelibs3-default-style
|
||||||
|
PreReq: /bin/grep
|
||||||
|
# COMMON-BEGIN
|
||||||
|
Source0: tqt3-%{version}.tar.bz2
|
||||||
|
Source1: build_script.sh
|
||||||
|
Source2: qtconfig3.desktop
|
||||||
|
Source3: qtrc
|
||||||
|
Source4: assistant3.png
|
||||||
|
Source6: assistant3.desktop
|
||||||
|
Source7: designer.desktop
|
||||||
|
Source8: designer.png
|
||||||
|
Source9: linguist.desktop
|
||||||
|
Source5: linguist.png
|
||||||
|
Source10: qt3.sh
|
||||||
|
Source11: qt3.csh
|
||||||
|
# Translations did not change
|
||||||
|
Source12: qt3-3.3.8b-translations.tar.bz2
|
||||||
|
Source102: baselibs.conf
|
||||||
|
Source200: attributes
|
||||||
|
Source201: update_spec.pl
|
||||||
|
Patch1: aliasing.diff
|
||||||
|
Patch2: head.diff
|
||||||
|
Patch4: qt3-never-strip.diff
|
||||||
|
Patch5: external-libs.diff
|
||||||
|
Patch12: qtrc-path.diff
|
||||||
|
Patch14: lib64-plugin-support.diff
|
||||||
|
Patch15: pluginmanager-fix.diff
|
||||||
|
Patch18: no-rpath.dif
|
||||||
|
Patch19: shut-up.diff
|
||||||
|
Patch23: fix-accessible.diff
|
||||||
|
Patch31: limit-image-size.diff
|
||||||
|
Patch35: qt-transparency.patch
|
||||||
|
Patch37: 0055-qtextedit_zoom.patch
|
||||||
|
Patch39: fix-qtranslator-crash.diff
|
||||||
|
Patch54: kmenu-search-fix.diff
|
||||||
|
Patch113: fix-assistant-path.patch
|
||||||
|
Patch117: qtimer-debug.diff
|
||||||
|
Patch127: mng-reading-fix.patch
|
||||||
|
Patch134: fix-xinput-clash.diff
|
||||||
|
Patch135: parseFontName.diff
|
||||||
|
#Patch136: qt3-no-date.diff
|
||||||
|
#Patch139: gcc46.diff
|
||||||
|
#Patch140: revert-iodbc-to-uodbc.diff
|
||||||
|
|
||||||
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
|
%description
|
||||||
|
Qt is a program library for developing applications with graphical user
|
||||||
|
interfaces. It allows you to rapidly develop professional programs. The
|
||||||
|
Qt library is available not only for Linux but for a great number of
|
||||||
|
Unices and even for Windows. Thus it is possible to write programs that
|
||||||
|
may be easily ported to those platforms.
|
||||||
|
|
||||||
|
You need a license for using Qt with a non-GPL application, which can
|
||||||
|
be acquired from sales@trolltech.com.
|
||||||
|
|
||||||
|
See /usr/share/doc/packages/qt3 for details about the new features of
|
||||||
|
the current Qt library!
|
||||||
|
|
||||||
|
%define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q
|
||||||
|
%patch1
|
||||||
|
%patch2
|
||||||
|
%patch4
|
||||||
|
%patch5
|
||||||
|
%patch12
|
||||||
|
if [ "%_lib" = "lib64" ]; then
|
||||||
|
%patch14
|
||||||
|
fi
|
||||||
|
%patch15
|
||||||
|
%patch18
|
||||||
|
%patch19
|
||||||
|
%patch23
|
||||||
|
%patch31
|
||||||
|
%patch35
|
||||||
|
%patch37
|
||||||
|
%patch39
|
||||||
|
%patch54
|
||||||
|
%patch113
|
||||||
|
%patch117
|
||||||
|
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
|
||||||
|
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
|
||||||
|
ln -sf $PWD/src/kernel/qinputcontext.h include/
|
||||||
|
ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/
|
||||||
|
ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/
|
||||||
|
%patch127
|
||||||
|
%patch134
|
||||||
|
%patch135
|
||||||
|
#%patch136
|
||||||
|
#%patch139
|
||||||
|
#%patch140
|
||||||
|
cd translations
|
||||||
|
tar xvjf %SOURCE12
|
||||||
|
cd ..
|
||||||
|
# COMMON-END
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
License: GPLv2 ; GPLv3 ; QPL ..
|
||||||
|
Summary: Include Files and Libraries mandatory for Development
|
||||||
|
Requires: tqt3 = %version
|
||||||
|
Requires: pkgconfig cups-devel freetype2-devel libmng-devel libjpeg-devel c++_compiler xorg-x11-devel
|
||||||
|
%if %suse_version > 1120
|
||||||
|
Recommends: libpng14-compat-devel
|
||||||
|
Requires: libpng-devel
|
||||||
|
%else
|
||||||
|
Requires: libpng-devel
|
||||||
|
%endif
|
||||||
|
%if %suse_version > 1000
|
||||||
|
Requires: Mesa-devel
|
||||||
|
%else
|
||||||
|
Requires: xorg-x11-Mesa xorg-x11-Mesa-devel
|
||||||
|
%endif
|
||||||
|
%ifnarch x86_64 s390x sparc64 ppc64 mips64
|
||||||
|
Conflicts: devel_libs-32bit
|
||||||
|
%endif
|
||||||
|
# bug437293
|
||||||
|
%ifarch ppc64
|
||||||
|
Obsoletes: qt3-devel-64bit
|
||||||
|
%endif
|
||||||
|
#
|
||||||
|
Group: Development/Libraries/X11
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
You need this package if you want to compile programs with Qt 3. It
|
||||||
|
contains the "Qt Crossplatform Development Kit 2". Under /usr/lib/qt3
|
||||||
|
you will find include files.
|
||||||
|
|
||||||
|
You need a license for using Qt with a non-GPL application. A license
|
||||||
|
can be acquired at sales@trolltech.com.
|
||||||
|
|
||||||
|
%build
|
||||||
|
export VERSION=%suse_version
|
||||||
|
source %SOURCE1 %{version}
|
||||||
|
export WLIB=%_lib
|
||||||
|
export QTDIR=`pwd`
|
||||||
|
if [ %_lib == "lib64" ]; then
|
||||||
|
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DUSE_LIB64_PATHES"
|
||||||
|
fi
|
||||||
|
export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -fpermissive"
|
||||||
|
#
|
||||||
|
# call build from build_script.rpmrc for threaded Qt library
|
||||||
|
# only really needed tools will be builded here, all extra tools will be
|
||||||
|
# builded in qt3.spec
|
||||||
|
#
|
||||||
|
call_configure -v -thread -shared -no-sql-mysql -no-sql-psql -no-sql-odbc -no-sql-sqlite $OPTIONS
|
||||||
|
for i in %build_sub_dirs ; do
|
||||||
|
cd $i
|
||||||
|
make %{?jobs:-j%jobs}
|
||||||
|
cd -
|
||||||
|
done
|
||||||
|
|
||||||
|
%install
|
||||||
|
export VERSION=%suse_version
|
||||||
|
export WLIB=%_lib
|
||||||
|
export QTDIR=`pwd`
|
||||||
|
source %SOURCE1 %{version}
|
||||||
|
for i in %build_sub_dirs ; do
|
||||||
|
cd $i
|
||||||
|
make INSTALL_ROOT=$RPM_BUILD_ROOT install
|
||||||
|
cd -
|
||||||
|
done
|
||||||
|
post_install $RPM_BUILD_ROOT/usr/lib/qt3/
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||||
|
sed -i -e 's, on: .*,,' $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.la
|
||||||
|
#
|
||||||
|
# copy additional files
|
||||||
|
#
|
||||||
|
install -m 0755 bin/qmake bin/moc ${RPM_BUILD_ROOT}/usr/lib/qt3/bin/
|
||||||
|
install -m 0755 -d ${RPM_BUILD_ROOT}/usr/lib/qt3/translations/
|
||||||
|
install -m 0644 translations/*.qm ${RPM_BUILD_ROOT}/usr/lib/qt3/translations/
|
||||||
|
if [ %_lib = lib64 ]; then
|
||||||
|
for i in $RPM_BUILD_ROOT/usr/lib/qt3/plugins/*/*.so; do
|
||||||
|
mv "$i" "${i%.so}.lib64.so"
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
#
|
||||||
|
# move pkgconfig files
|
||||||
|
#
|
||||||
|
mkdir -p $RPM_BUILD_ROOT/%_libdir/pkgconfig
|
||||||
|
mv $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/pkgconfig/*.pc \
|
||||||
|
$RPM_BUILD_ROOT/%_libdir/pkgconfig
|
||||||
|
rmdir $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/pkgconfig
|
||||||
|
#
|
||||||
|
# move docs in doc dir
|
||||||
|
#
|
||||||
|
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_defaultdocdir}/qt3/
|
||||||
|
install -d -m 0755 ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/
|
||||||
|
install -d -m 0755 ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/
|
||||||
|
cp -a mkspecs/* ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/
|
||||||
|
if [ %_lib == "lib64" ]; then
|
||||||
|
ln -sf linux-g++-64 ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/default
|
||||||
|
else
|
||||||
|
ln -sf linux-g++ ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/default
|
||||||
|
fi
|
||||||
|
find ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs -type f -perm /111 -print0 | xargs -0 chmod a-x
|
||||||
|
#
|
||||||
|
# create links in ld.so.conf path
|
||||||
|
#
|
||||||
|
install -d -m 0755 ${RPM_BUILD_ROOT}/%{_libdir}
|
||||||
|
ln -sf ../lib/qt3/%{_lib}/libqt-mt.so.3 ${RPM_BUILD_ROOT}/%{_libdir}/libqt-mt.so.3
|
||||||
|
ln -sf ../lib/qt3/%{_lib}/libqui.so.1 ${RPM_BUILD_ROOT}/%{_libdir}/libqui.so.1
|
||||||
|
[ "lib" != "%{_lib}" ] && \
|
||||||
|
ln -sf ../lib/qt3 ${RPM_BUILD_ROOT}/%{_libdir}/qt3
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
|
||||||
|
install -m 644 %SOURCE10 %SOURCE11 ${RPM_BUILD_ROOT}/etc/profile.d
|
||||||
|
#
|
||||||
|
# default qt settings
|
||||||
|
#
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}/etc/X11
|
||||||
|
mkdir -p ${RPM_BUILD_ROOT}/usr/lib/qt3/etc/
|
||||||
|
ln -sf /etc/X11/ ${RPM_BUILD_ROOT}/usr/lib/qt3/etc/settings
|
||||||
|
install -m 0644 %SOURCE3 ${RPM_BUILD_ROOT}/etc/X11/qtrc
|
||||||
|
#
|
||||||
|
# clean broken links
|
||||||
|
#
|
||||||
|
if [ %_lib == "lib64" ]; then
|
||||||
|
rm ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/linux-g++-64/linux-g++-64
|
||||||
|
else
|
||||||
|
rm ${RPM_BUILD_ROOT}/usr/lib/qt3/mkspecs/linux-g++/linux-g++
|
||||||
|
fi
|
||||||
|
rm -rf ${RPM_BUILD_ROOT}/usr/lib/qt3/doc/html
|
||||||
|
|
||||||
|
%pre
|
||||||
|
if test -L usr/lib/qt3; then
|
||||||
|
rm usr/lib/qt3
|
||||||
|
fi
|
||||||
|
|
||||||
|
%post
|
||||||
|
/sbin/ldconfig
|
||||||
|
if ! grep -q '^\[3.3\]' etc/X11/qtrc ; then
|
||||||
|
echo "" >> etc/X11/qtrc
|
||||||
|
echo "[3.3]" >> etc/X11/qtrc
|
||||||
|
echo "libraryPath=/opt/kde3/lib64/kde3/plugins/:/opt/kde3/lib/kde3/plugins/" >> etc/X11/qtrc
|
||||||
|
fi
|
||||||
|
|
||||||
|
%postun -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%files
|
||||||
|
%defattr(-,root,root,755)
|
||||||
|
# FIXME provide new changelog if kb9vqf will give one
|
||||||
|
%doc changes-3.3.8d README* LICENSE* MANIFEST FAQ
|
||||||
|
%dir /usr/lib/qt3/translations
|
||||||
|
%dir /usr/lib/qt3
|
||||||
|
%dir /usr/lib/qt3/bin
|
||||||
|
%dir /usr/lib/qt3/%{_lib}
|
||||||
|
%{_libdir}/libqt-mt.so.*
|
||||||
|
%{_libdir}/libqui.so.*
|
||||||
|
/usr/lib/qt3/bin/qtconfig
|
||||||
|
/usr/lib/qt3/%{_lib}/libqt-mt.so.*
|
||||||
|
/usr/lib/qt3/%{_lib}/libqui.so.*
|
||||||
|
%dir /usr/lib/qt3/etc
|
||||||
|
/usr/lib/qt3/etc/settings
|
||||||
|
/usr/lib/qt3/plugins
|
||||||
|
/usr/lib/qt3/bin/assistant
|
||||||
|
%lang(de) /usr/lib/qt3/translations/assistant_de.qm
|
||||||
|
%lang(ar) /usr/lib/qt3/translations/qt_ar.qm
|
||||||
|
%lang(ca) /usr/lib/qt3/translations/qt_ca.qm
|
||||||
|
%lang(cs) /usr/lib/qt3/translations/qt_cs.qm
|
||||||
|
%lang(de) /usr/lib/qt3/translations/qt_de.qm
|
||||||
|
%lang(es) /usr/lib/qt3/translations/qt_es.qm
|
||||||
|
%lang(fr) /usr/lib/qt3/translations/qt_fr.qm
|
||||||
|
%lang(he) /usr/lib/qt3/translations/qt_he.qm
|
||||||
|
%lang(ru) /usr/lib/qt3/translations/qt_ru.qm
|
||||||
|
%lang(sk) /usr/lib/qt3/translations/qt_sk.qm
|
||||||
|
%lang(it) /usr/lib/qt3/translations/qt_it.qm
|
||||||
|
%lang(ja) /usr/lib/qt3/translations/qt_ja.qm
|
||||||
|
%lang(nb) /usr/lib/qt3/translations/qt_nb.qm
|
||||||
|
%lang(pl) /usr/lib/qt3/translations/qt_pl.qm
|
||||||
|
%lang(pt) /usr/lib/qt3/translations/qt_pt-br.qm
|
||||||
|
%lang(pt) /usr/lib/qt3/translations/qt_pt.qm
|
||||||
|
%lang(zh) /usr/lib/qt3/translations/qt_zh-cn.qm
|
||||||
|
%lang(zh) /usr/lib/qt3/translations/qt_zh-tw.qm
|
||||||
|
%config(noreplace) /etc/X11/qtrc
|
||||||
|
%ifarch s390x sparc64 x86_64 ppc64 mips64
|
||||||
|
%dir %{_libdir}/qt3
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%defattr(-,root,root,755)
|
||||||
|
# FIXME provide new changelog if kb9vqf will give one
|
||||||
|
%doc changes-3.3.8b
|
||||||
|
/usr/lib/qt3/bin/moc
|
||||||
|
/usr/lib/qt3/bin/qmake
|
||||||
|
/usr/lib/qt3/bin/uic
|
||||||
|
/usr/lib/qt3/include
|
||||||
|
/usr/lib/qt3/%{_lib}/libqt-mt.la
|
||||||
|
/usr/lib/qt3/%{_lib}/libqt-mt.so
|
||||||
|
/usr/lib/qt3/%{_lib}/libqt-mt.prl
|
||||||
|
/usr/lib/qt3/%{_lib}/libqui.so
|
||||||
|
/usr/lib/qt3/%{_lib}/libqui.prl
|
||||||
|
/usr/lib/qt3/mkspecs
|
||||||
|
/%_libdir/pkgconfig/qt-mt.pc
|
||||||
|
/usr/lib/qt3/%_lib/libqassistantclient.*
|
||||||
|
%config /etc/profile.d/qt3.*
|
||||||
|
|
||||||
|
%changelog
|
@ -0,0 +1,106 @@
|
|||||||
|
#! /usr/bin/perl
|
||||||
|
|
||||||
|
my $name = $ARGV[0];
|
||||||
|
$name =~ s,.*/,,;
|
||||||
|
$name =~ s,\.spec.*,,;
|
||||||
|
|
||||||
|
my %attributes = ();
|
||||||
|
open(FILE, $ARGV[1]) || die 'no attributes';
|
||||||
|
my $pack = undef;
|
||||||
|
my $text = undef;
|
||||||
|
while ( <FILE> ) {
|
||||||
|
if (/^\+(.*)$/) { $pack = $1; $text = ''; next }
|
||||||
|
if (/^-(.*)$/) {
|
||||||
|
if ($pack ne $1) {
|
||||||
|
die "$pack and $1 do not match";
|
||||||
|
}
|
||||||
|
$text =~ s,^\s*,,;
|
||||||
|
$text =~ s,\s*$,,;
|
||||||
|
$attributes{$pack} = $text;
|
||||||
|
$text = undef;
|
||||||
|
$pack = undef;
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
if (defined $text) {
|
||||||
|
$text .= $_;
|
||||||
|
} elsif (/^(\S*)\s*(.*)$/) {
|
||||||
|
my $attr = $1;
|
||||||
|
my $string = $2;
|
||||||
|
$string =~ s,^\s*,,;
|
||||||
|
$string =~ s,\s*$,,;
|
||||||
|
$attributes{$attr} = $string;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
close(FILE);
|
||||||
|
|
||||||
|
open(FILE, $ARGV[0]);
|
||||||
|
|
||||||
|
sub description()
|
||||||
|
{
|
||||||
|
if (/^%description\s*(.*)\s*/) {
|
||||||
|
my $suffix = $1;
|
||||||
|
my $pname = $name;
|
||||||
|
|
||||||
|
if ($suffix =~ m/-n\s*(.*)/) {
|
||||||
|
$pname = $1;
|
||||||
|
} else {
|
||||||
|
$pname = "$name-$suffix" if ($suffix);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (defined $attributes{"description.$pname"}) {
|
||||||
|
print $_;
|
||||||
|
my $descr = $attributes{"description.$pname"};
|
||||||
|
print "$descr\n";
|
||||||
|
$_ = '';
|
||||||
|
do {
|
||||||
|
$_ = <FILE>;
|
||||||
|
} while ( $_ !~ /^%/ && $_ !~ /^@/ );
|
||||||
|
print "\n";
|
||||||
|
description();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
# current subpackage
|
||||||
|
my $pname = $name;
|
||||||
|
|
||||||
|
while ( <FILE> )
|
||||||
|
{
|
||||||
|
if (/^Name:\s*(.*)/) {
|
||||||
|
$name = $1;
|
||||||
|
$pname = $1;
|
||||||
|
}
|
||||||
|
description();
|
||||||
|
|
||||||
|
if (/^%package\s*(.*)/) {
|
||||||
|
my $suffix = $1;
|
||||||
|
if ($suffix =~ m/-n\s*(.*)/) {
|
||||||
|
$pname = $1;
|
||||||
|
} else {
|
||||||
|
$pname = "$name-$1";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (/^(Summary:\s*)(.*)$/) {
|
||||||
|
if (defined $attributes{"summary.$pname"}) {
|
||||||
|
print $1 . $attributes{"summary.$pname"} ."\n";
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (/^(License:\s*)(.*)$/) {
|
||||||
|
if (defined $attributes{"license.$pname"}) {
|
||||||
|
print $1 . $attributes{"license.$pname"} ."\n";
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (/^(Group:\s*)(.*)$/) {
|
||||||
|
if (defined $attributes{"group.$pname"}) {
|
||||||
|
print $1 . $attributes{"group.$pname"} ."\n";
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print $_;
|
||||||
|
}
|
||||||
|
|
||||||
|
close(FILE);
|
@ -0,0 +1,35 @@
|
|||||||
|
diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp
|
||||||
|
index 4dfb247..cd8f4b0 100644
|
||||||
|
--- a/klaptopdaemon/acpi.cpp
|
||||||
|
+++ b/klaptopdaemon/acpi.cpp
|
||||||
|
@@ -178,7 +178,7 @@ void AcpiConfig::setupHelper()
|
||||||
|
proc << tdesu;
|
||||||
|
proc << "-u";
|
||||||
|
proc << "root";
|
||||||
|
- proc << "chown root "+helper+"; chmod +s "+helper;
|
||||||
|
+ proc << "dpkg-statoverride --update --add root root 6755 "+helper;
|
||||||
|
proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp
|
||||||
|
index 9de0c85..e348943 100644
|
||||||
|
--- a/klaptopdaemon/apm.cpp
|
||||||
|
+++ b/klaptopdaemon/apm.cpp
|
||||||
|
@@ -166,7 +166,7 @@ void ApmConfig::setupHelper()
|
||||||
|
proc << tdesu;
|
||||||
|
proc << "-u";
|
||||||
|
proc << "root";
|
||||||
|
- proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name;
|
||||||
|
+ proc << TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name;
|
||||||
|
proc.start(KProcess::Block); // run it sync so has_apm below sees the results
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
@@ -200,7 +200,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend
|
||||||
|
proc << tdesu;
|
||||||
|
proc << "-u";
|
||||||
|
proc << "root";
|
||||||
|
- proc << "chown root "+helper+"; chmod +s "+helper;
|
||||||
|
+ proc << "dpkg-statoverride --update --add root root 6755 "+helper;
|
||||||
|
proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
|
||||||
|
}
|
||||||
|
} else {
|
Loading…
Reference in new issue