TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM: remove obsolete dependencies/qt3

Browse Source
pull/92/head
François Andriot 4 years ago
parent ff06099c11
commit bf57a9ef56
33 changed files with 0 additions and 2396 deletions
Show Stats Download Patch File Download Diff File

80
redhat/dependencies/qt3/0084-compositing-properties.patch
Unescape Escape View File

@ -1,80 +0,0 @@
qt-bugs@ issue : none
bugs.kde.org number : none
applied: no
author: Lubos Lunak <l.lunak@kde.org>
This patch makes override-redirect windows (popup menu, dropdown menu,
tooltip, combobox, etc.) also have more window properties like WM_CLASS,
so they can be used when compositing.
--- src/kernel/qwidget_x11.cpp.sav 2007-06-25 10:36:42.000000000 +0200
+++ src/kernel/qwidget_x11.cpp 2007-10-02 15:30:13.000000000 +0200
@@ -557,7 +557,10 @@ void QWidget::create( WId window, bool i
wsa.save_under = True;
XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa );
- x11SetWindowType();
+ XClassHint class_hint;
+ class_hint.res_name = (char *) qAppName(); // application name
+ class_hint.res_class = (char *) qAppClass(); // application class
+ XSetClassHint( dpy, id, &class_hint );
} else if ( topLevel && !desktop ) { // top-level widget
QWidget *p = parentWidget(); // real parent
if (p)
@@ -620,8 +623,6 @@ void QWidget::create( WId window, bool i
else
XDeleteProperty(dpy, id, qt_xa_motif_wm_hints);
- x11SetWindowType();
-
// set _NET_WM_WINDOW_STATE
if (curr_winstate > 0)
XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace,
@@ -629,11 +630,6 @@ void QWidget::create( WId window, bool i
else
XDeleteProperty(dpy, id, qt_net_wm_state);
- // set _NET_WM_PID
- long curr_pid = getpid();
- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace,
- (unsigned char *) &curr_pid, 1);
-
#ifndef QT_NO_XSYNC
// set _NET_WM_SYNC_COUNTER
createSyncCounter();
@@ -645,19 +641,31 @@ void QWidget::create( WId window, bool i
// when we create a toplevel widget, the frame strut should be dirty
fstrut_dirty = 1;
+ } else {
+ // non-toplevel widgets don't have a frame, so no need to
+ // update the strut
+ fstrut_dirty = 0;
+ }
+
+ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
+ x11SetWindowType();
+
+ // set _NET_WM_PID
+ long curr_pid = getpid();
+ XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace,
+ (unsigned char *) &curr_pid, 1);
+
// declare the widget's object name as window role
XChangeProperty( dpy, id,
qt_window_role, XA_STRING, 8, PropModeReplace,
(unsigned char *)name(), qstrlen( name() ) );
// set client leader property
+ if ( !qt_x11_wm_client_leader )
+ qt_x11_create_wm_client_leader();
XChangeProperty( dpy, id, qt_wm_client_leader,
XA_WINDOW, 32, PropModeReplace,
(unsigned char *)&qt_x11_wm_client_leader, 1 );
- } else {
- // non-toplevel widgets don't have a frame, so no need to
- // update the strut
- fstrut_dirty = 0;
}
if ( initializeWindow ) {

9
redhat/dependencies/qt3/assistant3.desktop
Unescape Escape View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Qt3 Assistant
Comment=Add translations to Qt3 applications
Exec=assistant
Icon=assistant3
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Development;

11
redhat/dependencies/qt3/designer3.desktop
Unescape Escape View File

@ -1,11 +0,0 @@
[Desktop Entry]
Name=Qt3 Designer
GenericName=Interface Designer
Comment=Design GUIs for Qt3 applications
Exec=designer
Icon=designer3
MimeType=application/x-designer;
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Development;

10
redhat/dependencies/qt3/linguist3.desktop
Unescape Escape View File

@ -1,10 +0,0 @@
[Desktop Entry]
Name=Qt3 Linguist
Comment=Add translations to Qt3 applications
Exec=linguist
Icon=linguist3
MimeType=application/x-linguist;
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Development;

15
redhat/dependencies/qt3/qt-3.0.5-nodebug.patch
Unescape Escape View File

@ -1,15 +0,0 @@
--- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200
+++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200
@@ -501,10 +501,10 @@
(*f).latin1(),
(const char*) QFile::encodeName( old->library() ) );
} else {
- qWarning("%s: Feature %s already defined in %s!",
+/* qWarning("%s: Feature %s already defined in %s!",
(const char*) QFile::encodeName( old->library() ),
(*f).latin1(),
- (const char*) QFile::encodeName( plugin->library() ) );
+ (const char*) QFile::encodeName( plugin->library() ) ); */
}
}
}

11
redhat/dependencies/qt3/qt-3.1.0-makefile.patch
Unescape Escape View File

@ -1,11 +0,0 @@
--- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100
+++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
+all: symlinks src-qmake src-moc sub-src sub-tools
@echo
@echo "The Qt library is now built in ./lib"
@echo "The Qt examples are built in the directories in ./examples"

18
redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch
Unescape Escape View File

@ -1,18 +0,0 @@
--- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100
+++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100
@@ -4748,10 +4748,11 @@
// GB18030 fonts on Turbolinux
static const psfont SongGBK2K [] = {
- { "MSung-Light-GBK2K-H", 0, 100. },
- { "MSung-Italic-GBK2K-H", 0, 100. },
- { "MSung-Bold-GBK2K-H", 0, 100. },
- { "MSung-BoldItalic-GBK2K-H", 0, 100. },
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
+
};
static const psfont KaiGBK2K [] = {
{ "MKai-Medium-GBK2K-H", 0, 100. },

15
redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch
Unescape Escape View File

@ -1,15 +0,0 @@
diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp
--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530
@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy
toPos += 2;
if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) {
if (matra_position == Post || matra_position == Split) {
- toPos = matra+1;
+ if (matra_position == Post )
+ toPos = matra;
+ else
+ toPos = matra+1;
matra -= 2;
}
} else if (script == QFont::Kannada) {

11
redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch
Unescape Escape View File

@ -1,11 +0,0 @@
--- qt3/src/kernel/qscriptengine_x11.cpp.fontrendering-gu-228452 2012-09-29 11:30:23.821539127 +0200
+++ qt3/src/kernel/qscriptengine_x11.cpp 2012-09-29 11:31:59.679413873 +0200
@@ -261,7 +261,7 @@
Other, Other, Other, Other,
Other, Other, Other, Other,
- Other, Other, Other, Other,
+ Other, Other, VowelMark, VowelMark,
Other, Other, Other, Other,
Other, Other, Other, Other,
Other, Other, Other, Other,

60
redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch
Unescape Escape View File

@ -1,60 +0,0 @@
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800
@@ -868,7 +868,7 @@
None, None, None, None,
None, None, None, Post,
- Post, None, Below, None,
+ None, None, None, None,
None, Post, None, None,
None, None, None, None,
None, None, Post, Post,
@@ -1271,6 +1271,16 @@
int base = 0;
int reph = -1;
+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam
+ bool is_special_conjuction_malayalam = false;
+
+ if ((len == 3) &&
+ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) &&
+ (reordered[1] == 0x0d4d) &&
+ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) {
+ is_special_conjuction_malayalam = true;
+ }
+
#ifdef INDIC_DEBUG
IDEBUG("original:");
for (i = 0; i < len; i++) {
@@ -1547,6 +1557,15 @@
reph = i;
}
+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam
+ if (is_special_conjuction_malayalam) {
+ unsigned short temp;
+
+ temp = reordered[0];
+ reordered[0] = reordered[2];
+ reordered[2] = temp;
+ }
+
if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances,
&item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError)
return FALSE;
@@ -1658,6 +1677,15 @@
// halant always applies
+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam
+ if (is_special_conjuction_malayalam) {
+ unsigned int temp;
+
+ temp = properties[0];
+ properties[0] = ~PreSubstProperty;
+ properties[2] = temp;
+ }
+
#ifdef INDIC_DEBUG
{
IDEBUG("OT properties:");

11
redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch
Unescape Escape View File

@ -1,11 +0,0 @@
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100
@@ -864,7 +864,7 @@
None, None, None, Post,
None, None, None, None,
- None, Post, None, None,
+ None, None, None, None,
None, None, None, None,
None, None, Post, Post,

12
redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch
Unescape Escape View File

@ -1,12 +0,0 @@
diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp
--- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530
+++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530
@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri
if ( script >= QFont::Arabic && script <= QFont::Khmer ) {
// complex script shaping. Have to do some hard work
int from = QMAX( 0, pos - 8 );
- int to = QMIN( (int)str.length(), pos + 8 );
+ int to = str.length();
QConstString cstr( str.unicode()+from, to-from);
QTextEngine layout( cstr.string(), d );
layout.itemize( QTextEngine::WidthOnly );

11
redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch
Unescape Escape View File

@ -1,11 +0,0 @@
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800
@@ -786,7 +786,7 @@
Below, None, Below, Below,
Below, Below, Below, Below,
- Below, None, Below, Below,
+ Below, Below, Below, Below,
None, Below, Below, Below,
Below, Below, None, None,
None, None, Post, Above,

23
redhat/dependencies/qt3/qt-3.3.8-fontrendering-214570.patch
Unescape Escape View File

@ -1,23 +0,0 @@
--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200
+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200
@@ -1240,7 +1240,7 @@
int script = item->script;
Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala);
const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari);
- const unsigned short ra = script_base + 0x30;
+ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification
const unsigned short halant = script_base + 0x4d;
const unsigned short nukta = script_base + 0x3c;
@@ -1278,6 +1278,11 @@
}
#endif
+ unsigned short *chkAssamese=reordered.data();
+ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra
+ {
+ ra = script_base + 0x70;
+ }
if (len != 1) {
unsigned short *uc = reordered.data();
bool beginsWithRa = FALSE;

11
redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch
Unescape Escape View File

@ -1,11 +0,0 @@
--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200
+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200
@@ -601,7 +601,7 @@
None, None, None, None,
None, None, None, None,
- None, None, None, None,
+ Below, None, None, None,
None, None, None, None,
None, None, None, None,
None, None, None, None,

12
redhat/dependencies/qt3/qt-uic-nostdlib.patch
Unescape Escape View File

@ -1,12 +0,0 @@
--- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400
+++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400
@@ -149,6 +149,9 @@
} else {
trmacro = &opt[1];
}
+ } else if ( opt == "nostdlib") {
+ QStringList x;
+ QApplication::setLibraryPaths(x);
} else if ( opt == "L" ) {
if ( !(n < argc-1) ) {
error = "Missing plugin path.";

14
redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch
Unescape Escape View File

@ -1,14 +0,0 @@
--- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200
+++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200
@@ -288,8 +288,9 @@
{
#if defined(QT_CHECK_STATE)
if ( qApp->type() == QApplication::Tty ) {
- qWarning( "QPixmap: Cannot create a QPixmap when no GUI "
- "is being used" );
+// qWarning( "QPixmap: Cannot create a QPixmap when no GUI "
+// "is being used" );
+ ;
}
#endif

11
redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch
Unescape Escape View File

@ -1,11 +0,0 @@
--- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100
+++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100
@@ -1412,7 +1412,7 @@
False, XA_ATOM, &type, &format, &nitems, &after, &data);
if (type == XA_ATOM && format == 32) {
- ts.writeBlock((const char *) data, nitems * 4);
+ ts.writeBlock((const char *) data, nitems * sizeof(long));
offset += nitems;
} else
after = 0;

11
redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch
Unescape Escape View File

@ -1,11 +0,0 @@
--- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200
+++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200
@@ -975,7 +981,7 @@
};
const XftDefaultFont defaults[] = {
{ "Serif", "serif", FALSE },
- { "Sans Serif", "sans-serif", FALSE },
+ { "Sans", "sans-serif", FALSE },
{ "Monospace", "monospace", TRUE },
{ 0, 0, FALSE }
};

92
redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
Unescape Escape View File

@ -1,92 +0,0 @@
--- ./src/widgets/qtextedit.cpp.resetinputcontext 2012-08-04 14:53:34.000000000 +0200
+++ ./src/widgets/qtextedit.cpp 2012-09-29 11:36:19.410163805 +0200
@@ -1904,9 +1904,6 @@
void QTextEdit::removeSelectedText( int selNum )
{
- if(selNum != 0)
- resetInputContext();
-
QTextCursor c1 = doc->selectionStartCursor( selNum );
c1.restoreState();
QTextCursor c2 = doc->selectionEndCursor( selNum );
@@ -3169,7 +3166,6 @@
return;
}
#endif
- resetInputContext();
QTextParagraph *p = doc->paragAt( para );
if ( !p )
return;
@@ -3196,7 +3192,6 @@
return;
}
#endif
- resetInputContext();
for ( int i = 0; i < (int)doc->numSelections(); ++i )
doc->removeSelection( i );
@@ -3238,7 +3233,6 @@
if ( d->optimMode )
return;
#endif
- resetInputContext();
QTextParagraph *p = doc->paragAt( para );
if ( !p )
return;
@@ -3283,7 +3277,6 @@
if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled )
return;
- resetInputContext();
for ( int i = 0; i < (int)doc->numSelections(); ++i )
doc->removeSelection( i );
@@ -3334,7 +3327,6 @@
if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled )
return;
- resetInputContext();
for ( int i = 0; i < (int)doc->numSelections(); ++i )
doc->removeSelection( i );
@@ -3448,7 +3440,6 @@
{
if ( isReadOnly() )
return;
- resetInputContext();
normalCopy();
removeSelectedText();
updateMicroFocusHint();
@@ -3936,7 +3927,6 @@
return;
}
#endif
- resetInputContext();
if ( !isModified() && isReadOnly() &&
this->context() == context && this->text() == text )
return;
@@ -4110,7 +4100,6 @@
if ( !p )
return;
- resetInputContext();
if ( index > p->length() - 1 )
index = p->length() - 1;
@@ -4167,7 +4156,6 @@
return;
}
#endif
- resetInputContext();
if ( doc->hasSelection( selNum ) ) {
doc->removeSelection( selNum );
repaintChanged();
@@ -5074,7 +5062,6 @@
}
if ( dc == doc )
return;
- resetInputContext();
doc = dc;
delete cursor;
cursor = new QTextCursor( doc );

36
redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch
Unescape Escape View File

@ -1,36 +0,0 @@
--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200
@@ -84,7 +84,7 @@
QMAKE_MOVE = mv -f
QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
-QMAKE_STRIP =
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_STRIP =
+QMAKE_STRIPFLAGS_LIB +=
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200
@@ -84,7 +84,7 @@
QMAKE_MOVE = mv -f
QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
-QMAKE_STRIP = strip
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_STRIP =
+QMAKE_STRIPFLAGS_LIB +=
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200
@@ -87,7 +87,7 @@
QMAKE_MOVE = mv -f
QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
-QMAKE_STRIP = strip
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_STRIP =
+QMAKE_STRIPFLAGS_LIB +=
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p

25
redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch
Unescape Escape View File

@ -1,25 +0,0 @@
--- qt-x11-free-3.3.7/src/tools/qglobal.h.orig 2007-04-24 09:02:36.000000000 -0400
+++ qt-x11-free-3.3.7/src/tools/qglobal.h 2007-04-24 09:03:02.000000000 -0400
@@ -315,9 +315,9 @@
QString bloat. However, gcc 3.4 doesn't allow us to create references to
members of a packed struct. (Pointers are OK, because then you
supposedly know what you are doing.) */
-# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
+# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) && !defined(__ARM_EABI__)
# define Q_PACKED __attribute__ ((packed))
-# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4
+# if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
# define Q_NO_PACKED_REFERENCE
# endif
# endif
--- qt-x11-free-3.3.7/src/tools/qstring.h.orig 2007-04-24 09:03:11.000000000 -0400
+++ qt-x11-free-3.3.7/src/tools/qstring.h 2007-04-24 09:03:27.000000000 -0400
@@ -194,7 +194,7 @@
char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
ushort unicode() const { return ucs; }
#ifdef Q_NO_PACKED_REFERENCE
- ushort &unicode() { return *(&ucs); }
+ ushort &unicode() { return *((ushort *)&ucs); }
#else
ushort &unicode() { return ucs; }
#endif

14
redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch
Unescape Escape View File

@ -1,14 +0,0 @@
--- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100
+++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100
@@ -994,7 +994,10 @@
#endif
QFile file( filename + ".tmp" );
- if (! file.open(IO_WriteOnly)) {
+ mode_t old_umask = umask(0022);
+ bool f = file.open(IO_WriteOnly);
+ umask(old_umask);
+ if (! f) {
#ifdef QT_CHECK_STATE
qWarning("QSettings::sync: failed to open '%s' for writing",

19
redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch
Unescape Escape View File

@ -1,19 +0,0 @@
diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100
+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100
@@ -57,13 +57,13 @@
#endif
// newer platform SDKs use SQLLEN instead of SQLINTEGER
-#ifdef SQLLEN
+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
# define QSQLLEN SQLLEN
#else
# define QSQLLEN SQLINTEGER
#endif
-#ifdef SQLULEN
+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
# define QSQLULEN SQLULEN
#else
# define QSQLULEN SQLUINTEGER

11
redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch
Unescape Escape View File

@ -1,11 +0,0 @@
--- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200
+++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200
@@ -817,7 +817,7 @@
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUP>
- <GROUP><Name>QtGenerated</NAME>
+ <GROUP><NAME>QtGenerated</NAME>
$$CODEWARRIOR_QPREPROCESS_GROUP
$$CODEWARRIOR_QPREPROCESSOUT_GROUP
</GROUP>

24
redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch
Unescape Escape View File

@ -1,24 +0,0 @@
diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp
--- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100
+++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100
@@ -320,7 +320,7 @@ int main( int argc, char * argv[] )
out << "/****************************************************************************" << endl;
out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl;
out << "**" << endl;
- out << "** Created: " << QDateTime::currentDateTime().toString() << endl;
+ out << "** Created by User Interface Compiler" << endl;
out << "**" << endl;
out << "** WARNING! All changes made in this file will be lost!" << endl;
out << "****************************************************************************/" << endl << endl;
diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp
--- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100
+++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100
@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const
for ( it = images.begin(); it != images.end(); ++it )
out << "** " << *it << "\n";
out << "**\n";
- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
+ out << "** Created by The User Interface Compiler" << "\n";
out << "**\n";
out << "** WARNING! All changes made in this file will be lost!\n";
out << "****************************************************************************/\n";

33
redhat/dependencies/qt3/qt.csh
Unescape Escape View File

@ -1,33 +0,0 @@
# Qt initialization script (csh)
# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64,
# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding
# with different arches, the installed file is the one from the preferred arch. This is
# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found
# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe
if ( $?QTDIR ) then
exit
endif
switch (`uname -m`)
case x86_64:
case ia64:
case s390x:
set QTPREFIXES = "/usr/lib64/qt-3.3 /usr/lib/qt-3.3"
breaksw
case *:
set QTPREFIXES = "/usr/lib/qt-3.3 /usr/lib64/qt-3.3"
endsw
foreach QTPREFIX ( $QTPREFIXES )
test -d "$QTPREFIX" && setenv QTDIR $QTPREFIX && break
end
unset QTPREFIX QTPREFIXES
if ( "${path}" !~ *$QTDIR/bin* ) then
set path = ( $QTDIR/bin $path )
endif
setenv QTINC $QTDIR/include
setenv QTLIB $QTDIR/lib

32
redhat/dependencies/qt3/qt.sh
Unescape Escape View File

@ -1,32 +0,0 @@
# Qt initialization script (sh)
# In multilib environments there is a preferred architecture, 64 bit over 32 bit in x86_64,
# 32 bit over 64 bit in ppc64. When a conflict is found between two packages corresponding
# with different arches, the installed file is the one from the preferred arch. This is
# very common for executables in /usr/bin, for example. If the file /usr/bin/foo is found
# in an x86_64 package and in an i386 package, the executable from x86_64 will be installe
if [ -z "${QTDIR}" ]; then
case `uname -m` in
x86_64 | ia64 | s390x )
QT_PREFIXES="/usr/lib64/qt-3.3 /usr/lib/qt-3.3" ;;
* )
QT_PREFIXES="/usr/lib/qt-3.3 /usr/lib64/qt-3.3" ;;
esac
for QTDIR in ${QT_PREFIXES} ; do
test -d "${QTDIR}" && break
done
unset QT_PREFIXES
if ! echo ${PATH} | /bin/grep -q $QTDIR/bin ; then
PATH=$QTDIR/bin:${PATH}
fi
QTINC="$QTDIR/include"
QTLIB="$QTDIR/lib"
export QTDIR QTINC QTLIB PATH
fi

276
redhat/dependencies/qt3/qt3-3.3.8.d-fix_png15_support.patch
Unescape Escape View File

@ -1,276 +0,0 @@
commit e278b858739babff5cc19ca81a661e1256d162e7
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: 1326063972 -0600
Fix Qt3 builds with libpng15
This partially closes Bug 683
diff --git a/src/kernel/qpngio.cpp b/src/kernel/qpngio.cpp
index 25ce927..58e6e7e 100644
--- a/src/kernel/qpngio.cpp
+++ b/src/kernel/qpngio.cpp
@@ -46,6 +46,9 @@
#include "qiodevice.h"
#include <png.h>
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+#include <zlib.h>
+#endif /* LIBPNG 1.5 */
#ifdef Q_OS_TEMP
@@ -126,9 +129,29 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr
png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
0, 0, 0);
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ png_colorp info_ptr_palette = NULL;
+ int info_ptr_num_palette = 0;
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) {
+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette);
+ }
+
+ png_bytep info_ptr_trans_alpha = NULL;
+ int info_ptr_num_trans = 0;
+ png_color_16p info_ptr_trans_color = NULL;
+
+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+ png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color);
+ }
+#endif /* LIBPNG 1.5 */
+
if ( color_type == PNG_COLOR_TYPE_GRAY ) {
// Black & White or 8-bit grayscale
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) {
+#else /* LIBPNG 1.5 */
if ( bit_depth == 1 && info_ptr->channels == 1 ) {
+#endif /* LIBPNG 1.5 */
png_set_invert_mono( png_ptr );
png_read_update_info( png_ptr, info_ptr );
if (!image.create( width, height, 1, 2, QImage::BigEndian ))
@@ -162,7 +185,9 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr
image.setColor( i, qRgba(c,c,c,0xff) );
}
if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
-#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ const int g = info_ptr_trans_color->gray;
+#elif ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
const int g = info_ptr->trans_color.gray;
#else
const int g = info_ptr->trans_values.gray;
@@ -175,7 +200,11 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr
}
} else if ( color_type == PNG_COLOR_TYPE_PALETTE
&& png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ && info_ptr_num_palette <= 256 )
+#else /* LIBPNG 1.5 */
&& info_ptr->num_palette <= 256 )
+#endif /* LIBPNG 1.5 */
{
// 1-bit and 8-bit color
if ( bit_depth != 1 )
@@ -183,18 +212,33 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr
png_read_update_info( png_ptr, info_ptr );
png_get_IHDR(png_ptr, info_ptr,
&width, &height, &bit_depth, &color_type, 0, 0, 0);
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ if (!image.create(width, height, bit_depth, info_ptr_num_palette,
+#else /* LIBPNG 1.5 */
if (!image.create(width, height, bit_depth, info_ptr->num_palette,
+#endif /* LIBPNG 1.5 */
QImage::BigEndian))
return;
int i = 0;
if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
image.setAlphaBuffer( TRUE );
+
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ while ( i < info_ptr_num_trans ) {
+ image.setColor(i, qRgba(
+ info_ptr_palette[i].red,
+ info_ptr_palette[i].green,
+ info_ptr_palette[i].blue,
+#else /* LIBPNG 1.5 */
while ( i < info_ptr->num_trans ) {
image.setColor(i, qRgba(
info_ptr->palette[i].red,
info_ptr->palette[i].green,
info_ptr->palette[i].blue,
-#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
+#endif /* LIBPNG 1.5 */
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ info_ptr_trans_alpha[i]
+#elif ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=4 )
info_ptr->trans_alpha[i]
#else
info_ptr->trans[i]
@@ -204,11 +248,19 @@ void setup_qt( QImage& image, png_structp png_ptr, png_infop info_ptr, float scr
i++;
}
}
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ while ( i < info_ptr_num_palette ) {
+ image.setColor(i, qRgba(
+ info_ptr_palette[i].red,
+ info_ptr_palette[i].green,
+ info_ptr_palette[i].blue,
+#else /* LIBPNG 1.5 */
while ( i < info_ptr->num_palette ) {
image.setColor(i, qRgba(
info_ptr->palette[i].red,
info_ptr->palette[i].green,
info_ptr->palette[i].blue,
+#endif /* LIBPNG 1.5 */
0xff
)
);
@@ -295,7 +347,11 @@ void read_png_image(QImageIO* iio)
return;
}
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ if (setjmp(png_jmpbuf(png_ptr))) {
+#else /* LIBPNG 1.5 */
if (setjmp(png_ptr->jmpbuf)) {
+#endif /* LIBPNG 1.5 */
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
iio->setStatus(-4);
return;
@@ -486,7 +542,11 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
return FALSE;
}
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ if (setjmp(png_jmpbuf(png_ptr))) {
+#else /* LIBPNG 1.5 */
if (setjmp(png_ptr->jmpbuf)) {
+#endif /* LIBPNG 1.5 */
png_destroy_write_struct(&png_ptr, &info_ptr);
return FALSE;
}
@@ -508,10 +568,18 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn);
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+#warning XXXtnn not too sure about this
+/*
+according to png.h, channels is only used on read, not writes, so we
+should be able to comment this out.
+*/
+#else /* LIBPNG 1.5 */
info_ptr->channels =
(image.depth() == 32)
? (image.hasAlphaBuffer() ? 4 : 3)
: 1;
+#endif /* LIBPNG 1.5 */
png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(),
image.depth() == 1 ? 1 : 8 /* per channel */,
@@ -521,11 +589,18 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
: PNG_COLOR_TYPE_RGB
: PNG_COLOR_TYPE_PALETTE, 0, 0, 0);
-
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ png_color_8 sig_bit;
+ sig_bit.red = 8;
+ sig_bit.green = 8;
+ sig_bit.blue = 8;
+ png_set_sBIT(png_ptr, info_ptr, &sig_bit);
+#else /* LIBPNG 1.5 */
//png_set_sBIT(png_ptr, info_ptr, 8);
info_ptr->sig_bit.red = 8;
info_ptr->sig_bit.green = 8;
info_ptr->sig_bit.blue = 8;
+#endif /* LIBPNG 1.5 */
if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian)
png_set_packswap(png_ptr);
@@ -539,11 +614,22 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
png_set_PLTE(png_ptr, info_ptr, palette, num_palette);
int* trans = new int[num_palette];
int num_trans = 0;
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ png_colorp info_ptr_palette = NULL;
+ int tmp;
+ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp);
+#endif /* LIBPNG 1.5 */
for (int i=0; i<num_palette; i++) {
QRgb rgb=image.color(i);
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ info_ptr_palette[i].red = qRed(rgb);
+ info_ptr_palette[i].green = qGreen(rgb);
+ info_ptr_palette[i].blue = qBlue(rgb);
+#else /* LIBPNG 1.5 */
info_ptr->palette[i].red = qRed(rgb);
info_ptr->palette[i].green = qGreen(rgb);
info_ptr->palette[i].blue = qBlue(rgb);
+#endif /* LIBPNG 1.5 */
if (image.hasAlphaBuffer()) {
trans[i] = rgb >> 24;
if (trans[i] < 255) {
@@ -551,6 +637,9 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
}
}
}
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette);
+#endif /* LIBPNG 1.5 */
if (num_trans) {
copy_trans = new png_byte[num_trans];
for (int i=0; i<num_trans; i++)
@@ -561,7 +650,14 @@ bool QPNGImageWriter::writeImage(const QImage& image, int quality_in, int off_x_
}
if ( image.hasAlphaBuffer() ) {
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ png_color_8p sig_bit;
+ png_get_sBIT(png_ptr, info_ptr, &sig_bit);
+ sig_bit->alpha = 8;
+ png_set_sBIT(png_ptr, info_ptr, sig_bit);
+#else /* LIBPNG 1.5 */
info_ptr->sig_bit.alpha = 8;
+#endif /* LIBPNG 1.5 */
}
// Swap ARGB to RGBA (normal PNG format) before saving on
@@ -1047,7 +1143,11 @@ int QPNGFormat::decode(QImage& img, QImageConsumer* cons,
return -1;
}
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ if (setjmp(png_jmpbuf(png_ptr))) {
+#else /* LIBPNG 1.5 */
if (setjmp((png_ptr)->jmpbuf)) {
+#endif /* LIBPNG 1.5 */
png_destroy_read_struct(&png_ptr, &info_ptr, 0);
image = 0;
return -1;
@@ -1074,7 +1174,11 @@ int QPNGFormat::decode(QImage& img, QImageConsumer* cons,
if ( !png_ptr ) return 0;
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ if (setjmp(png_jmpbuf(png_ptr))) {
+#else /* LIBPNG 1.5 */
if (setjmp(png_ptr->jmpbuf)) {
+#endif /* LIBPNG 1.5 */
png_destroy_read_struct(&png_ptr, &info_ptr, 0);
image = 0;
state = MovieStart;
@@ -1134,7 +1238,11 @@ void QPNGFormat::end(png_structp png, png_infop info)
consumer->frameDone(QPoint(offx,offy),r);
consumer->end();
state = FrameStart;
+#if PNG_LIBPNG_VER_MAJOR>1 || ( PNG_LIBPNG_VER_MAJOR==1 && PNG_LIBPNG_VER_MINOR>=5 )
+ unused_data = png_process_data_pause(png, 0);
+#else /* LIBPNG 1.5 */
unused_data = (int)png->buffer_size; // Since libpng doesn't tell us
+#endif /* LIBPNG 1.5 */
}
#ifdef PNG_USER_CHUNKS_SUPPORTED

251
redhat/dependencies/qt3/qt3-3.3.8.d-updates_zh-tw_translations.patch
Unescape Escape View File

@ -1,251 +0,0 @@
--- qt3/translations/qt_zh-tw.ts.ORI 2011-10-30 09:42:26.000000000 +0100
+++ qt3/translations/qt_zh-tw.ts 2011-12-18 22:06:58.432615802 +0100
@@ -115,7 +115,7 @@
</message>
<message>
<source>Menu</source>
- <translation>Menu</translation>
+ <translation>選單</translation>
</message>
<message>
<source>Help</source>
@@ -337,7 +337,7 @@
</message>
<message>
<source>A&amp;lpha channel:</source>
- <translation>Alpha 色頻(&amp;L)：</translation>
+ <translation>透明色頻(&amp;L)：</translation>
</message>
<message>
<source>&amp;Basic colors</source>
@@ -429,11 +429,11 @@
</message>
<message>
<source>Read: %1</source>
- <translation>讀取： %1</translation>
+ <translation>讀取：%1</translation>
</message>
<message>
<source>Write: %1</source>
- <translation>寫入： %1</translation>
+ <translation>寫入：%1</translation>
</message>
<message>
<source>Cancel</source>
@@ -1194,7 +1194,7 @@
</message>
<message>
<source>Customize...</source>
- <translation>自訂...</translation>
+ <translation>自訂…</translation>
</message>
</context>
<context>
@@ -1264,7 +1264,7 @@
</message>
<message>
<source>&lt;h3&gt;About Qt&lt;/h3&gt;&lt;p&gt;This program uses Qt version %1.&lt;/p&gt;&lt;p&gt;Qt is a C++ toolkit for multiplatform GUI &amp;amp; application development.&lt;/p&gt;&lt;p&gt;Qt provides single-source portability across MS&amp;nbsp;Windows, Mac&amp;nbsp;OS&amp;nbsp;X, Linux, and all major commercial Unix variants.&lt;br&gt;Qt is also available for embedded devices.&lt;/p&gt;&lt;p&gt;Qt is a Trolltech product. See &lt;tt&gt;http://www.trolltech.com/qt/&lt;/tt&gt; for more information.&lt;/p&gt;</source>
- <translation>&lt;h3&gt;關於 Qt&lt;/h3&gt;&lt;p&gt;本程式使用 Qt 版本 %1。&lt;/p&gt;&lt;p&gt;Qt 是用於多平台 GUI 和應用程式開發的 C++ 工具套件。&lt;/p&gt;&lt;p&gt;Qt 為 MS&amp;nbsp;Windows、Mac&amp;nbsp;OS&amp;nbsp;X、Linux 和所有主要的商用 Unix 變異版本，提供跨平台的單一原始碼可攜性。&lt;br&gt;Qt 也可用於內嵌裝置。&lt;/p&gt;&lt;p&gt;Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 &lt;tt&gt;http://www.trolltech.com/qt/&lt;/tt&gt;。&lt;/p&gt;</translation>
+ <translation>&lt;h3&gt;關於 Qt&lt;/h3&gt;&lt;p&gt;本程式使用 Qt 版本 %1。&lt;/p&gt;&lt;p&gt;Qt 是用於多平臺 GUI 和應用程式開發的 C++ 工具套件。&lt;/p&gt;&lt;p&gt;Qt 為 MS&amp;nbsp;Windows、Mac&amp;nbsp;OS&amp;nbsp;X、Linux 和所有主要的商用 Unix 變異版本，提供跨平臺的單一原始碼可攜性。&lt;br&gt;Qt 也可用於內嵌裝置。&lt;/p&gt;&lt;p&gt;Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 &lt;tt&gt;http://www.trolltech.com/qt/&lt;/tt&gt;。&lt;/p&gt;</translation>
</message>
</context>
<context>
@@ -1282,7 +1282,7 @@
</message>
<message>
<source>Aliases: %1</source>
- <translation>別名： %1</translation>
+ <translation>別名：%1</translation>
</message>
<message>
<source>unknown</source>
@@ -1338,7 +1338,7 @@
</message>
<message>
<source>Browse...</source>
- <translation>瀏覽...</translation>
+ <translation>瀏覽…</translation>
</message>
<message>
<source>Options</source>
@@ -1386,123 +1386,123 @@
</message>
<message>
<source>A0 (841 x 1189 mm)</source>
- <translation>A0 (841 x 1189 mm)</translation>
+ <translation>A0 (841 x 1189 公釐)</translation>
</message>
<message>
<source>A1 (594 x 841 mm)</source>
- <translation>A1 (594 x 841 mm)</translation>
+ <translation>A1 (594 x 841 公釐)</translation>
</message>
<message>
<source>A2 (420 x 594 mm)</source>
- <translation>A2 (420 x 594 mm)</translation>
+ <translation>A2 (420 x 594 公釐)</translation>
</message>
<message>
<source>A3 (297 x 420 mm)</source>
- <translation>A3 (297 x 420 mm)</translation>
+ <translation>A3 (297 x 420 公釐)</translation>
</message>
<message>
<source>A4 (210x297 mm, 8.26x11.7 inches)</source>
- <translation>A4 (210x297 mm，8.26x11.7 英吋)</translation>
+ <translation>A4 (210x297 公釐，8.26x11.7 英吋)</translation>
</message>
<message>
<source>A5 (148 x 210 mm)</source>
- <translation>A5 (148 x 210 mm)</translation>
+ <translation>A5 (148 x 210 公釐)</translation>
</message>
<message>
<source>A6 (105 x 148 mm)</source>
- <translation>A6 (105 x 148 mm)</translation>
+ <translation>A6 (105 x 148 公釐)</translation>
</message>
<message>
<source>A7 (74 x 105 mm)</source>
- <translation>A7 (74 x 105 mm)</translation>
+ <translation>A7 (74 x 105 公釐)</translation>
</message>
<message>
<source>A8 (52 x 74 mm)</source>
- <translation>A8 (52 x 74 mm)</translation>
+ <translation>A8 (52 x 74 公釐)</translation>
</message>
<message>
<source>A9 (37 x 52 mm)</source>
- <translation>A9 (37 x 52 mm)</translation>
+ <translation>A9 (37 x 52 公釐)</translation>
</message>
<message>
<source>B0 (1000 x 1414 mm)</source>
- <translation>B0 (1000 x 1414 mm)</translation>
+ <translation>B0 (1000 x 1414 公釐)</translation>
</message>
<message>
<source>B1 (707 x 1000 mm)</source>
- <translation>B1 (707 x 1000 mm)</translation>
+ <translation>B1 (707 x 1000 公釐)</translation>
</message>
<message>
<source>B2 (500 x 707 mm)</source>
- <translation>B2 (500 x 707 mm)</translation>
+ <translation>B2 (500 x 707 公釐)</translation>
</message>
<message>
<source>B3 (353 x 500 mm)</source>
- <translation>B3 (353 x 500 mm)</translation>
+ <translation>B3 (353 x 500 公釐)</translation>
</message>
<message>
<source>B4 (250 x 353 mm)</source>
- <translation>B4 (250 x 353 mm)</translation>
+ <translation>B4 (250 x 353 公釐)</translation>
</message>
<message>
<source>B5 (176 x 250 mm, 6.93x9.84 inches)</source>
- <translation>B5 (176 x 250 mm，6.93x9.84 英吋)</translation>
+ <translation>B5 (176 x 250 公釐，6.93x9.84 英吋)</translation>
</message>
<message>
<source>B6 (125 x 176 mm)</source>
- <translation>B6 (125 x 176 mm)</translation>
+ <translation>B6 (125 x 176 公釐)</translation>
</message>
<message>
<source>B7 (88 x 125 mm)</source>
- <translation>B7 (88 x 125 mm)</translation>
+ <translation>B7 (88 x 125 公釐)</translation>
</message>
<message>
<source>B8 (62 x 88 mm)</source>
- <translation>B8 (62 x 88 mm)</translation>
+ <translation>B8 (62 x 88 公釐)</translation>
</message>
<message>
<source>B9 (44 x 62 mm)</source>
- <translation>B9 (44 x 62 mm)</translation>
+ <translation>B9 (44 x 62 公釐)</translation>
</message>
<message>
<source>B10 (31 x 44 mm)</source>
- <translation>B10 (31 x 44 mm)</translation>
+ <translation>B10 (31 x 44 公釐)</translation>
</message>
<message>
<source>C5E (163 x 229 mm)</source>
- <translation>C5E (163 x 229 mm)</translation>
+ <translation>C5E (163 x 229 公釐)</translation>
</message>
<message>
<source>DLE (110 x 220 mm)</source>
- <translation>DLE (110 x 220 mm)</translation>
+ <translation>DLE (110 x 220 公釐)</translation>
</message>
<message>
<source>Executive (7.5x10 inches, 191x254 mm)</source>
- <translation>Executive (7.5x10 英吋，191x254 mm)</translation>
+ <translation>Executive (7.5x10 英吋，191x254 公釐)</translation>
</message>
<message>
<source>Folio (210 x 330 mm)</source>
- <translation>Folio (210 x 330 mm)</translation>
+ <translation>Folio (210 x 330 公釐)</translation>
</message>
<message>
<source>Ledger (432 x 279 mm)</source>
- <translation>Ledger (432 x 279 mm)</translation>
+ <translation>Ledger (432 x 279 公釐)</translation>
</message>
<message>
<source>Legal (8.5x14 inches, 216x356 mm)</source>
- <translation>Legal (8.5x14 英吋，216x356 mm)</translation>
+ <translation>Legal (8.5x14 英吋，216x356 公釐)</translation>
</message>
<message>
<source>Letter (8.5x11 inches, 216x279 mm)</source>
- <translation>Letter (8.5x11 英吋，216x279 mm)</translation>
+ <translation>Letter (8.5x11 英吋，216x279 公釐)</translation>
</message>
<message>
<source>Tabloid (279 x 432 mm)</source>
- <translation>Tabloid (279 x 432 mm)</translation>
+ <translation>Tabloid (279 x 432 公釐)</translation>
</message>
<message>
<source>US Common #10 Envelope (105 x 241 mm)</source>
- <translation>美國一般 10 號信封 (105 x 241 mm)</translation>
+ <translation>美國一般 10 號信封 (105 x 241 公釐)</translation>
</message>
<message>
<source>Setup Printer</source>
@@ -1691,7 +1691,7 @@
<name>QToolBar</name>
<message>
<source>More...</source>
- <translation>其他...</translation>
+ <translation>其他…</translation>
</message>
</context>
<context>
@@ -1811,7 +1811,7 @@
</message>
<message>
<source>&amp;Help</source>
- <translation>說明(&amp;H)</translation>
+ <translation>求助(&amp;H)</translation>
</message>
</context>
<context>
@@ -1988,7 +1988,7 @@
</message>
<message>
<source>Paste special...</source>
- <translation>選擇性貼上...</translation>
+ <translation>選擇性貼上…</translation>
</message>
<message>
<source>Clear</source>

702
redhat/dependencies/qt3/qt3-3.3.8.d.spec
Unescape Escape View File

@ -1,702 +0,0 @@
# Always install under standard prefix
%define _prefix /usr
# This allows the legacy RHEL/Fedora patches to apply in TDE version.
%define _default_patch_fuzz 2
# The following QT4 packages should NOT be installed to
# allow QT3 compilation (please uninstall them prior to compile)
# qt
# qt-sqlite
# qt-mysql
# qt-x11
# qt-devel
# ...maybe others !!!!
Name: qt3
Epoch: 1
Version: 3.3.8.d
Release: 8%{?dist}
Summary: The shared library for the Qt 3 GUI toolkit
License: QPL or GPLv2 or GPLv3
Group: System Environment/Libraries
URL: http://www.trinitydesktop.org/
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
Obsoletes: qt < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: qt = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: qt3-3.3.8.d.tar.gz
Source2: qt.sh
Source3: qt.csh
Source4: designer3.desktop
Source5: assistant3.desktop
Source6: linguist3.desktop
Source7: qtconfig3.desktop
Patch1: qt-3.3.4-print-CJK.patch
Patch2: qt-3.0.5-nodebug.patch
Patch3: qt-3.1.0-makefile.patch
Patch4: qt-x11-free-3.3.7-umask.patch
Patch5: qt-x11-free-3.3.6-strip.patch
Patch7: qt-x11-free-3.3.2-quiet.patch
Patch12: qt-uic-nostdlib.patch
Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch
Patch25: qt-x11-free-3.3.8b-uic-multilib.patch
Patch27: qt-3.3.6-fontrendering-ml_IN-209097.patch
Patch29: qt-3.3.8-fontrendering-as_IN-209972.patch
Patch31: qt-3.3.6-fontrendering-te_IN-211259.patch
Patch32: qt-3.3.6-fontrendering-214371.patch
Patch33: qt-3.3.8-fontrendering-#214570.patch
Patch34: qt-3.3.6-fontrendering-ml_IN-209974.patch
Patch35: qt-3.3.6-fontrendering-ml_IN-217657.patch
Patch37: qt-3.3.6-fontrendering-gu-228452.patch
Patch38: qt-x11-free-3.3.8-odbc.patch
Patch39: qt-x11-free-3.3.7-arm.patch
Patch40: qt-x11-free-3.3.8b-typo.patch
# immodule patches
Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch
# qt-copy patches
Patch110: 0084-compositing-properties.patch
# upstream patches
Patch200: qt-x11-free-3.3.4-fullscreen.patch
# TDE 3.5.13 patches
Patch300: qt3-3.3.8.d-updates_zh-tw_translations.patch
## [qt3] Fix Qt3 builds with libpng15. [Bug #683]
Patch301: qt3-3.3.8.d-fix_png15_support.patch
%define qt_dirname qt-3.3
%define qtdir %{_libdir}/%{qt_dirname}
%define qt_docdir %{_docdir}/qt-devel-%{version}
%define smp 1
%define immodule 1
%define debug 0
# MySQL plugins
%define plugin_mysql -plugin-sql-mysql
%define mysql_include_dir %{_includedir}/mysql
%define mysql_lib_dir %{_libdir}/mysql
# Postgres plugins
%define plugin_psql -plugin-sql-psql
# ODBC plugins
%define plugin_odbc -plugin-sql-odbc
# sqlite plugins
%define plugin_sqlite -plugin-sql-sqlite
%define plugins_style -qt-style-cde -qt-style-motifplus -qt-style-platinum -qt-style-sgi -qt-style-windows -qt-style-compact -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng
%define plugins %{plugin_mysql} %{plugin_psql} %{plugin_odbc} %{plugin_sqlite} %{plugins_style}
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
Requires: coreutils
Requires: fontconfig >= 2.0
Requires: /etc/ld.so.conf.d
BuildRequires: desktop-file-utils
BuildRequires: libmng-devel
BuildRequires: glibc-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: zlib-devel
BuildRequires: perl
BuildRequires: sed
BuildRequires: findutils
BuildRequires: cups-devel
BuildRequires: tar
BuildRequires: freetype-devel
BuildRequires: fontconfig-devel
BuildRequires: desktop-file-utils
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
BuildRequires: unixODBC-devel
BuildRequires: sqlite-devel
BuildRequires: gcc-c++
BuildRequires: make
%if 0%{?rhel} == 4
BuildRequires: libungif-devel
BuildRequires: xorg-x11-devel
%else
BuildRequires: giflib-devel
BuildRequires: libXrender-devel
BuildRequires: libXrandr-devel
BuildRequires: libXcursor-devel
BuildRequires: libXinerama-devel
BuildRequires: libXft-devel
BuildRequires: libXext-devel
BuildRequires: libX11-devel
BuildRequires: libSM-devel
BuildRequires: libICE-devel
BuildRequires: libXt-devel
BuildRequires: libXmu-devel
BuildRequires: libXi-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
%endif
%package config
Summary: Graphical configuration tool for programs using Qt 3
Group: User Interface/Desktops
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
Obsoletes: qt-config < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: qt-config = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%package devel
Summary: Development files for the Qt 3 GUI toolkit
Group: Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: freetype-devel
Requires: fontconfig-devel
Requires: libpng-devel
Requires: libjpeg-devel
Requires: libmng-devel
%if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel
%else
Requires: libXrender-devel
Requires: libXrandr-devel
Requires: libXcursor-devel
Requires: libXinerama-devel
Requires: libXft-devel
Requires: libXext-devel
Requires: libX11-devel
Requires: libSM-devel
Requires: libICE-devel
Requires: libXt-devel
Requires: xorg-x11-proto-devel
Requires: mesa-libGL-devel
Requires: mesa-libGLU-devel
%endif
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
Obsoletes: qt-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: qt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%package devel-docs
Summary: Documentation for the Qt 3 GUI toolkit
Group: Development/Libraries
Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
Obsoletes: qt-devel-docs < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: qt-devel-docs = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%package ODBC
Summary: ODBC drivers for Qt 3's SQL classes
Group: System Environment/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
Obsoletes: qt-ODBC < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: qt-ODBC = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%package MySQL
Summary: MySQL drivers for Qt 3's SQL classes
Group: System Environment/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
Obsoletes: qt-MySQL < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: qt-MySQL = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%package PostgreSQL
Summary: PostgreSQL drivers for Qt 3's SQL classes
Group: System Environment/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
Obsoletes: qt-PostgreSQL < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: qt-PostgreSQL = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%package sqlite
Summary: sqlite drivers for Qt 3's SQL classes
Group: System Environment/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
Obsoletes: qt-sqlite < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: qt-sqlite = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%package designer
Summary: Interface designer (IDE) for the Qt 3 toolkit
Group: Development/Tools
Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release}
%if 0%{?rhel} <= 5 && 0%{?fedora} <= 7
Obsoletes: qt-designer < %{?epoch:%{epoch}:}%{version}-%{release}
Provides: qt-designer = %{?epoch:%{epoch}:}%{version}-%{release}
%endif
%description
Qt is a GUI software toolkit which simplifies the task of writing and
maintaining GUI (Graphical User Interface) applications
for the X Window System.
Qt is written in C++ and is fully object-oriented.
This package contains the shared library needed to run Qt 3
applications, as well as the README files for Qt 3.
%description config
Qt is a GUI software toolkit which simplifies the task of writing and
maintaining GUI (Graphical User Interface) applications
for the X Window System.
Qt is written in C++ and is fully object-oriented.
This package contains a graphical configuration tool for programs using Qt 3.
%description devel
The %{name}-devel package contains the files necessary to develop
applications using the Qt GUI toolkit: the header files, the Qt meta
object compiler.
Install %{name}-devel if you want to develop GUI applications using the Qt 3
toolkit.
%description devel-docs
The %{name}-devel-docs package contains the man pages, the HTML documentation and
example programs for Qt 3.
%description ODBC
ODBC driver for Qt 3's SQL classes (QSQL)
%description MySQL
MySQL driver for Qt 3's SQL classes (QSQL)
%description PostgreSQL
PostgreSQL driver for Qt 3's SQL classes (QSQL)
%description sqlite
sqlite driver for Qt 3's SQL classes (QSQL)
%description designer
The %{name}-designer package contains an User Interface designer tool
for the Qt 3 toolkit.
%prep
%setup -q -n qt3
%patch1 -p1 -b .cjk
%patch2 -p1 -b .ndebug
%patch3 -p1 -b .makefile
%patch4 -p1 -b .umask
%patch5 -p1
%patch7 -p1 -b .quiet
%patch12 -p1 -b .nostdlib
%patch13 -p1 -b .fonts
%patch25 -p1 -b .uic-multilib
%patch27 -p1 -b .fontrendering-ml_IN-bz#209097
%patch29 -p1 -b .fontrendering-as_IN-bz#209972
%patch31 -p1 -b .fontrendering-te_IN-bz#211259
%patch32 -p1 -b .fontrendering-bz#214371
%patch33 -p1 -b .fontrendering-#214570
%patch34 -p1 -b .fontrendering-#209974
%patch35 -p1 -b .fontrendering-ml_IN-217657
%patch37 -p1 -b .fontrendering-gu-228452
%patch38 -p1 -b .odbc
# it's not 100% clear to me if this is safe for all archs -- Rex
%ifarch armv5tel
%patch39 -p1 -b .arm
%endif
%patch40 -p1
# immodule patches
%if %{immodule}
%patch53 -p1 -b .resetinputcontext
%endif
# qt-copy patches
%patch110 -p0 -b .0084-compositing-properties
# upstream patches
%patch200 -p1 -b .fullscreen
# TDE 3.5.13 patches
%patch300 -p1
%patch301 -p1
# convert to UTF-8
iconv -f iso-8859-1 -t utf-8 < doc/man/man3/qdial.3qt > doc/man/man3/qdial.3qt_
mv doc/man/man3/qdial.3qt_ doc/man/man3/qdial.3qt
%build
export QTDIR=`/bin/pwd`
export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
export PATH="$QTDIR/bin:$PATH"
export QTDEST=%{qtdir}
# Huho ... it looks like we are not detecting some libraries correctly under RHEL4 ...
%if 0%{?rhel} == 4
%__sed -i plugins/src/inputmethods/xim/xim.pro \
-e "/INCLUDEPATH/ s|$| /usr/include/freetype2|"
%endif
%if %{smp}
export SMP_MFLAGS="%{?_smp_mflags}"
%endif
%if %{immodule}
sh ./make-symlinks.sh
%endif
# set correct X11 prefix
if [ -d /usr/X11R6 ]; then
perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=/usr/X11R6/%{_lib}," mkspecs/*/qmake.conf
perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=/usr/X11R6/include," mkspecs/*/qmake.conf
else
perl -pi -e "s,QMAKE_LIBDIR_X11.*,QMAKE_LIBDIR_X11\t=," mkspecs/*/qmake.conf
perl -pi -e "s,QMAKE_INCDIR_X11.*,QMAKE_INCDIR_X11\t=," mkspecs/*/qmake.conf
fi
perl -pi -e "s,QMAKE_INCDIR_OPENGL.*,QMAKE_INCDIR_OPENGL\t=," mkspecs/*/qmake.conf
perl -pi -e "s,QMAKE_LIBDIR_OPENGL.*,QMAKE_LIBDIR_OPENGL\t=," mkspecs/*/qmake.conf
# don't use rpath
perl -pi -e "s|-Wl,-rpath,| |" mkspecs/*/qmake.conf
perl -pi -e "s|-O2|$INCLUDES %{optflags} -fno-strict-aliasing|g" mkspecs/*/qmake.conf
# set correct lib path
if [ "%{_lib}" == "lib64" ] ; then
perl -pi -e "s,/usr/lib /lib,/usr/%{_lib} /%{_lib},g" config.tests/{unix,x11}/*.test
perl -pi -e "s,/lib /usr/lib,/%{_lib} /usr/%{_lib},g" config.tests/{unix,x11}/*.test
fi
# build shared, threaded (default) libraries
echo yes | ./configure \
-prefix $QTDEST \
-docdir %{qt_docdir} \
%if %{_lib} == lib64
-platform linux-g++-64 \
%else
-platform linux-g++ \
%endif
%if %{debug}
-debug \
%else
-release \
%endif
-shared \
-largefile \
-qt-gif \
-system-zlib \
-system-libpng \
-system-libmng \
-system-libjpeg \
-no-exceptions \
-enable-styles \
-enable-tools \
-enable-kernel \
-enable-widgets \
-enable-dialogs \
-enable-iconview \
-enable-workspace \
-enable-network \
-enable-canvas \
-enable-table \
-enable-xml \
-enable-opengl \
-enable-sql \
-qt-style-motif \
%{plugins} \
-stl \
-thread \
-cups \
-sm \
%if 0%{?rhel} == 4
-no-xinerama \
-no-xrandr \
%else
-xinerama \
-xrandr \
%endif
-xrender \
-xkb \
-ipv6 \
-dlopen-opengl \
-xft \
-tablet -v
make $SMP_MFLAGS src-qmake
# build sqlite plugin
pushd plugins/src/sqldrivers/sqlite
qmake -o Makefile sqlite.pro
popd
# build psql plugin
pushd plugins/src/sqldrivers/psql
qmake -o Makefile "INCLUDEPATH+=%{_includedir}/pgsql %{_includedir}/pgsql/server %{_includedir}/pgsql/internal" "LIBS+=-lpq" psql.pro
popd
# build mysql plugin
pushd plugins/src/sqldrivers/mysql
qmake -o Makefile "INCLUDEPATH+=%{mysql_include_dir}" "LIBS+=-L%{mysql_lib_dir} -lmysqlclient" mysql.pro
popd
# build odbc plugin
pushd plugins/src/sqldrivers/odbc
qmake -o Makefile "LIBS+=-lodbc" odbc.pro
popd
make $SMP_MFLAGS src-moc
make $SMP_MFLAGS sub-src
make $SMP_MFLAGS sub-tools UIC="$QTDIR/bin/uic -nostdlib -L $QTDIR/plugins"
%install
rm -rf %{buildroot}
export QTDIR=`/bin/pwd`
export LD_LIBRARY_PATH="$QTDIR/lib:$LD_LIBRARY_PATH"
export PATH="$QTDIR/bin:$PATH"
export QTDEST=%{qtdir}
make install INSTALL_ROOT=%{buildroot}
for i in findtr qt20fix qtrename140 lrelease lupdate ; do
install bin/$i %{buildroot}%{qtdir}/bin/
done
mkdir -p %{buildroot}%{_libdir}/pkgconfig/
mv %{buildroot}%{qtdir}/lib/pkgconfig/*.pc %{buildroot}%{_libdir}/pkgconfig/
# install man pages
mkdir -p %{buildroot}%{_mandir}
cp -fR doc/man/* %{buildroot}%{_mandir}/
# clean up
make -C tutorial clean
make -C examples clean
# Make sure the examples can be built outside the source tree.
# Our binaries fulfill all requirements, so...
perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `find examples -name "*.pro"`
# don't include Makefiles of qt examples/tutorials
find examples -name "Makefile" | xargs rm -f
find examples -name "*.obj" | xargs rm -rf
find examples -name "*.moc" | xargs rm -rf
find tutorial -name "Makefile" | xargs rm -f
for a in */*/Makefile ; do
sed 's|^SYSCONF_MOC.*|SYSCONF_MOC = %{qtdir}/bin/moc|' < $a > ${a}.2
mv -v ${a}.2 $a
done
mkdir -p %{buildroot}/etc/profile.d
install -m 644 %{SOURCE2} %{SOURCE3} %{buildroot}/etc/profile.d/
# Add desktop files
mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install \
--dir %{buildroot}%{_datadir}/applications \
--vendor="qt" \
%{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7}
# Patch qmake to use qt-mt unconditionally
perl -pi -e "s,-lqt ,-lqt-mt ,g;s,-lqt$,-lqt-mt,g" %{buildroot}%{qtdir}/mkspecs/*/qmake.conf
# remove broken links
rm -f %{buildroot}%{qtdir}/mkspecs/default/linux-g++*
rm -f %{buildroot}%{qtdir}/lib/*.la
mkdir -p %{buildroot}/etc/ld.so.conf.d
echo "%{qtdir}/lib" > %{buildroot}/etc/ld.so.conf.d/qt-%{_arch}.conf
# install icons
mkdir %{buildroot}%{_datadir}/pixmaps
install -m 644 tools/assistant/images/qt.png %{buildroot}%{_datadir}/pixmaps/qtconfig3.png
install -m 644 tools/assistant/images/designer.png %{buildroot}%{_datadir}/pixmaps/designer3.png
install -m 644 tools/assistant/images/assistant.png %{buildroot}%{_datadir}/pixmaps/assistant3.png
install -m 644 tools/assistant/images/linguist.png %{buildroot}%{_datadir}/pixmaps/linguist3.png
# own style directory
mkdir -p %{buildroot}%{qtdir}/plugins/styles
%clean
rm -rf %{buildroot}
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc FAQ LICENSE* README* changes*
%dir %{qtdir}
%dir %{qtdir}/bin
%dir %{qtdir}/lib
%dir %{qtdir}/plugins
%dir %{qtdir}/plugins/sqldrivers
%dir %{qtdir}/plugins/styles
%{qtdir}/translations
%{qtdir}/plugins/designer/
%if %{immodule}
%{qtdir}/plugins/inputmethods
%endif
%config /etc/profile.d/*
/etc/ld.so.conf.d/*
%{qtdir}/lib/libqui.so.*
%{qtdir}/lib/libqt*.so.*
%files config
%defattr(-,root,root,-)
%{qtdir}/bin/qtconfig
%{_datadir}/applications/*qtconfig*.desktop
%{_datadir}/pixmaps/qtconfig3.png
%files devel
%defattr(-,root,root,-)
%{qt_docdir}/
%{qtdir}/bin/moc
%{qtdir}/bin/uic
%{qtdir}/bin/findtr
%{qtdir}/bin/qt20fix
%{qtdir}/bin/qtrename140
%{qtdir}/bin/assistant
%{qtdir}/bin/qm2ts
%{qtdir}/bin/qmake
%{qtdir}/bin/qembed
%{qtdir}/bin/linguist
%{qtdir}/bin/lupdate
%{qtdir}/bin/lrelease
%{qtdir}/include
%{qtdir}/mkspecs
%{qtdir}/lib/libqt*.so
%{qtdir}/lib/libqui.so
%{qtdir}/lib/libeditor.a
%{qtdir}/lib/libdesigner*.a
%{qtdir}/lib/libqassistantclient.a
%{qtdir}/lib/*.prl
%{qtdir}/phrasebooks
%{_libdir}/pkgconfig/*
%{_datadir}/applications/*linguist*.desktop
%{_datadir}/applications/*assistant*.desktop
%{_datadir}/pixmaps/linguist3.png
%{_datadir}/pixmaps/assistant3.png
# QT 3.3.8.D (TDE): 4 binaries have appeared
%{qtdir}/bin/createcw
%{qtdir}/bin/makeqpf
%{qtdir}/bin/mergetr
%{qtdir}/bin/msg2qm
# QT 3.3.8.D (TDE): removes lots of unnecessary include files
# (where do they come from ??? They were not in 3.3.8b !)
%exclude %{qtdir}/include/btree.h
%exclude %{qtdir}/include/crc32.h
%exclude %{qtdir}/include/debian_qsql_odbc.h
%exclude %{qtdir}/include/deflate.h
%exclude %{qtdir}/include/ftglue.h
%exclude %{qtdir}/include/ftxgdef.h
%exclude %{qtdir}/include/ftxgpos.h
%exclude %{qtdir}/include/ftxgsub.h
%exclude %{qtdir}/include/ftxopen.h
%exclude %{qtdir}/include/ftxopenf.h
%exclude %{qtdir}/include/hash.h
%exclude %{qtdir}/include/inffast.h
%exclude %{qtdir}/include/inffixed.h
%exclude %{qtdir}/include/inflate.h
%exclude %{qtdir}/include/inftrees.h
%exclude %{qtdir}/include/moc_yacc.h
%exclude %{qtdir}/include/opcodes.h
%exclude %{qtdir}/include/os.h
%exclude %{qtdir}/include/otlbuffer.h
%exclude %{qtdir}/include/pager.h
%exclude %{qtdir}/include/parse.h
%exclude %{qtdir}/include/pngasmrd.h
%exclude %{qtdir}/include/pngconf.h
%exclude %{qtdir}/include/sqlite.h
%exclude %{qtdir}/include/sqliteInt.h
%exclude %{qtdir}/include/trees.h
%exclude %{qtdir}/include/vdbe.h
%exclude %{qtdir}/include/vdbeInt.h
%exclude %{qtdir}/mkspecs/linux-g++-sparc
%files devel-docs
%defattr(-,root,root,-)
%doc examples
%doc tutorial
%{_mandir}/*/*
%files sqlite
%defattr(-,root,root,-)
%{qtdir}/plugins/sqldrivers/libqsqlite.so
%files ODBC
%defattr(-,root,root,-)
%{qtdir}/plugins/sqldrivers/libqsqlodbc.so
%files PostgreSQL
%defattr(-,root,root,-)
%{qtdir}/plugins/sqldrivers/libqsqlpsql.so
%files MySQL
%defattr(-,root,root,-)
%{qtdir}/plugins/sqldrivers/libqsqlmysql.so
%files designer
%defattr(-,root,root,-)
%{qtdir}/templates
%{qtdir}/bin/designer
%{_datadir}/applications/*designer*.desktop
%{_datadir}/pixmaps/designer3.png
%changelog
* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-8
- Fix Provides and Obsoletes, again and again ...
* Sat Apr 28 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-7
- Fix Provides and Obsoletes. Now only for RHEL 5.
* Tue Apr 24 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-6
- Fix Qt3 builds with libpng15. [Bug #683]
* Sat Apr 21 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-5
- Fix 'Provides' AGAIN !! [Bug #823]
* Mon Apr 02 2012 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-4
- Fix 'Provides' [Bug #823]
* Sun Dec 18 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-3
- Updates zh_TW translations, thanks to Wei-Lun Chao .
* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-2
- Add missing BuildRequires
* Fri Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.3.8.d-1
- Initial release for RHEL 6, RHEL 5, and Fedora 15
- Switch to Trinity Version
- Spec file based on RHEL 6 'qt3-3.3.8b-29'

516
redhat/dependencies/qt3/qt3-3.5.13.2.patch
Unescape Escape View File

@ -1,516 +0,0 @@
commit 1ee1ffbae69dc78721af139f0794628571fd35ef
Author: Slávek Banko <slavek.banko@axis.cz>
Date: 1386900429 +0100
Fix FTBFS with libfreetype6 >= 2.5.x
This resolves Bug 1765
diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test
index 5cabc32..d4cb4ba 100755
--- a/config.tests/x11/xfreetype.test
+++ b/config.tests/x11/xfreetype.test
@@ -116,12 +116,15 @@ fi
# check for freetype2 headers
FREETYPE2_INCDIR=
if [ "$XFT" = "yes" ]; then
- INC="freetype2/freetype/freetype.h"
XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG`
LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG`
INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include"
F=
for INCDIR in $INCDIRS; do
+ INC="freetype2/freetype/freetype.h" # libfreetype <= 2.4.9-1.1
+ if ! [ -f $INCDIR/$INC ]; then
+ INC="freetype2/freetype.h" # libfreetype >= 2.5.1-1
+ fi
if [ -f $INCDIR/$INC ]; then
# detect major version of freetype2
FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'`
--- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200
+++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200
@@ -501,10 +501,10 @@
(*f).latin1(),
(const char*) QFile::encodeName( old->library() ) );
} else {
- qWarning("%s: Feature %s already defined in %s!",
+/* qWarning("%s: Feature %s already defined in %s!",
(const char*) QFile::encodeName( old->library() ),
(*f).latin1(),
- (const char*) QFile::encodeName( plugin->library() ) );
+ (const char*) QFile::encodeName( plugin->library() ) ); */
}
}
}
--- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100
+++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
+all: symlinks src-qmake src-moc sub-src sub-tools
@echo
@echo "The Qt library is now built in ./lib"
@echo "The Qt examples are built in the directories in ./examples"
--- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100
+++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100
@@ -4748,10 +4748,11 @@
// GB18030 fonts on Turbolinux
static const psfont SongGBK2K [] = {
- { "MSung-Light-GBK2K-H", 0, 100. },
- { "MSung-Italic-GBK2K-H", 0, 100. },
- { "MSung-Bold-GBK2K-H", 0, 100. },
- { "MSung-BoldItalic-GBK2K-H", 0, 100. },
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
+ { "MSungGBK-Light-GBK2K-H", 0, 100. },
+
};
static const psfont KaiGBK2K [] = {
{ "MKai-Medium-GBK2K-H", 0, 100. },
diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp
--- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530
@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy
toPos += 2;
if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) {
if (matra_position == Post || matra_position == Split) {
- toPos = matra+1;
+ if (matra_position == Post )
+ toPos = matra;
+ else
+ toPos = matra+1;
matra -= 2;
}
} else if (script == QFont::Kannada) {
--- qt3/src/kernel/qscriptengine_x11.cpp.fontrendering-gu-228452 2012-09-29 11:30:23.821539127 +0200
+++ qt3/src/kernel/qscriptengine_x11.cpp 2012-09-29 11:31:59.679413873 +0200
@@ -261,7 +261,7 @@
Other, Other, Other, Other,
Other, Other, Other, Other,
- Other, Other, Other, Other,
+ Other, Other, VowelMark, VowelMark,
Other, Other, Other, Other,
Other, Other, Other, Other,
Other, Other, Other, Other,
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800
@@ -868,7 +868,7 @@
None, None, None, None,
None, None, None, Post,
- Post, None, Below, None,
+ None, None, None, None,
None, Post, None, None,
None, None, None, None,
None, None, Post, Post,
@@ -1271,6 +1271,16 @@
int base = 0;
int reph = -1;
+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam
+ bool is_special_conjuction_malayalam = false;
+
+ if ((len == 3) &&
+ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) &&
+ (reordered[1] == 0x0d4d) &&
+ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) {
+ is_special_conjuction_malayalam = true;
+ }
+
#ifdef INDIC_DEBUG
IDEBUG("original:");
for (i = 0; i < len; i++) {
@@ -1547,6 +1557,15 @@
reph = i;
}
+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam
+ if (is_special_conjuction_malayalam) {
+ unsigned short temp;
+
+ temp = reordered[0];
+ reordered[0] = reordered[2];
+ reordered[2] = temp;
+ }
+
if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances,
&item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError)
return FALSE;
@@ -1658,6 +1677,15 @@
// halant always applies
+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam
+ if (is_special_conjuction_malayalam) {
+ unsigned int temp;
+
+ temp = properties[0];
+ properties[0] = ~PreSubstProperty;
+ properties[2] = temp;
+ }
+
#ifdef INDIC_DEBUG
{
IDEBUG("OT properties:");
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100
@@ -864,7 +864,7 @@
None, None, None, Post,
None, None, None, None,
- None, Post, None, None,
+ None, None, None, None,
None, None, None, None,
None, None, Post, Post,
diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp
--- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530
+++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530
@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri
if ( script >= QFont::Arabic && script <= QFont::Khmer ) {
// complex script shaping. Have to do some hard work
int from = QMAX( 0, pos - 8 );
- int to = QMIN( (int)str.length(), pos + 8 );
+ int to = str.length();
QConstString cstr( str.unicode()+from, to-from);
QTextEngine layout( cstr.string(), d );
layout.itemize( QTextEngine::WidthOnly );
--- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800
+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800
@@ -786,7 +786,7 @@
Below, None, Below, Below,
Below, Below, Below, Below,
- Below, None, Below, Below,
+ Below, Below, Below, Below,
None, Below, Below, Below,
Below, Below, None, None,
None, None, Post, Above,
--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200
+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200
@@ -1240,7 +1240,7 @@
int script = item->script;
Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala);
const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari);
- const unsigned short ra = script_base + 0x30;
+ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification
const unsigned short halant = script_base + 0x4d;
const unsigned short nukta = script_base + 0x3c;
@@ -1278,6 +1278,11 @@
}
#endif
+ unsigned short *chkAssamese=reordered.data();
+ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra
+ {
+ ra = script_base + 0x70;
+ }
if (len != 1) {
unsigned short *uc = reordered.data();
bool beginsWithRa = FALSE;
--- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200
+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200
@@ -601,7 +601,7 @@
None, None, None, None,
None, None, None, None,
- None, None, None, None,
+ Below, None, None, None,
None, None, None, None,
None, None, None, None,
None, None, None, None,
--- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400
+++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400
@@ -149,6 +149,9 @@
} else {
trmacro = &opt[1];
}
+ } else if ( opt == "nostdlib") {
+ QStringList x;
+ QApplication::setLibraryPaths(x);
} else if ( opt == "L" ) {
if ( !(n < argc-1) ) {
error = "Missing plugin path.";
--- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200
+++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200
@@ -288,8 +288,9 @@
{
#if defined(QT_CHECK_STATE)
if ( qApp->type() == QApplication::Tty ) {
- qWarning( "QPixmap: Cannot create a QPixmap when no GUI "
- "is being used" );
+// qWarning( "QPixmap: Cannot create a QPixmap when no GUI "
+// "is being used" );
+ ;
}
#endif
--- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100
+++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100
@@ -1412,7 +1412,7 @@
False, XA_ATOM, &type, &format, &nitems, &after, &data);
if (type == XA_ATOM && format == 32) {
- ts.writeBlock((const char *) data, nitems * 4);
+ ts.writeBlock((const char *) data, nitems * sizeof(long));
offset += nitems;
} else
after = 0;
--- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200
+++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200
@@ -975,7 +981,7 @@
};
const XftDefaultFont defaults[] = {
{ "Serif", "serif", FALSE },
- { "Sans Serif", "sans-serif", FALSE },
+ { "Sans", "sans-serif", FALSE },
{ "Monospace", "monospace", TRUE },
{ 0, 0, FALSE }
};
--- ./src/widgets/qtextedit.cpp.resetinputcontext 2012-08-04 14:53:34.000000000 +0200
+++ ./src/widgets/qtextedit.cpp 2012-09-29 11:36:19.410163805 +0200
@@ -1904,9 +1904,6 @@
void QTextEdit::removeSelectedText( int selNum )
{
- if(selNum != 0)
- resetInputContext();
-
QTextCursor c1 = doc->selectionStartCursor( selNum );
c1.restoreState();
QTextCursor c2 = doc->selectionEndCursor( selNum );
@@ -3169,7 +3166,6 @@
return;
}
#endif
- resetInputContext();
QTextParagraph *p = doc->paragAt( para );
if ( !p )
return;
@@ -3196,7 +3192,6 @@
return;
}
#endif
- resetInputContext();
for ( int i = 0; i < (int)doc->numSelections(); ++i )
doc->removeSelection( i );
@@ -3238,7 +3233,6 @@
if ( d->optimMode )
return;
#endif
- resetInputContext();
QTextParagraph *p = doc->paragAt( para );
if ( !p )
return;
@@ -3283,7 +3277,6 @@
if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled )
return;
- resetInputContext();
for ( int i = 0; i < (int)doc->numSelections(); ++i )
doc->removeSelection( i );
@@ -3334,7 +3327,6 @@
if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled )
return;
- resetInputContext();
for ( int i = 0; i < (int)doc->numSelections(); ++i )
doc->removeSelection( i );
@@ -3448,7 +3440,6 @@
{
if ( isReadOnly() )
return;
- resetInputContext();
normalCopy();
removeSelectedText();
updateMicroFocusHint();
@@ -3936,7 +3927,6 @@
return;
}
#endif
- resetInputContext();
if ( !isModified() && isReadOnly() &&
this->context() == context && this->text() == text )
return;
@@ -4110,7 +4100,6 @@
if ( !p )
return;
- resetInputContext();
if ( index > p->length() - 1 )
index = p->length() - 1;
@@ -4167,7 +4156,6 @@
return;
}
#endif
- resetInputContext();
if ( doc->hasSelection( selNum ) ) {
doc->removeSelection( selNum );
repaintChanged();
@@ -5074,7 +5062,6 @@
}
if ( dc == doc )
return;
- resetInputContext();
doc = dc;
delete cursor;
cursor = new QTextCursor( doc );
--- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200
@@ -84,7 +84,7 @@
QMAKE_MOVE = mv -f
QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
-QMAKE_STRIP =
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_STRIP =
+QMAKE_STRIPFLAGS_LIB +=
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
--- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200
@@ -84,7 +84,7 @@
QMAKE_MOVE = mv -f
QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
-QMAKE_STRIP = strip
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_STRIP =
+QMAKE_STRIPFLAGS_LIB +=
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
--- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200
+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200
@@ -87,7 +87,7 @@
QMAKE_MOVE = mv -f
QMAKE_DEL_FILE = rm -f
QMAKE_DEL_DIR = rmdir
-QMAKE_STRIP = strip
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
+QMAKE_STRIP =
+QMAKE_STRIPFLAGS_LIB +=
QMAKE_CHK_DIR_EXISTS = test -d
QMAKE_MKDIR = mkdir -p
--- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100
+++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100
@@ -994,7 +994,10 @@
#endif
QFile file( filename + ".tmp" );
- if (! file.open(IO_WriteOnly)) {
+ mode_t old_umask = umask(0022);
+ bool f = file.open(IO_WriteOnly);
+ umask(old_umask);
+ if (! f) {
#ifdef QT_CHECK_STATE
qWarning("QSettings::sync: failed to open '%s' for writing",
--- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200
+++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200
@@ -817,7 +817,7 @@
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUP>
- <GROUP><Name>QtGenerated</NAME>
+ <GROUP><NAME>QtGenerated</NAME>
$$CODEWARRIOR_QPREPROCESS_GROUP
$$CODEWARRIOR_QPREPROCESSOUT_GROUP
</GROUP>
diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp
--- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100
+++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100
@@ -320,7 +320,7 @@ int main( int argc, char * argv[] )
out << "/****************************************************************************" << endl;
out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl;
out << "**" << endl;
- out << "** Created: " << QDateTime::currentDateTime().toString() << endl;
+ out << "** Created by User Interface Compiler" << endl;
out << "**" << endl;
out << "** WARNING! All changes made in this file will be lost!" << endl;
out << "****************************************************************************/" << endl << endl;
diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp
--- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100
+++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100
@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const
for ( it = images.begin(); it != images.end(); ++it )
out << "** " << *it << "\n";
out << "**\n";
- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n";
+ out << "** Created by The User Interface Compiler" << "\n";
out << "**\n";
out << "** WARNING! All changes made in this file will be lost!\n";
out << "****************************************************************************/\n";
--- a/qmake/project.cpp.orig 2015-04-10 17:15:10.731091347 +0200
+++ b/qmake/project.cpp 2013-12-30 17:58:15.471703644 +0100
@@ -685,7 +685,7 @@
// fprintf(stderr,"Current QT version number: " + ver + "\n");
if (ver != "" && ver != test_version) {
ver = test_version;
- fprintf(stderr,"Changed QT version number to " + test_version + "!\n");
+ fprintf(stderr,"Changed QT version number to %s!\n", test_version.ascii());
}
}
}
--- qt3/src/tools/qgdict.cpp 2015-04-10 17:15:11.057092017 +0200
+++ qt3/src/tools/qgdict.cpp 2013-12-30 17:58:15.516704273 +0100
@@ -846,11 +846,11 @@
QString line;
line.fill( '-', 60 );
double real, ideal;
- qDebug( line.ascii() );
+ qDebug( "%s", line.ascii() );
qDebug( "DICTIONARY STATISTICS:" );
if ( count() == 0 ) {
qDebug( "Empty!" );
- qDebug( line.ascii() );
+ qDebug( "%s", line.ascii() );
return;
}
real = 0.0;
@@ -871,7 +871,7 @@
while ( b-- )
*pbuf++ = '*';
*pbuf = '\0';
- qDebug( buf );
+ qDebug( "%s", buf );
i++;
}
qDebug( "Array size = %d", size() );
@@ -879,7 +879,7 @@
qDebug( "Real dist = %g", real );
qDebug( "Rand dist = %g", ideal );
qDebug( "Real/Rand = %g", real/ideal );
- qDebug( line.ascii() );
+ qDebug( "%s", line.ascii() );
#endif // QT_DEBUG
}
--- a/src/tools/qgcache.cpp 2015-04-10 17:15:11.053092009 +0200
+++ b/src/tools/qgcache.cpp 2013-12-30 17:58:15.515704259 +0100
@@ -641,7 +641,7 @@
#if defined(QT_DEBUG)
QString line;
line.fill( '*', 80 );
- qDebug( line.ascii() );
+ qDebug( "%s", line.ascii() );
qDebug( "CACHE STATISTICS:" );
qDebug( "cache contains %d item%s, with a total cost of %d",
count(), count() != 1 ? "s" : "", tCost );
@@ -662,7 +662,7 @@
lruList->dumps != 1 ? "have" : "has", lruList->dumpCosts );
qDebug( "Statistics from internal dictionary class:" );
dict->statistics();
- qDebug( line.ascii() );
+ qDebug( "%s", line.ascii() );
#endif
}

9
redhat/dependencies/qt3/qtconfig3.desktop
Unescape Escape View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Qt3 Config
Comment=Configure Qt3 behavior, styles, fonts
Exec=qtconfig
Icon=qtconfig3
Terminal=false
Encoding=UTF-8
Type=Application
Categories=Qt;Settings;
Write Preview
Loading…
Cancel
Save