From 9763eb1822a7e4e9220c2cd006b73c25af53f4f5 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 4 Sep 2011 16:45:16 +0200 Subject: [PATCH 1/9] Initial QT3 build for RHEL 6 Based on original RHEL 6 qt3 3.3.8b RPM. --- .../qt3/0084-compositing-properties.patch | 80 + redhat/dependencies/qt3/assistant3.desktop | 9 + redhat/dependencies/qt3/designer3.desktop | 11 + redhat/dependencies/qt3/linguist3.desktop | 10 + .../dependencies/qt3/qt-3.0.5-nodebug.patch | 15 + .../dependencies/qt3/qt-3.1.0-makefile.patch | 11 + .../dependencies/qt3/qt-3.3.4-print-CJK.patch | 18 + .../qt3/qt-3.3.6-fontrendering-214371.patch | 15 + .../qt-3.3.6-fontrendering-gu-228452.patch | 12 + .../qt-3.3.6-fontrendering-ml_IN-209097.patch | 60 + .../qt-3.3.6-fontrendering-ml_IN-209974.patch | 11 + .../qt-3.3.6-fontrendering-ml_IN-217657.patch | 12 + .../qt-3.3.6-fontrendering-te_IN-211259.patch | 11 + .../qt3/qt-3.3.8-fontrendering-#214570.patch | 23 + .../qt-3.3.8-fontrendering-as_IN-209972.patch | 11 + redhat/dependencies/qt3/qt-uic-nostdlib.patch | 12 + .../qt3/qt-x11-free-3.3.2-quiet.patch | 14 + .../qt3/qt-x11-free-3.3.4-fullscreen.patch | 11 + .../qt-x11-free-3.3.6-qfontdatabase_x11.patch | 11 + ...d-qt3.3.5-20060318-resetinputcontext.patch | 92 + .../qt3/qt-x11-free-3.3.6-strip.patch | 36 + .../qt3/qt-x11-free-3.3.7-arm.patch | 25 + .../qt3/qt-x11-free-3.3.7-umask.patch | 14 + .../qt3/qt-x11-free-3.3.8-odbc.patch | 19 + .../qt3/qt-x11-free-3.3.8b-typo.patch | 11 + .../qt3/qt-x11-free-3.3.8b-uic-multilib.patch | 24 + redhat/dependencies/qt3/qt.csh | 33 + redhat/dependencies/qt3/qt.sh | 32 + redhat/dependencies/qt3/qt3.spec | 1927 +++++++++++++++++ redhat/dependencies/qt3/qtconfig3.desktop | 9 + 30 files changed, 2579 insertions(+) create mode 100644 redhat/dependencies/qt3/0084-compositing-properties.patch create mode 100644 redhat/dependencies/qt3/assistant3.desktop create mode 100644 redhat/dependencies/qt3/designer3.desktop create mode 100644 redhat/dependencies/qt3/linguist3.desktop create mode 100644 redhat/dependencies/qt3/qt-3.0.5-nodebug.patch create mode 100644 redhat/dependencies/qt3/qt-3.1.0-makefile.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch create mode 100644 redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch create mode 100644 redhat/dependencies/qt3/qt-uic-nostdlib.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch create mode 100644 redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch create mode 100755 redhat/dependencies/qt3/qt.csh create mode 100755 redhat/dependencies/qt3/qt.sh create mode 100644 redhat/dependencies/qt3/qt3.spec create mode 100644 redhat/dependencies/qt3/qtconfig3.desktop diff --git a/redhat/dependencies/qt3/0084-compositing-properties.patch b/redhat/dependencies/qt3/0084-compositing-properties.patch new file mode 100644 index 000000000..368b6c267 --- /dev/null +++ b/redhat/dependencies/qt3/0084-compositing-properties.patch @@ -0,0 +1,80 @@ +qt-bugs@ issue : none +bugs.kde.org number : none +applied: no +author: Lubos Lunak + +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 ) { diff --git a/redhat/dependencies/qt3/assistant3.desktop b/redhat/dependencies/qt3/assistant3.desktop new file mode 100644 index 000000000..49e718c5d --- /dev/null +++ b/redhat/dependencies/qt3/assistant3.desktop @@ -0,0 +1,9 @@ +[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; diff --git a/redhat/dependencies/qt3/designer3.desktop b/redhat/dependencies/qt3/designer3.desktop new file mode 100644 index 000000000..23f1f549a --- /dev/null +++ b/redhat/dependencies/qt3/designer3.desktop @@ -0,0 +1,11 @@ +[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; diff --git a/redhat/dependencies/qt3/linguist3.desktop b/redhat/dependencies/qt3/linguist3.desktop new file mode 100644 index 000000000..c6fce02c8 --- /dev/null +++ b/redhat/dependencies/qt3/linguist3.desktop @@ -0,0 +1,10 @@ +[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; diff --git a/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch b/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch new file mode 100644 index 000000000..09d697fb4 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.0.5-nodebug.patch @@ -0,0 +1,15 @@ +--- 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() ) ); */ + } + } + } diff --git a/redhat/dependencies/qt3/qt-3.1.0-makefile.patch b/redhat/dependencies/qt3/qt-3.1.0-makefile.patch new file mode 100644 index 000000000..009ab81fb --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.1.0-makefile.patch @@ -0,0 +1,11 @@ +--- 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" diff --git a/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch b/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch new file mode 100644 index 000000000..5bd5e9e0a --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.4-print-CJK.patch @@ -0,0 +1,18 @@ +--- 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 --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch new file mode 100644 index 000000000..9dca7998d --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-214371.patch @@ -0,0 +1,15 @@ +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) { diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch new file mode 100644 index 000000000..21081d1a6 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-gu-228452.patch @@ -0,0 +1,12 @@ +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 2007-02-13 14:41:25.000000000 +0530 ++++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2007-02-13 14:40:02.000000000 +0530 +@@ -253,7 +253,7 @@ static const unsigned char indicForms[0x + Unknown, Unknown, Unknown, Unknown, + Unknown, Unknown, Unknown, Unknown, + +- Other, Other, Other, Other, ++ Other, Other, VowelMark, VowelMark, + Other, Other, Other, Other, + Other, Other, Other, Other, + Other, Other, Other, Other, diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch new file mode 100644 index 000000000..01f3824c1 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209097.patch @@ -0,0 +1,60 @@ +--- 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:"); diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch new file mode 100644 index 000000000..8dbb2ae98 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-209974.patch @@ -0,0 +1,11 @@ +--- 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 --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch new file mode 100644 index 000000000..eb880b1cc --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-ml_IN-217657.patch @@ -0,0 +1,12 @@ +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 ); diff --git a/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch new file mode 100644 index 000000000..eb3868c96 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.6-fontrendering-te_IN-211259.patch @@ -0,0 +1,11 @@ +--- 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, diff --git a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch new file mode 100644 index 000000000..41a74fba7 --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-#214570.patch @@ -0,0 +1,23 @@ +--- 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; diff --git a/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch new file mode 100644 index 000000000..7583239cc --- /dev/null +++ b/redhat/dependencies/qt3/qt-3.3.8-fontrendering-as_IN-209972.patch @@ -0,0 +1,11 @@ +--- 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, diff --git a/redhat/dependencies/qt3/qt-uic-nostdlib.patch b/redhat/dependencies/qt3/qt-uic-nostdlib.patch new file mode 100644 index 000000000..02a40b225 --- /dev/null +++ b/redhat/dependencies/qt3/qt-uic-nostdlib.patch @@ -0,0 +1,12 @@ +--- 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."; diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch new file mode 100644 index 000000000..6dce7aa80 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.2-quiet.patch @@ -0,0 +1,14 @@ +--- 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 + diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch new file mode 100644 index 000000000..0d03f0809 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.4-fullscreen.patch @@ -0,0 +1,11 @@ +--- 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; diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch new file mode 100644 index 000000000..a9cfaf4c3 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qfontdatabase_x11.patch @@ -0,0 +1,11 @@ +--- 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 } + }; diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch new file mode 100644 index 000000000..24982206d --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch @@ -0,0 +1,92 @@ +--- qt-x11-free-3.3.6/src/widgets/qtextedit.cpp.preedit 2006-06-28 17:18:08.000000000 +0200 ++++ qt-x11-free-3.3.6/src/widgets/qtextedit.cpp 2006-06-28 17:20:09.000000000 +0200 +@@ -1906,9 +1906,6 @@ + + void QTextEdit::removeSelectedText( int selNum ) + { +- if(selNum != 0) +- resetInputContext(); +- + QTextCursor c1 = doc->selectionStartCursor( selNum ); + c1.restoreState(); + QTextCursor c2 = doc->selectionEndCursor( selNum ); +@@ -3171,7 +3168,6 @@ + return; + } + #endif +- resetInputContext(); + QTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3198,7 +3194,6 @@ + return; + } + #endif +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3240,7 +3235,6 @@ + if ( d->optimMode ) + return; + #endif +- resetInputContext(); + QTextParagraph *p = doc->paragAt( para ); + if ( !p ) + return; +@@ -3285,7 +3279,6 @@ + if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3336,7 +3329,6 @@ + if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) + return; + +- resetInputContext(); + for ( int i = 0; i < (int)doc->numSelections(); ++i ) + doc->removeSelection( i ); + +@@ -3450,7 +3442,6 @@ + { + if ( isReadOnly() ) + return; +- resetInputContext(); + normalCopy(); + removeSelectedText(); + updateMicroFocusHint(); +@@ -3938,7 +3929,6 @@ + return; + } + #endif +- resetInputContext(); + if ( !isModified() && isReadOnly() && + this->context() == context && this->text() == text ) + return; +@@ -4112,7 +4102,6 @@ + if ( !p ) + return; + +- resetInputContext(); + if ( index > p->length() - 1 ) + index = p->length() - 1; + +@@ -4169,7 +4158,6 @@ + return; + } + #endif +- resetInputContext(); + if ( doc->hasSelection( selNum ) ) { + doc->removeSelection( selNum ); + repaintChanged(); +@@ -5072,7 +5060,6 @@ + { + if ( dc == doc ) + return; +- resetInputContext(); + doc = dc; + delete cursor; + cursor = new QTextCursor( doc ); diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch new file mode 100644 index 000000000..efc24c8a1 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.6-strip.patch @@ -0,0 +1,36 @@ +--- 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 diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch new file mode 100644 index 000000000..0c93c416a --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.7-arm.patch @@ -0,0 +1,25 @@ +--- 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 diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch new file mode 100644 index 000000000..f2351909f --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.7-umask.patch @@ -0,0 +1,14 @@ +--- 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", diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch new file mode 100644 index 000000000..6f21e3cf1 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.8-odbc.patch @@ -0,0 +1,19 @@ +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 diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch new file mode 100644 index 000000000..c1ff66c2c --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-typo.patch @@ -0,0 +1,11 @@ +--- 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 @@ + MacOS + + +- QtGenerated ++ QtGenerated + $$CODEWARRIOR_QPREPROCESS_GROUP + $$CODEWARRIOR_QPREPROCESSOUT_GROUP + diff --git a/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch new file mode 100644 index 000000000..341cab7e1 --- /dev/null +++ b/redhat/dependencies/qt3/qt-x11-free-3.3.8b-uic-multilib.patch @@ -0,0 +1,24 @@ +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"; diff --git a/redhat/dependencies/qt3/qt.csh b/redhat/dependencies/qt3/qt.csh new file mode 100755 index 000000000..93fd941ed --- /dev/null +++ b/redhat/dependencies/qt3/qt.csh @@ -0,0 +1,33 @@ +# 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 diff --git a/redhat/dependencies/qt3/qt.sh b/redhat/dependencies/qt3/qt.sh new file mode 100755 index 000000000..f9ca654c1 --- /dev/null +++ b/redhat/dependencies/qt3/qt.sh @@ -0,0 +1,32 @@ +# 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 diff --git a/redhat/dependencies/qt3/qt3.spec b/redhat/dependencies/qt3/qt3.spec new file mode 100644 index 000000000..62925d61c --- /dev/null +++ b/redhat/dependencies/qt3/qt3.spec @@ -0,0 +1,1927 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.3.8d +%endif + +# The following QT4 packages should NOT be installed to +# allow QT3 compilation (please remove them prior to compile) +# qt +# qt-sqlite +# qt-mysql +# qt-x11 +# qt-devel +# ...maybe others !!!! + +%define _default_patch_fuzz 2 + +Summary: The shared library for the Qt 3 GUI toolkit +Version: %{?version} +Release: 0%{?dist} +Name: qt3 +Obsoletes: qt < 1:%{version}-%{release} +Provides: qt = 1:%{version}-%{release} +License: QPL or GPLv2 or GPLv3 +Group: System Environment/Libraries +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Url: http://www.troll.no +#Source0: ftp://ftp.troll.no/qt/source/qt-x11-free-3.3.8b.tar.gz +Source0: %{name}-%{version}.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 +#Patch8: qt-x11-free-3.3.3-qembed.patch +Patch12: qt-uic-nostdlib.patch +Patch13: qt-x11-free-3.3.6-qfontdatabase_x11.patch +#Patch14: qt-x11-free-3.3.3-gl.patch +#Patch19: qt-3.3.3-gtkstyle.patch +#Patch20: qt-x11-free-3.3.8b-gcc4-buildkey.patch +#Patch24: qt-x11-free-3.3.5-uic.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 +#Patch50: qt-x11-immodule-unified-qt3.3.8-20071116.diff.bz2 +#Patch51: qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch +#Patch52: qt-x11-free-3.3.8b-fix-key-release-event-with-imm.diff +Patch53: qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch + +# qt-copy patches +#Patch100: 0038-dragobject-dont-prefer-unknown.patch +#Patch101: 0047-fix-kmenu-width.diff +#Patch102: 0048-qclipboard_hack_80072.patch +#Patch103: 0056-khotkeys_input_84434.patch +#patch105: 0073-xinerama-aware-qpopup.patch +#Patch107: 0079-compositing-types.patch +#Patch108: 0080-net-wm-sync-request-2.patch +Patch110: 0084-compositing-properties.patch + +# upstream patches +Patch200: qt-x11-free-3.3.4-fullscreen.patch +#Patch201: qt-x11-free-3.3.8b-gcc43.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: giflib-devel +BuildRequires: perl +BuildRequires: sed +BuildRequires: findutils +BuildRequires: cups-devel +BuildRequires: tar +BuildRequires: freetype-devel +BuildRequires: fontconfig-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 +BuildRequires: desktop-file-utils +BuildRequires: mysql-devel +BuildRequires: postgresql-devel +BuildRequires: unixODBC-devel +BuildRequires: sqlite-devel + + +%package config +Summary: Graphical configuration tool for programs using Qt 3 +Group: User Interface/Desktops +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +Obsoletes: qt-config < 1:%{version}-%{release} +Provides: qt-config = 1:%{version}-%{release} + + +%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: 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: libpng-devel +Requires: libjpeg-devel +Requires: libmng-devel +Requires: mesa-libGL-devel +Requires: mesa-libGLU-devel + +Obsoletes: qt-devel < 1:%{version}-%{release} +Provides: qt-devel = 1:%{version}-%{release} + + +%package devel-docs +Summary: Documentation for the Qt 3 GUI toolkit +Group: Development/Libraries +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-devel-docs < 1:%{version}-%{release} +Provides: qt-devel-docs = 1:%{version}-%{release} + + +%package ODBC +Summary: ODBC drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-ODBC < 1:%{version}-%{release} +Provides: qt-ODBC = 1:%{version}-%{release} + + +%package MySQL +Summary: MySQL drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-MySQL < 1:%{version}-%{release} +Provides: qt-MySQL = 1:%{version}-%{release} + + +%package PostgreSQL +Summary: PostgreSQL drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-PostgreSQL < 1:%{version}-%{release} +Provides: qt-PostgreSQL = 1:%{version}-%{release} + + +%package sqlite +Summary: sqlite drivers for Qt 3's SQL classes +Group: System Environment/Libraries +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-sqlite < 1:%{version}-%{release} +Provides: qt-sqlite = 1:%{version}-%{release} + + +%package designer +Summary: Interface designer (IDE) for the Qt 3 toolkit +Group: Development/Tools +Requires: %{name}-devel = %{?epoch:%{epoch}:}%{version}-%{release} + +Obsoletes: qt-designer < 1:%{version}-%{release} +Provides: qt-designer = 1:%{version}-%{release} + + +%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 dependencies/qt3 +%patch1 -p1 -b .cjk +%patch2 -p1 -b .ndebug +%patch3 -p1 -b .makefile +%patch4 -p1 -b .umask +%patch5 -p1 +%patch7 -p1 -b .quiet +#patch8 -p1 -b .qembed +%patch12 -p1 -b .nostdlib +%patch13 -p1 -b .fonts +#patch14 -p1 -b .gl +#patch19 -p1 -b .gtk +#patch20 -p1 -b .gcc4-buildkey +#patch24 -p1 -b .uic +%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} +#patch50 -p1 +#patch51 -p1 -b .quiet +#patch52 -p1 -b .fix-key-release-event-with-imm +%patch53 -p1 -b .resetinputcontext +%endif + +# qt-copy patches +#patch100 -p0 -b .0038-dragobject-dont-prefer-unknown +#patch101 -p0 -b .0047-fix-kmenu-width +#patch102 -p0 -b .0048-qclipboard_hack_80072 +#patch103 -p0 -b .0056-khotkeys_input_84434 +#patch105 -p0 -b .0073-xinerama-aware-qpopup +#patch107 -p0 -b .0079-compositing-types +#patch108 -p0 -b .0080-net-wm-sync-request +%patch110 -p0 -b .0084-compositing-properties + +# upstream patches +%patch200 -p1 -b .fullscreen +#patch201 -p1 -b .gcc34 + +# 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} + +%if %{smp} + export SMP_MFLAGS="%{?_smp_mflags}" +%endif + +%if %{immodule} + sh ./make-symlinks.sh +%endif + +# set correct X11 prefix +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 +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 \ + -xinerama \ + -xrender \ + -xkb \ + -ipv6 \ + -dlopen-opengl \ + -xft \ + -tablet + +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 -p /sbin/ldconfig + +%postun -p /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.8D (TDE): 4 binaries have appeared +%{qtdir}/bin/createcw +%{qtdir}/bin/makeqpf +%{qtdir}/bin/mergetr +%{qtdir}/bin/msg2qm + +# QT 3.3.8D (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/config.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/jchuff.h +%exclude %{qtdir}/include/jconfig.h +%exclude %{qtdir}/include/jdct.h +%exclude %{qtdir}/include/jdhuff.h +%exclude %{qtdir}/include/jerror.h +%exclude %{qtdir}/include/jinclude.h +%exclude %{qtdir}/include/jmemsys.h +%exclude %{qtdir}/include/jmorecfg.h +%exclude %{qtdir}/include/jpegint.h +%exclude %{qtdir}/include/jpeglib.h +%exclude %{qtdir}/include/jversion.h +%exclude %{qtdir}/include/libmng.h +%exclude %{qtdir}/include/libmng_chunk_io.h +%exclude %{qtdir}/include/libmng_chunk_prc.h +%exclude %{qtdir}/include/libmng_chunks.h +%exclude %{qtdir}/include/libmng_cms.h +%exclude %{qtdir}/include/libmng_conf.h +%exclude %{qtdir}/include/libmng_data.h +%exclude %{qtdir}/include/libmng_display.h +%exclude %{qtdir}/include/libmng_dither.h +%exclude %{qtdir}/include/libmng_error.h +%exclude %{qtdir}/include/libmng_filter.h +%exclude %{qtdir}/include/libmng_jpeg.h +%exclude %{qtdir}/include/libmng_memory.h +%exclude %{qtdir}/include/libmng_object_prc.h +%exclude %{qtdir}/include/libmng_objects.h +%exclude %{qtdir}/include/libmng_pixels.h +%exclude %{qtdir}/include/libmng_read.h +%exclude %{qtdir}/include/libmng_trace.h +%exclude %{qtdir}/include/libmng_types.h +%exclude %{qtdir}/include/libmng_write.h +%exclude %{qtdir}/include/libmng_zlib.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/png.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}/include/zconf.h +%exclude %{qtdir}/include/zconf.in.h +%exclude %{qtdir}/include/zlib.h +%exclude %{qtdir}/include/zutil.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 +* Fri Sep 02 2011 Francois Andriot - 3.3.8d-0 +- Switch to Trinity Version + +* Wed Jun 30 2010 Than Ngo - 3.3.8b-29 +- Resolves: bz#605106, XML validity issue, fno-strict-aliasing + +* Thu Sep 10 2009 Than Ngo - 3.3.8b-28 +- drop support fedora < 10 + +* Sun Jul 26 2009 Fedora Release Engineering - 3.3.8b-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri May 15 2009 Rex Dieter - 3.3.8b-26 +- arm patch + +* Thu Apr 16 2009 Rex Dieter - 3.3.8b-25 +- move designer plugins to runtime (#487622) + +* Fri Apr 10 2009 Than Ngo - 3.3.8b-24 +- unneeded executable permissions for profile.d scripts + +* Wed Feb 25 2009 Fedora Release Engineering - 3.3.8b-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Feb 24 2009 Than Ngo - 3.3.8b-22 +- fix build problem against new unixODBC + +* Wed Feb 04 2009 Rex Dieter 3.3.8b-21 +- unowned %%qt_docdir (#483441) + +* Mon Feb 02 2009 Rex Dieter 3.3.8b-20 +- unowned dirs (#483441) + +* Sat Jan 31 2009 Karsten Hopp 3.3.8b-19 +- s390x is 64bit, s390 is 32bit. Fixed in /etc/profile.d/qt.* + +* Thu Jan 22 2009 Rex Dieter 3.3.8b-18 +- respin (mysql) + +* Wed Oct 08 2008 Than Ngo 3.3.8b-17 +- update qt-x11-immodule-unified-qt3 patch + +* Tue Sep 30 2008 Than Ngo 3.3.8b-16 +- mv translations in main package (bz#448761) + +* Sat Sep 20 2008 Kevin Kofler - 3.3.8b-15 +- set _default_patch_fuzz (fixes FTBFS) + +* Mon Jul 07 2008 Rex Dieter - 3.3.8b-14 +- QTDIR isn't set in ppc64 buildroot (#454313) +- /etc/profile.d/qt.sh leaks variable ARCH (#454260) + +* Fri May 23 2008 Than Ngo - 3.3.8b-13 +- fix rh#448027, qt3's PATH not set properly unless qt3-devel is installed + +* Wed Apr 02 2008 Than Ngo - 3.3.8b-12 +- get rid of 0088-fix-xinput-clash.diff, it's fixed in + new xorg-x11-proto-7.3-11 + +* Mon Mar 17 2008 Than Ngo 3.3.8b-11 +- fix obsolete/provides of version/release + +* Thu Mar 13 2008 Kevin Kofler 3.3.8b-10 +- fix %{?epoch:%{epoch}:} idiom not to add a ':' after it + +* Wed Mar 12 2008 Kevin Kofler 3.3.8b-9 +- rename to qt3 on Fedora >= 9 + +* Tue Mar 11 2008 Kevin Kofler 3.3.8b-8 +- prepare for rename to qt3 on Fedora >= 9 (not enabled yet) +- add Provides and Obsoletes everywhere +- update summaries and descriptions +- remove dots at end of Summary tags +- fix non-UTF-8 characters + +* Tue Mar 11 2008 Than Ngo 3.3.8b-7 +- 0088-fix-xinput-clash.diff, fix compile errors with Xmd.h + +* Fri Mar 07 2008 Than Ngo 3.3.8b-6 +- move qt.[c]sh in main package (#221000) + +* Mon Feb 18 2008 Kevin Kofler 3.3.8b-5 +- fix buildkey for GCC 4.3 (#433235) + +* Mon Feb 11 2008 Than Ngo 3.3.8b-4 +- rebuild for GCC 4.3 + +* Thu Jan 24 2008 Than Ngo 3.3.8b-3 +- add LICENSE.GPL2/GPL3 + +* Thu Jan 24 2008 Than Ngo 3.3.8b-2 +- License: GPLv2 or GPLv3 +- merged in 3.3.8b -> drop following patches: + * qt-3.3.6-fontrendering-punjabi-209970.patch + * qt-3.3.6-fontrendering-or_IN-209098.patch + * qt-3.3.6-fontrendering-gu-228451.patch + * qt-font-default-subst.diff + * 0076-fix-qprocess.diff + * 0082-fix-qdatetime-fromstring.diff + * qt-x11-free-3.3.8-bz#243722-mysql.patch + * qt3-CVE-2007-3388.patch + * utf8-bug-qt3-CVE-2007-0242.diff + * qt-3.3.6-bz#292941-CVE-2007-4137.patch + +* Wed Jan 23 2008 Than Ngo 3.3.8b-1 +- update to 3.3.8b, fix License + +* Mon Nov 26 2007 Than Ngo 3.3.8-11 +- add Provides: qt3 = %%version-%%release + +* Wed Nov 7 2007 Stepan Kasal - 3.3.8-10 +- rh#239216, fix a typo in qt-config description + +* Thu Oct 04 2007 Than Ngo - 3.3.8-9 +- rh#309091, qt should provide %%{qtdir}/plugins/styles +- rh#276521, qt-copy patches 0079, 0080, 0082 and 0084 + +* Mon Sep 17 2007 Than Ngo - 3.3.8-8 +- CVE-2007-4137 + +* Wed Aug 29 2007 Than Ngo - 1:3.3.8-7.fc7.1 +- CVE-2007-0242 + +* Tue Aug 28 2007 Than Ngo - 1:3.3.8-7 +- CVE-2007-3388 qt3 format string flaw +- backport to fix #bz243722, bz#244148, Applications using qt-mysql crash if database is + removed before QApplication is destroyed +- cleanup desktop files + +* Mon Apr 23 2007 Than Ngo - 1:3.3.8-5.fc7 +- apply patch to fix fontrendering problem in gu_IN #228451,#228452 + +* Wed Apr 11 2007 Than Ngo - 1:3.3.8-4.fc7 +- adjust qt-3.3.8-fontrendering-as_IN-209972.patch and + qt-3.3.8-fontrendering-#214570.patch for qt-3.3.8 + +* Mon Apr 02 2007 Than Ngo - 1:3.3.8-3.fc7 +- apply patches to fix + Qt UTF-8 overlong sequence decoding vulnerability + QPopupMenu aware of Xinerama + a regression in QProgress::writeToStdin() + +* Tue Mar 27 2007 Than Ngo 1:3.3.8-2.fc7 +- enable tablet support + +* Mon Mar 19 2007 Than Ngo 1:3.3.8-1.fc7 +- update to 3.3.8 + +* Wed Dec 06 2006 Than Ngo - 1:3.3.7-2.fc7 +- Resolves: bz#214371, bn_IN font rendering +- Resolves: bz#217657, ml_IN issue with cursor position +- Resolves: bz#217638, regression bug in qt +- Resolves: bz#209974, Vowel position set properly +- Resolves: bz#214570, Rendering is not fine for 'RA' 09B0 + +* Thu Nov 09 2006 Than Ngo 1:3.3.7-1.fc6 +- update to 3.3.7 +- fix #209097, ml_IN font rendering +- fix #209970, pa font rendering +- fix #209098, or_IN font rendering +- fix #209972, as_IN font rendering +- fix #209975, bn_IN font rendering +- fix #211259, te_IN font rendering +- fix #211436, as_IN font rendering + thanks Sachin Tawniya, LingNing Zhang for the fixes +- move html files to devel +- add sqlite plugin +- fix #189012, qt settings should be readable for other + +* Thu Aug 31 2006 Than Ngo 1:3.3.6-13 +- add missing desktop files + +* Mon Jul 17 2006 Than Ngo 1:3.3.6-12 +- rebuild + +* Wed Jul 12 2006 Jesse Keating - 1:3.3.6-11.1 +- rebuild + +* Mon Jul 10 2006 Than Ngo 1:3.3.6-11 +- apply upstream patches, fix arabic fonts issue, and + problems with missing minimum size when richtext + labels are used + +* Thu Jun 29 2006 Than Ngo 1:3.3.6-10 +- apply patch from Lars, fixes Qt 3.3.6 for Arabic fonts + +* Wed Jun 28 2006 Than Ngo 1:3.3.6-9 +- fix #183302, IM preedit issue in kbabel + +* Mon Jun 26 2006 Than Ngo 1:3.3.6-8 +- rebuilt + +* Thu Jun 08 2006 Than Ngo 1:3.3.6-7 +- fix utf8 issue in changelog +- fix #195410, don't strip binaries/libraries +- fix #156572, keyReleaseEvent issue + +* Mon Jun 05 2006 Than Ngo 1:3.3.6-6 +- qt-devel requires on mesa-libGLU-devel mesa-libGU-devel + +* Tue May 16 2006 Than Ngo 1:3.3.6-5 +- fix #191895, BR libXmu-devel +- disable warnings if debug is off + +* Mon May 15 2006 Than Ngo 1:3.3.6-4 +- fix multilib issue + +* Tue May 09 2006 Than Ngo 1:3.3.6-3 +- add subpackage qt-devel-docs #191099 + +* Thu Apr 13 2006 Than Ngo 1:3.3.6-2 +- fix xorg prefix #188510 + +* Mon Mar 20 2006 Than Ngo 1:3.3.6-1 +- update to 3.3.6 +- adapt qt-x11-immodule-unified-qt3.3.5-20060318 to qt-3.3.6 +- remove set of fixes for the immodule patch, included in qt-x11-immodule-unified-qt3.3.5-20060318 +- remove 0051-qtoolbar_77047.patch, qt-x11-free-3.3.4-assistant_de.patch, + qt-x11-free-3.3.5-warning.patch, included in new upstream + + +* Mon Feb 27 2006 Than Ngo 1:3.3.5-13 +- add set of fixes for the immodule patch, thanks to Dirk Müller + +* Fri Feb 10 2006 Jesse Keating - 1:3.3.5-12.2 +- bump again for double-long bug on ppc(64) + +* Tue Feb 07 2006 Jesse Keating - 1:3.3.5-12.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Tue Jan 17 2006 Than Ngo 1:3.3.5-12 +- add BuildRequires on mesa-libGL-devel + +* Wed Dec 21 2005 Than Ngo 1:3.3.5-11 +- BuildRequires on libXt-devel/xorg-x11-proto-devel + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Sun Nov 13 2005 Than Ngo 1:3.3.5-10 +- workaround for keyboard input action in KHotKeys + +* Tue Nov 08 2005 Than Ngo 1:3.3.5-9 +- fix for modular X + +* Tue Nov 08 2005 Than Ngo 1:3.3.5-8 +- get rid of xorg-x11-devel, fix for modular X + +* Tue Oct 25 2005 Than Ngo 1:3.3.5-7 +- update qt-x11-immodule-unified-qt3.3.5-20051012-quiet.patch + +* Mon Oct 24 2005 Than Ngo 1:3.3.5-6 +- update qt-x11-immodule-unified-qt3.3.5-20051018.diff +- remove unneeded qt-x11-immodule-unified-qt3.3.5-20051012-build.patch + +* Thu Oct 13 2005 Than Ngo 1:3.3.5-5 +- update qt-x11-immodule-unified-qt3.3.5-20051012 +- disable some debug messages +- apply patch to fix build problem with the new immodule patch + +* Tue Sep 27 2005 Than Ngo 1:3.3.5-4 +- apply patch to fix gcc warnings + +* Mon Sep 26 2005 Than Ngo 1:3.3.5-3 +- export QTINC/QTLIB, thanks to Rex Dieter (#169132) + +* Tue Sep 20 2005 Than Ngo 1:3.3.5-2 +- German translation of the Qt Assistent #161558 +- add uic workaround + +* Sun Sep 11 2005 Than Ngo 1:3.3.5-1 +- update to 3.3.5 + +* Mon Aug 22 2005 Than Ngo 1:3.3.4-22 +- apply upstream patch to fix kmail folder selector #166430 + +* Mon Aug 15 2005 Than Ngo 1:3.3.4-21 +- fix gcc4 build problem + +* Wed Aug 10 2005 Than Ngo 1:3.3.4-20 +- apply missing patches + +* Wed Aug 10 2005 Than Ngo 1:3.3.4-19 +- apply patch to fix wrong K menu width, #165510 + +* Mon Aug 01 2005 Than Ngo 1:3.3.4-18 +- add visibility patch + +* Wed Jul 20 2005 Than Ngo 1:3.3.4-17 +- fix German translation of the Qt Assistent #161558 + +* Mon Jun 27 2005 Than Ngo 1:3.3.4-16 +- apply patch to fix Rendering for Punjabii, thanks to Trolltech #156504 + +* Tue May 24 2005 Than Ngo 1:3.3.4-15 +- add better fix for #156977, thanks to trolltech +- apply patch to fix keyReleaseEvent problem #156572 + +* Wed May 18 2005 Than Ngo 1:3.3.4-14 +- apply patch to use ecvt, fcvt (thanks to Jakub) +- fix a bug in printing of postscript #156977 + +* Wed May 18 2005 Than Ngo 1:3.3.4-13 +- rebuild + +* Thu Apr 14 2005 Than Ngo 1:3.3.4-12 +- fix bad symlink #154086 + +* Wed Apr 13 2005 Than Ngo 1:3.3.4-11 +- remove bad symlink #154086 +- built with PostgresSQL 8.0.2 + +* Wed Mar 23 2005 Than Ngo 1:3.3.4-10 +- add GtkStyle patch from Peter Backlund #141125 + +* Fri Mar 04 2005 Than Ngo 1:3.3.4-9 +- fix buildkey issue with gcc-4 + +* Fri Mar 04 2005 Than Ngo 1:3.3.4-8 +- rebuilt against gcc-4.0.0-0.31 + +* Tue Mar 01 2005 Than Ngo 1:3.3.4-7 +- fix build problem with gcc4 + +* Mon Feb 28 2005 Than Ngo 1:3.3.4-6 +- rebuilt against gcc-4 + +* Tue Feb 22 2005 Than Ngo 1:3.3.4-5 +- fix application crash when input methode not available (bug #140658) +- remove .moc/.obj +- add qt-copy patch to fix KDE #80072 + +* Fri Feb 11 2005 Than Ngo 1:3.3.4-4 +- update qt-x11-immodule-unified patch + +* Thu Feb 10 2005 Than Ngo 1:3.3.4-3 +- fix rpm file conflict + +* Wed Feb 02 2005 Than Ngo 1:3.3.4-2 +- remove useless doc files #143949 +- fix build problem if installman is disable #146311 +- add missing html/examples/tutorial symlinks + +* Fri Jan 28 2005 Than Ngo 1:3.3.4-1 +- update to 3.3.4 +- adapt many patches to qt-3.3.4 +- drop qt-x11-free-3.3.0-freetype, qt-x11-free-3.3.3-qmake, qt-x11-free-3.3.1-lib64 + qt-x11-free-3.3.3-qimage, which are included in new upstream + +* Tue Nov 30 2004 Than Ngo 1:3.3.3-16 +- add sql macro + +* Mon Nov 29 2004 Than Ngo 1:3.3.3-15 +- convert qdial.3qt to UTF-8 bug #140946 + +* Tue Nov 23 2004 Than Ngo 1:3.3.3-14 +- add missing lupdate and lrelease #140230 + +* Fri Nov 19 2004 Than Ngo 1:3.3.3-13 +- apply patch to fix qinputcontext + +* Thu Nov 11 2004 Than Ngo 1:3.3.3-12 +- link against MySQL 3 +- fix rpm conflict + +* Wed Nov 10 2004 Than Ngo 1:3.3.3-11 +- apply patch to fix fullscreen problem +- remove html documents duplicate #135696 + +* Tue Nov 02 2004 Than Ngo 1:3.3.3-10 +- rebuilt + +* Tue Nov 02 2004 Than Ngo 1:3.3.3-9 +- remove unused patch +- set XIMInputStyle=On The Spot +- require xorg-x11-devel instead XFree86-devel + +* Thu Oct 14 2004 Than Ngo 1:3.3.3-8 +- don't compress examples/tutorial + +* Thu Oct 07 2004 Than Ngo 1:3.3.3-7 +- fix build problem without qt immodule #134918 + +* Tue Sep 28 2004 Than Ngo 1:3.3.3-6 +- fix font problem, bz #133578 + +* Tue Sep 14 2004 Than Ngo 1:3.3.3-4 +- update new immodule patch +- fix multilib problem #132516 + +* Wed Aug 18 2004 Than Ngo 1:3.3.3-3 +- add patch to fix dlopen issue (#126422) +- add image handling fix + +* Thu Aug 12 2004 Than Ngo 1:3.3.3-2 +- fix qmake broken link (#129723) + +* Wed Aug 11 2004 Than Ngo 1:3.3.3-1 +- update to 3.3.3 release + +* Thu Jul 01 2004 Than Ngo 1:3.3.2-10 +- add immodule for Qt + +* Tue Jun 29 2004 Than Ngo 1:3.3.2-9 +- add sub package config, allow multi lib installation (#126643) + +* Thu Jun 24 2004 Than Ngo 1:3.3.2-8 +- add fontconfig fix for qfontdatabase, #123868 +- fix some buildrequires problem, #125289 +- fix dangling symlink, #125351 +- get rid of backup files + +* Tue Jun 15 2004 Elliot Lee 1:3.3.2-7 +- rebuilt + +* Tue May 25 2004 Than Ngo 1:3.3.2-5 +- add missing qembed tool #124052, #124052 +- get rid of unused trigger +- add qt.conf in ld.so.conf.d -> don't change ld.so.conf #124080 + +* Wed May 12 2004 Than Ngo 1:3.3.2-4 +- backport some qt patches, Symbol font works again + +* Mon May 10 2004 Than Ngo 1:3.3.2-3 +- fixed annoying warning + +* Tue May 04 2004 Than Ngo 1:3.3.2-2 +- fix broken symlink at qt document, bug #121652 + +* Thu Apr 29 2004 Than Ngo 3.3.2-1 +- update to 3.3.2 + +* Thu Apr 22 2004 Than Ngo 3.3.1-1 +- add cvs backport +- fix lib64 issue, #121052 +- fix CJK font display, bug #121017, #120542, thanks to Leon Ho +- compress tutorial/examples + +* Fri Mar 26 2004 Than Ngo 3.3.1-0.8 +- fixed symlinks issue, #117572 + +* Thu Mar 25 2004 Than Ngo 3.3.1-0.7 +- add Trolltech patch, fix dpi setting issue + +* Tue Mar 23 2004 Than Ngo 3.3.1-0.6 +- add 0034-qclipboard_recursion_fix.patch from CVS, #118368 +- add better qt-x11-free-3.3.1-fontdatabase.patch + +* Sun Mar 07 2004 Than Ngo 1:3.3.1-0.5 +- disable smpflags + +* Fri Mar 05 2004 Than Ngo 1:3.3.1-0.4 +- fix font alias + +* Thu Mar 04 2004 Than Ngo 1:3.3.1-0.3 +- add fontdatabase fix from Trolltech + +* Thu Mar 04 2004 Than Ngo 1:3.3.1-0.2 +- fix wrong symlink #117451 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Mon Mar 01 2004 Than Ngo 3.3.1-0.1 +- update to 3.3.1 + +* Mon Feb 23 2004 Than Ngo 3.3.0-0.4 +- add fix for building with freetype 2.1.7 or newer + +* Tue Feb 17 2004 Than Ngo 3.3.0-0.3 +- enable IPv6 support +- use dlopen, instead of linking with OpenGL libraries directly +- don't install backup files + +* Thu Feb 05 2004 Than Ngo 1:3.3.0-0.2 +- fix fontdatabase +- don't use strip in install script +- fix qt default setting + +* Wed Feb 04 2004 Than Ngo 1:3.3.0-0.1 +- 3.3.0 + +* Fri Jan 30 2004 Than Ngo 1:3.2.3-0.4 +- add mouse patch from CVS, bug #114647 + +* Tue Jan 20 2004 Than Ngo 1:3.2.3-0.3 +- rebuild + +* Tue Dec 2 2003 Than Ngo 1:3.2.3-0.2 +- Added missing prl files, (report from trolltech) +- Fixed description +- include requires XFree86-devel on qt-devel + +* Fri Nov 14 2003 Than Ngo 1:3.2.3-0.1 +- 3.2.3 release + +* Thu Oct 30 2003 Than Ngo 1:3.2.2-0.4 +- fix encoding problem + +* Sat Oct 18 2003 Than Ngo 1:3.2.2-0.3 +- fix encoding problem + +* Fri Oct 17 2003 Than Ngo 1:3.2.2-0.2 +- add font alias patch file, thanks to Leon Ho +- clean up monospace.patch from Leon Ho +- remove some unneeded patch files + +* Thu Oct 16 2003 Than Ngo 1:3.2.2-0.1 +- 3.2.2 release +- remove a patch file, which is included in 3.2.2 + +* Tue Oct 14 2003 Than Ngo 1:3.2.1-1.3 +- remove some unneeded patch files +- don't load XLFDs if XFT2 is used + +* Mon Sep 08 2003 Than Ngo 1:3.2.1-1.2 +- fixed rpm file list + +* Tue Sep 02 2003 Than Ngo 1:3.2.1-1.1 +- fix for the khtml form lineedit bug from CVS + +* Wed Aug 27 2003 Than Ngo 1:3.2.1-1 +- 3.2.1 release + +* Wed Jul 23 2003 Than Ngo 1:3.2.0-1 +- 3.2.0 release + +* Mon Jun 23 2003 Than Ngo 3.2.0b2-0.1 +- 3.2.0b2 +- add missing templates for designer + +* Wed Jun 18 2003 Than Ngo 3.2.0b1-0.2 +- clean up specfile + +* Wed Jun 18 2003 Than Ngo 3.2.0b1-0.1 +- 3.2.0b1 + +* Tue Jun 17 2003 Than Ngo 3.1.2-12 +- rebuilt + +* Tue Jun 17 2003 Than Ngo 3.1.2-10 +- add missing translations + +* Wed Jun 11 2003 Elliot Lee +- rebuilt + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Mon May 19 2003 Than Ngo 3.1.2-7 +- add some patches from KDE CVS qt-copy, thanks to Alexei Podtelezhnikov + +* Mon May 5 2003 Than Ngo 3.1.2-5.1 +- set correct permission config scripts + +* Tue Apr 29 2003 Than Ngo 3.1.2-4 +- fix typo bug in font loader + +* Wed Apr 9 2003 Than Ngo 3.1.2-2 +- add xrandr extension + +* Mon Mar 3 2003 Than Ngo 3.1.2-1 +- 3.1.2 release + +* Mon Feb 17 2003 Elliot Lee 3.1.1-7 +- ppc64 support + +* Wed Jan 29 2003 Than Ngo 3.1.1-6 +- add missing Categories section in qt designer #82920 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Mon Dec 30 2002 Florian La Roche +- Change qmlined.h to not include an attic header that is also not shipped + with Red Hat Linux. This also fixes building unixODBC, that includes this + header (apparently also without needing it). + +* Thu Dec 19 2002 Than Ngo 3.1.1-3 +- add monospace patch file from Leon Ho (bug #79949) +- add small patch file from Sysoltsev Slawa (bug #79731) + +* Tue Dec 17 2002 Than Ngo 3.1.1-2 +- don't require XFree86, it's not needed + +* Tue Dec 17 2002 Than Ngo 3.1.1-1 +- update to 3.1.1 + +* Thu Nov 28 2002 Than Ngo 3.1.0-1.3 +- don't write Date into created moc files + +* Mon Nov 18 2002 Than Ngo 3.1.0-1.2 +- add missing libs +- remove workaround for ppc + +* Sun Nov 17 2002 Than Ngo 3.1.0-1.1 +- adjust qfontdatabase_x11 for 3.1.0 +- fix lib64 issue +- add workaround to build on ppc + +* Wed Nov 13 2002 Than Ngo 3.1.0-1 +- update to 3.1.0 +- adjust some patch files for 3.1.0 +- clean up specfile +- remove some Xft2 patch files, which are now in 3.1.0 +- add qwidget_x11.cpp.diff from Trolltech +- install qt in %%{_libdir}/qt-3.1 (bug #77706) +- don't use rpath +- enable large file support +- use system Xinerama +- remove unneeded cups patch file +- fix to build against new XFree86 + +* Tue Nov 5 2002 Than Ngo 3.0.5-19 +- examples misconfigured (bug #76083) +- don't include pkg-config (bug #74621) +- fix build problem with new XFree86 + +* Tue Sep 17 2002 Than Ngo 3.0.5-18 +- Fixed binaries symlinks + +* Mon Sep 9 2002 Than Ngo 3.0.5-17hammer +- clean up spec file for 64bit machine + +* Thu Aug 29 2002 Than Ngo 3.0.5-17 +- Fixed rpath issue (bug #69692, #69575) +- Removed dlopen patch +- Added monospace alias patch from Leon Ho (bug #72811) +- Added man pages + +* Sun Aug 25 2002 Than Ngo 3.0.5-16 +- Added missing catagory in qt designer +- Added small gb18030 patch file from Leon Ho + +* Thu Aug 22 2002 Bernhard Rosenkraenzer 3.0.5-15 +- Prereq fileutils (#71500) + +* Tue Aug 20 2002 Bernhard Rosenkraenzer 3.0.5-14 +- Don't link to libstdc++, it isn't used +- Work around s390 compiler bug (fpic/fPIC coexistance) +- Do away with the "Feature Bluecurve already defined" warning message +- Remove qmake cache files from the package + +* Wed Aug 14 2002 Than Ngo 3.0.5-13 +- Added fix to use VT100 graphic characters (bug #71364) +- Added fontdatabase fix from llch@redhat.com (bug #68353) + +* Mon Aug 12 2002 Bernhard Rosenkraenzer [not built] +- Fix default qtrc + +* Mon Aug 12 2002 Bernhard Rosenkraenzer 3.0.5-12 +- Fix CJK Printing (#71123) + +* Sun Aug 11 2002 Bernhard Rosenkraenzer 3.0.5-11 +- Move qtconfig from qt-devel to qt, it's generally useful +- Use -fno-use-cxa-atexit +- Some tweaks to allow building Qt/Embedded with the same spec file +- Apply the GB18030 patch even if xft2 isn't set + +* Fri Aug 9 2002 Than Ngo 3.0.5-10 +- Added XIM patch from llch@redhat.com (bug #70411) + +* Sun Aug 4 2002 Than Ngo 3.0.5-9 +- add a missing patch file (closelock/openlock) + +* Thu Aug 1 2002 Bernhard Rosenkraenzer 3.0.5-8 +- Define QT_INSTALL_PREFIX in qmake + +* Thu Aug 1 2002 Bernhard Rosenkraenzer 3.0.5-7 +- Find correct location of qmake mkspecs even if QTDIR isn't set + +* Thu Jul 25 2002 Than Ngo 3.0.5-6 +- Check file descriptor before closelock +* Thu Jul 25 2002 Than Ngo 3.0.5-5 +- Fixed a bug in openlock + +* Wed Jul 24 2002 Than Ngo 3.0.5-4 +- Tiny tweaks to qt3 patch + +* Tue Jul 23 2002 Owen Taylor +- Tiny fix to qt3.diff to not add '0' as a test character (#68964) + +* Mon Jul 22 2002 Tim Powers 3.0.5-2 +- rebuild using gcc-3.2-0.1 + +* Mon Jul 22 2002 Than Ngo 3.0.5-1 +- 3.0.5 +- Fixed dependencies issue + +* Thu Jul 18 2002 Than Ngo 3.0.4-12 +- Added qt-clipfix from Harald Hoyer (bug #67648) + +* Tue Jul 16 2002 Than Ngo 3.0.4-11 +- get rid of qt resource, it's now in redhat-artworks +- add some define to build for 7.3 + +* Thu Jul 11 2002 Than Ngo 3.0.4-10 +- add missing Buildprequires desktop-file-utils +- add patches for GB18030 (llch@redhat.com) bug #68430 + +* Tue Jul 09 2002 Than Ngo 3.0.4-9 +- add new desktop file for qt designer + +* Fri Jul 5 2002 Jakub Jelinek 3.0.4-8 +- compile libXinerama.a with -fpic in Qt until XFree86 is fixed +- make %%xft2 work even if old Xft headers aren't installed + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Tue Jun 18 2002 Bernhard Rosenkraenzer 3.0.4-6 +- Re-enable Xft2 now that fontconfig is fixed +- Require a version of fontconfig that works +- Use -fPIC rather than -fpic on alpha + +* Tue Jun 18 2002 Bernhard Rosenkraenzer 3.0.4-5 +- Revert to Xft1 for now, Xft2 is too unstable +- Exclude alpha for now to work around binutils bugs + +* Tue Jun 11 2002 Bernhard Rosenkraenzer 3.0.4-4 +- Add (and fix up) fontconfig patch + +* Mon Jun 3 2002 Bernhard Rosenkraenzer 3.0.4-3 +- Remove the glweak patch, it isn't needed after dropping XFree86 3.x + +* Thu May 23 2002 Tim Powers +- automated rebuild + +* Sun May 5 2002 Bernhard Rosenkraenzer 3.0.4-1 +- 3.0.4 +- Make SQL plugins optional (buildtime) +- Register with pkgconfig + +* Thu May 02 2002 Than Ngo 3.0.3-12 +- qtdir /usr/lib/qt3 +- build against gcc-3.1-0.26 +- add qt-3.0.3-glweak.patch + +* Wed Apr 17 2002 Bernhard Rosenkraenzer 3.0.3-11 +- qt3-gcc2.96 should be in qt, not qt-devel + +* Mon Apr 15 2002 Bernhard Rosenkraenzer 3.0.3-10 +- Tweaks to allow parallel installations of Qt 3.x (gcc 2.96) and Qt 3.x + (gcc 3.1) +- Fix up debug spewage at Qt designer startup + +* Wed Apr 10 2002 Bernhard Rosenkraenzer 3.0.3-9 +- Spec file fixes + +* Wed Apr 10 2002 Bernhard Rosenkraenzer 3.0.3-8 +- Get rid of non-threaded version, dlopen()'ing threaded code + (like plugins) from non-threaded code is dangerous +- Add some fixes from qt-copy, fixing the ksplash crash some people + have noticed on a first login +- Add translation fixes from CVS +- Patch example .pro files to build outside the Qt source tree (#63023) +- Fix various bugs + +* Thu Apr 04 2002 Leon Ho 3.0.3-7 +- fixes for CJK - qpsprinter +- fixes for CJK - gb18030 + +* Fri Mar 29 2002 Bernhard Rosenkraenzer 3.0.3-6 +- Make sure it builds with both gcc 2.96 and 3.1 + +* Wed Mar 28 2002 Leon Ho 3.0.3-5 +- fixes for CJK - qpsprinter + +* Wed Mar 27 2002 Bernhard Rosenkraenzer 3.0.3-4 +- Add CJK patches + +* Tue Mar 26 2002 Than Ngo 3.0.3-3 +- fix loading kde styles + +* Tue Mar 19 2002 Bernhard Rosenkraenzer 3.0.3-1 +- Update to 3.0.3 final + +* Thu Mar 14 2002 Bernhard Rosenkraenzer 3.0.3-0.cvs20020314.1 +- Update to 3.0.3-pre, required for KDE3 +- force -fPIC usage +- Remove conflict with qt2 < 2.3.2-1, the new qt2 2.3.1 is fixed and qt 2.3.2 + is broken +- Ship the qmake config files (so qmake works for building any 3rd party stuff, + e.g. aethera) + +* Wed Mar 6 2002 Bernhard Rosenkraenzer 3.0.2-2 +- Add some fixes from KDE's qt-copy CVS +- Pluginize image formats + +* Mon Feb 25 2002 Bernhard Rosenkraenzer 3.0.2-1 +- 3.0.2 final + +* Tue Feb 19 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.3 +- Add GB18030 codec patch, #60034 +- Force-build jpeg support, fixing #59775 and #59795 + +* Sat Jan 26 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.2 +- Build with CUPS support + +* Fri Jan 18 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020118.1 +- Fix up /usr/bin/moc links, they should point to qt3 + +* Mon Jan 14 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020114.1 +- Build styles directly into the main library for now, there's too much broken + code out there depending on this ATM. + +* Wed Jan 9 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020109.1 +- Stop excluding alpha, gcc has been fixed + +* Tue Jan 8 2002 Bernhard Rosenkraenzer 3.0.2-0.cvs20020108.1 +- Add fixes from CVS; this fixes the "Alt + F1, arrow up, arrow up doesn't work + in KDE" bug + +* Mon Dec 17 2001 Bernhard Rosenkraenzer 3.0.1-2 +- Fix up settings search path +- Add default qtrc allowing to use KDE 3.x Qt plugins +- Make sure QLibrary uses RTLD_GLOBAL when dlopen()ing libraries + +* Thu Dec 13 2001 Bernhard Rosenkraenzer 3.1.0-1 +- Work around gcc bug #57467 + +* Wed Dec 12 2001 Bernhard Rosenkraenzer +- 3.0.1 final + +* Mon Dec 10 2001 Bernhard Rosenkraenzer 3.0.1-0.cvs20011210.1 +- Update to current (needed by KDE 3.x) +- Rebuild with current libstdc++ +- Temporarily disable building on alpha +- Fix build with PostgreSQL 7.2 + +* Mon Nov 26 2001 Bernhard Rosenkraenzer 3.0.0-5 +- Fix up glweak + +* Mon Nov 5 2001 Bernhard Rosenkraenzer 3.0.0-4 +- Give designer, uic, moc, etc. their real names - the qt2 versions + have been renamed in qt2-2.3.2-1. + Conflict with qt2 < 2.3.2-1. + +* Thu Oct 25 2001 Bernhard Rosenkraenzer 3.0.0-3 +- Add symlink /usr/lib/qt-3.0.0 -> /usr/lib/qt3 and set QTDIR to the + symlink, allowing to update to 3.0.1 without breaking rpath'ed binaries + +* Tue Oct 16 2001 Bernhard Rosenkraenzer 3.0.0-1 +- 3.0.0 final +- fix some minor specfile bugs +- Modularize some more (image format plugins) +- Build codecs + +* Tue Sep 18 2001 Bernhard Rosenkraenzer 3.0.0-0.beta5.1 +- beta5 +- Share more code between qt-x11 and qt-embedded builds + +* Wed Aug 29 2001 Bernhard Rosenkraenzer 3.0.0-0.beta4.1 +- beta4 +- build the Motif style directly into Qt rather than as a plugin - Qt should + always have at least one style... +- replace the designer3 symlink with a shell script that sets QTDIR correctly + before launching designer +- Add desktop file for designer + +* Mon Aug 6 2001 Tim Powers 3.0.0-0.beta3.4 +- explicitly include qm2ts, qmake, qtconfig in the devel package file list to avoid dangling symlinks + +* Thu Aug 2 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.3 +- Try yet another workaround for buildsystem breakages + +* Tue Jul 31 2001 Bernhard Rosenkraenzer +- Add another ugly workaround for build system problems, this should finally + get rid of the dangling symlinks + +* Tue Jul 31 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.2 +- Rephrase parts of the spec file, hopefully pleasing the build system + +* Sun Jul 29 2001 Bernhard Rosenkraenzer 3.0.0-0.beta3.1 +- beta3 +- Fix dangling symlinks + +* Sun Jun 24 2001 Bernhard Rosenkraenzer 3.0.0-0.beta1.2 +- Fix up QSQL Postgres classes for Postgres 7.1.x +- Fix various bugs: + - QtMultilineEdit and QtTableView should actually compile + - Link libqsqlpsql with libpq + - Don't link the base library with libmysqlclient, linking the MySQL + module with it is sufficient +- Add missing const qualifier +- move the SQL drivers to separate packages to avoid dependencies +- build and install designer plugins - converting glade files to Qt is fun. ;) +- handle RPM_OPT_FLAGS + +* Tue May 22 2001 Bernhard Rosenkraenzer 3.0.0-0.beta1.1 +- 3.0 beta 1 + +* Wed May 16 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20010516.1 +- Update, remove conflicts with Qt 2.x + +* Mon May 14 2001 Bernhard Rosenkraenzer 3.0.0-0.cvs20010514.1 +- Initial build of 3.0 branch + +* Fri Apr 27 2001 Bernhard Rosenkraenzer 2.3.0-6 +- Fix crashes on ia64, Patch from Bill Nottingham +- Allow building qt-nox + +* Fri Apr 20 2001 Bernhard Rosenkraenzer 2.3.0-5 +- Make sure uic and designer use the libqui from the source tree, not + a previously installed one. + Linking uic-x11 against libqui-embedded is definitely not a feature. ;) +- The qclipboard fix is needed for qt-x11 only, don't apply it if we're + building qt-embedded + +* Sat Apr 14 2001 Bernhard Rosenkraenzer +- Handle LPRng specific constructs in printcap, Bug #35937 + +* Sun Mar 25 2001 Florian La Roche +- add qfont patch from Trolltech + +* Tue Mar 13 2001 Harald Hoyer +- added patch for '@euro' language settings + +* Tue Mar 6 2001 Bernhard Rosenkraenzer +- 2.3.0 final +- BuildRequires XFree86-devel >= 4.0.2 (#30486) + +* Mon Feb 26 2001 Than Ngo +- fix check_env function, so that qt does not crash if QT_XFT is not set +- fix symlinks + +* Mon Feb 26 2001 Bernhard Rosenkraenzer +- 2.3.0b1 +- Add a patch to qpsprinter that handles TrueType fonts even if they come from xfs + +* Tue Feb 13 2001 Preston Brown +- japanese input and clipboard fixes applied. Changes have been sent upstream by patch authors. + +* Fri Feb 9 2001 Bernhard Rosenkraenzer +- Rebuild with new Mesa to get rid of pthreads linkage +- Add Xft fix from KDE CVS + +* Wed Feb 7 2001 Bernhard Rosenkraenzer +- Add printing bugfix patch from Trolltech + +* Sat Feb 3 2001 Bernhard Rosenkraenzer +- 2.2.4 +- Qt Embedded: Add QVfb and VNC support + +* Tue Jan 16 2001 Bernhard Rosenkraenzer +- Don't segfault when running Qt/Embedded applications as root +- Improve the Qt/Embedded sparc patch so we don't need the specfile hacks + anymore +- Fix a bug in QPrintDialog (causing KDE Bug #18608) + +* Thu Jan 11 2001 Bernhard Rosenkraenzer +- bzip2 source to save space +- Qt/Embedded 2.2.3 +- Fix qte build on sparc + +* Wed Dec 20 2000 Bernhard Rosenkraenzer +- Run ldconfig in %%post and %%postun for qt-Xt + +* Sun Dec 17 2000 Bernhard Rosenkraenzer +- Build with the Xrender extension + (Patch from Keith Packard ) + +* Wed Dec 13 2000 Bernhard Rosenkraenzer +- 2.2.3 + +* Tue Dec 12 2000 Bernhard Rosenkraenzer +- Rebuild to fix permissions on doc dir +- Don't exclude ia64 anymore + +* Fri Nov 17 2000 Bernhard Rosenkraenzer +- Fix up uic (Patch from trolltech) + +* Wed Nov 15 2000 Bernhard Rosenkraenzer +- Build qt-embedded + changes to base: fix build, fix ISO C99 compliance, fix 64bit support + +* Mon Nov 13 2000 Bernhard Rosenkraenzer +- 2.2.2 + +* Tue Oct 24 2000 Than Ngo +- call ldconfig for updating (Bug #19687) +- added patch from Trolltech, thanks to Rainer + +* Wed Oct 18 2000 Bernhard Rosenkraenzer +- Add missing msg2qm, msgmerge, qconfig tools (Bug #18997), introduced + by broken Makefiles in base +- fix up %%install so it works both with old-style and new-style fileutils + (fileutils <= 4.0z don't know about -L) + +* Fri Oct 13 2000 Bernhard Rosenkraenzer +- Disable exception handling; this speeds up KDE 2.x and reduces its + memory footprint by 20 MB. + +* Tue Oct 10 2000 Bernhard Rosenkraenzer +- dereference symlinks in include + +* Sun Oct 8 2000 Bernhard Rosenkraenzer +- fix -devel +- update to the new version of 2.2.1 on trolltech.com; the initial tarball + contained broken docs + +* Thu Oct 5 2000 Bernhard Rosenkraenzer +- 2.2.1 + +* Mon Sep 25 2000 Bernhard Rosenkraenzer +- Add missing uic + +* Thu Sep 21 2000 Bernhard Rosenkraenzer +- Move Qt designer to a different source RPM to get rid of a + circular dependency (kdelibs2->qt, qt->kdelibs2) +- Enable MNG support +- Don't compile (just include) examples and tutorials +- move the static libraries to a separate package (qt-static). + They're HUGE, and most people won't ever need them. +- clean up spec file +- fix up dependencies (-devel requires base, -static requires devel, + Xt requires base) +- add BuildRequires line + +* Tue Sep 12 2000 Than Ngo +- update release 2.2.0 +- changed copyright to GPL +- added missing static libraries +- made symbolic link for designer to load the help files correct +- made designer and designer-kde2 as sub packages +- added missing templates for designer +- remove jakub patch, since the release 2.2.0 already + contains this patch. +- fixed qt again to compile with gcc-2.96 +- use make -j for building + +* Wed Aug 23 2000 Bernhard Rosenkraenzer +- Work around compiler bugs (Patch from Jakub) +- Use relative symlinks (Bug #16750) + +* Mon Aug 21 2000 Bernhard Rosenkraenzer +- beta2 + +* Mon Aug 14 2000 Bernhard Rosenkraenzer +- new qt-copy from KDE2 CVS + +* Wed Aug 9 2000 Bernhard Rosenkraenzer +- official beta 1 + +* Thu Aug 3 2000 Than Ngo +- rebuilt against the libpng-1.0.8 + +* Thu Jul 27 2000 Bernhard Rosenkraenzer +- rebuild (so we have it on all arches) + +* Tue Jul 25 2000 Bernhard Rosenkraenzer +- move man pages to a more reasonable place (this fixes Bug #14126) +- exclude ia64 for now (compiler problems!!!) + +* Mon Jul 24 2000 Harald Hoyer +- modified connect patch to fit qt 2.2.0 beta. + +* Thu Jul 20 2000 Bernhard Rosenkraenzer +- update to current qt-copy; this is now a qt 2.2.0 beta. + +* Mon Jul 17 2000 Bernhard Rosenkraenzer +- update to current qt-copy in kde CVS, required + +* Wed Jul 12 2000 Prospector +- automatic rebuild + +* Sun Jul 11 2000 Harald Hoyer +- made patch smaller and binary compatible when recompiled with 6.2 +- modified connect and moc to cope with the new g++ class layout + +* Sun Jul 09 2000 Than Ngo +- rebuilt qt with gcc-2.96-34 + +* Fri Jul 07 2000 Than Ngo +- rebuilt qt with c++ 2.96 + +* Mon Jul 3 2000 Bernhard Rosenkraenzer +- Fix dependancies + +* Sun Jul 2 2000 Bernhard Rosenkraenzer +- Use egcs++ for now ** FIXME + +* Wed Jun 28 2000 Preston Brown +- fix up qt.sh + +* Sun Jun 25 2000 Bernhard Rosenkraenzer +- Build in jpeg and threading support +- Fix a bug in clipboard pasting code + +* Wed Jun 07 2000 Preston Brown +- fix qt.{sh,csh} +- use new rpm macro paths +- package man pages + +* Fri Jun 2 2000 Bill Nottingham +- build without optimization on ia64 + +* Mon May 29 2000 Bernhard Rosenkraenzer +- 2.1.1 + +* Thu May 18 2000 Florian La Roche +- recompile with correct libstdc++ + +* Thu Apr 13 2000 Bernhard Rosenkraenzer +- 2.1.0 final + +* Wed Apr 5 2000 Bernhard Rosenkraenzer +- beta4 +- depend on libGL.so.1 rather than Mesa - XFree86 4.0 provides that + lib, too + +* Wed Mar 22 2000 Bernhard Rosenkraenzer +- beta3 + +* Tue Mar 7 2000 Bernhard Rosenkraenzer +- beta2 +- fix compilation of the NSPlugin add-on + +* Fri Mar 3 2000 Bill Nottingham +- fix %postun script + +* Fri Feb 18 2000 Bernhard Rosenkränzer +- beta1 +- get rid of qt-ImageIO, the functionality is now in the main Qt library +- remove qt-Network, the functionality is now in the main Qt library +- add changes-2.1.0 to %doc + +* Thu Feb 17 2000 Preston Brown +- no refcount check on postun script, we want it to happen even on upgrades + +* Thu Feb 10 2000 Bernhard Rosenkraenzer +- new snapshot, should fix QWhatsThisButton +- remove executable permissions from *.pro files + +* Mon Feb 07 2000 Preston Brown +- strip binaries in examples, tutorial + +* Mon Jan 31 2000 Bernhard Rosenkraenzer +- new snapshot - should fix the hotkey bug +- Fix up the Makefiles so it compiles + +* Tue Jan 18 2000 Bernhard Rosenkraenzer +- new snapshot - we need those QVariant fixes + +* Thu Jan 13 2000 Bernhard Rosenkraenzer +- switch from glxMesa to Mesa for the GL addon + +* Wed Jan 5 2000 Bernhard Rosenkränzer +- Fix up dependencies +- new snapshot + +* Mon Jan 3 2000 Ngo Than +- new snapshot for Red Hat Linux 6.2 +- increase version number + +* Mon Dec 20 1999 Bernhard Rosenkraenzer +- new snapshot +- handle RPM_OPT_FLAGS + +* Mon Dec 13 1999 Bernhard Rosenkraenzer +- new snapshot +- -GL requires libGL.so.1 instead of Mesa (might as well be glxMesa + or some commercial OpenGL) +- -GL BuildPrereqs /usr/X11R6/include/GL/gl.h instead of Mesa-devel + (might as well be glxMesa or some commercial OpenGL) + +* Sun Dec 05 1999 Bernhard Rosenkraenzer +- update to current RSYNC version +- remove compilation patch - it finally works out of the box + +* Wed Oct 27 1999 Bernhard Rosenkraenzer +- update to current CVS snapshot +- build extensions +- add patch to fix QNetwork compilation + +* Sun Oct 24 1999 Bernhard Rosenkraenzer +- current CVS snapshot +- fix compilation with gcc 2.95.x +- use install -c rather than just install to make BSD install happy + +* Mon Oct 11 1999 Bernhard Rosenkraenzer +- 2.1.0 snapshot (for KDE2) +- Fix typo in spec + +* Thu Sep 23 1999 Preston Brown +- don't ship tutorial or example binaries + +* Tue Sep 21 1999 Preston Brown +- substitution in tutorial and examples so that dependencies are correct and + they can be successfully rebuilt. +- switched to completely using QTDIR. trying to coexist with links into + /usr/{include,lib} and still compile with qt 1.x is very hard for + configure scripts to cope with. + +* Thu Aug 19 1999 Preston Brown +- implemented QTDIR compatibility. + +* Tue Jul 20 1999 Preston Brown +- qt 2.0.1 packaged. + +* Wed Jul 14 1999 Preston Brown +- Qt 2.00 packaged. +- examples, html documentation, tutorial moved to /usr/doc + +* Sat Apr 17 1999 Preston Brown +- static library supplied in dev package. + +* Wed Apr 07 1999 Preston Brown +- turn on internal GIF reading support + +* Tue Apr 06 1999 Preston Brown +- strip binaries + +* Mon Mar 15 1999 Preston Brown +- upgrade to qt 1.44. + +* Wed Feb 24 1999 Preston Brown +- Injected new description and group. + +* Tue Jan 19 1999 Preston Brown +- moved includes to /usr/include/qt + +* Mon Jan 04 1999 Preston Brown +- made setup phase silent. + +* Fri Dec 04 1998 Preston Brown +- upgraded to qt 1.42, released today. + +* Tue Dec 01 1998 Preston Brown +- took Arnts RPM and made some minor changes for Red Hat. diff --git a/redhat/dependencies/qt3/qtconfig3.desktop b/redhat/dependencies/qt3/qtconfig3.desktop new file mode 100644 index 000000000..11df0abab --- /dev/null +++ b/redhat/dependencies/qt3/qtconfig3.desktop @@ -0,0 +1,9 @@ +[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; From 016dd39c2ae7c15ce5b16c992fa1a2dd60d755ca Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 4 Sep 2011 17:04:12 +0200 Subject: [PATCH 2/9] Initial production script for RHEL Use 'gentarball.sh' to generate tarballs from SVN, then 'genrpm.sh' to build RPM. --- redhat/components.txt | 7 ++++ redhat/genrpm.sh | 80 +++++++++++++++++++++++++++++++++++++++++++ redhat/gentarball.sh | 60 ++++++++++++++++++++++++++++++++ 3 files changed, 147 insertions(+) create mode 100644 redhat/components.txt create mode 100755 redhat/genrpm.sh create mode 100755 redhat/gentarball.sh diff --git a/redhat/components.txt b/redhat/components.txt new file mode 100644 index 000000000..9a4b4836d --- /dev/null +++ b/redhat/components.txt @@ -0,0 +1,7 @@ +dependencies/qt3 +dependencies/tqtinterface +dependencies/dbus-tqt +dependencies/arts +kdelibs +kdebase +kdebindings diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh new file mode 100755 index 000000000..96d6ce7de --- /dev/null +++ b/redhat/genrpm.sh @@ -0,0 +1,80 @@ +#!/bin/bash + +cd "$( dirname "$0" )" + +clear +cat </dev/null + mkdir -p "${TMPDIRTDE}/${COMP}" + pushd "${COMP}/.." >/dev/null + echo "Extracting '${COMP}' from SVN ..." + case "${COMP##*/}" in + "qt3") git clone http://scm.trinitydesktop.org/scm/git/tde; mv tde/main/dependencies/qt3 . ;; + *) svn export --force --quiet svn://anonsvn.kde.org/home/kde/branches/trinity/${COMP};; + esac + popd >/dev/null + echo "Creating archive '${ARCHIVENAME}' ..." + tar cfz ${ARCHIVEDIR}/${ARCHIVENAME} ${COMP} + popd >/dev/null + echo "Cleaning temporary directory ..." + rm -rf "${TMPDIRTDE}" + cat < Date: Sun, 4 Sep 2011 17:17:09 +0200 Subject: [PATCH 3/9] Initial tqtinterface SPECS for TDE 3.5.12 and 3.5.13 Should compile on any RHEL or Fedora --- .../tqtinterface/tqtinterface-3.5.12.spec | 114 ++++++++++++++++++ .../tqtinterface/tqtinterface-3.5.13.spec | 109 +++++++++++++++++ 2 files changed, 223 insertions(+) create mode 100755 redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec create mode 100755 redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec new file mode 100755 index 000000000..1e745cee7 --- /dev/null +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec @@ -0,0 +1,114 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _libdir %{_prefix}/lib +%endif + +# TQT include files may conflict with QT4 includes, so we move them to a subdirectory. +# Later compiled Trinity products should be aware of that ! +%define _includedir %{_prefix}/include/tqt + +# Currently we build with (RHEL 6): +# automake-1.11.1-1.2.el6.noarch +# autoconf-2.63-5.1.el6.noarch +# libtool-2.2.6-15.5.el6.x86_64 +# m4-1.4.13-5.el6.x86_64 + +# Currently we build with (Fedora 15): +# automake-1.11.1-5.fc14.noarch +# autoconf-2.63-5.1.f15.noarch (backport from EL6) +# libtool-2.2.6-15.5.f15.x86_64 (backport from EL6) +# m4-1.4.13-5.f15.x86_64 (backport from EL6) + +Name: tqtinterface +Version: 3.5.12 +Release: 7%{?dist}%{?_variant} +License: GPL +Summary: Trinity QT Interface +Vendor: Trinity Project +Packager: Francois Andriot + +Prefix: %{_prefix} +Source0: http://mirror3.tokra.lv/releases/3.5.12/dependencies/tqtinterface-3.5.12.tar.gz + +BuildRequires: autoconf automake libtool m4 +BuildRequires: qt3-devel >= 3.3.8b +BuildRequires: gcc-c++ +BuildRequires: libXi-devel +BuildRequires: pth-devel + +Requires: qt3 >= 3.3.8b + +%description +Trinity QT Interface + +%package devel +Requires: %{name} +Summary: %{name} - Development files + +%description devel +Development files for %{name} + +%prep +%setup -q -n dependencies/%{name} + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +CFLAGS=$( pkg-config --libs qt-mt ) +%configure \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-debug --disable-warnings --enable-final + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot}%{_includedir} +%make_install + +%clean +%__rm -rf %{?buildroot} + +%files +%{_bindir}/* +%{_libdir}/*.so.* + +%files devel +%{_includedir} +%{_libdir}/*.so +%{_libdir}/*.la + +%changelog +* Sun Sep 04 2011 Francois Andriot - 3.5.12-7 +- Import to GIT +- Removes cmake stuff, build with autotools only + +* Thu Aug 25 2011 Francois Andriot - 3.5.12-6 +- Use '/etc/profile.d/qt.sh' to source QT environment + +* Tue Aug 23 2011 Francois Andriot - 3.5.12-5 +- Add missing BuildRequires + +* Mon Aug 22 2011 Francois Andriot - 3.5.12-4 +- Correct macro to install under "/opt", if desired + +* Wed Dec 22 2010 Francois Andriot - 3.5.12-3 +- Re-add '.la' files, needed for kdelibs compilation + +* Sat Dec 18 2010 Francois Andriot - 3.5.12-2 +- Add cmake support +- Removes '.la' files + +* Fri Dec 17 2010 Francois Andriot - 3.5.12-1 +- Add macro _trinity_prefix to define custom installation prefix (ex: /opt/trinity) +- Move TQT includes into 'tqt' subdirectory to avoid conflict with 'qt-devel' package (from KDE4) + +* Tue Dec 07 2010 Francois Andriot - 3.5.12-0 +- Initial version + diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec new file mode 100755 index 000000000..a2c17a166 --- /dev/null +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.spec @@ -0,0 +1,109 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _libdir %{_prefix}/lib +%endif + +# TQT include files may conflict with QT4 includes, so we move them to a subdirectory. +# Later compiled Trinity products should be aware of that ! +%define _includedir %{_prefix}/include/tqt + +Name: tqtinterface +Version: %{version} +Release: 0%{?dist}%{?_variant} +License: GPL +Summary: Trinity QT Interface +Vendor: Trinity Project +Packager: Francois Andriot + +Prefix: %{_prefix} +Source0: %{name}-%{version}.tar.gz + +BuildRequires: cmake >= 2.8 +BuildRequires: qt3-devel >= 3.3.8d +BuildRequires: gcc-c++ +BuildRequires: libXi-devel +BuildRequires: pth-devel + +Requires: qt3 >= 3.3.8d + +%description +Trinity QT Interface + +%package devel +Requires: %{name} +Summary: %{name} - Development files + +%description devel +Development files for %{name} + +%package -n tde-cmake-macros +Requires: %{name}-devel +Summary: Cmake macros for building TDE + +%description -n tde-cmake-macros +%{summary} + + +%prep +%setup -q -n dependencies/%{name} + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh + +%__mkdir build +cd build +%__cmake \ + -DQT_PREFIX_DIR=${QTDIR} \ + -DQT_VERSION=3 \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ + -DBIN_INSTALL_DIR=%{_bindir} \ + -DINCLUDE_INSTALL_DIR=%{_includedir} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot}%{_includedir} +%make_install -C build + +# Fix 'tqt.pc': UIC executable is not correct +sed -i %{?buildroot}%{_libdir}/pkgconfig/tqt.pc \ + -e '/^uic_executable=.*/ s,^\(uic_executable=\).*,\1%{_bindir}/uic-tqt,' + +# Install 'cmake' modules for a specific package (for later use) +%__mkdir_p %{?buildroot}%{_usr}/share/cmake/Modules +for i in cmake/modules/*.cmake; do + install -m 644 $i %{?buildroot}%{_usr}/share/cmake/Modules +done + +%clean +%__rm -rf %{?buildroot} + +%files +%{_bindir}/* +%{_libdir}/*.so.* + +%files devel +%{_includedir} +%{_libdir}/*.so +%{_libdir}/*.la +%{_libdir}/pkgconfig/*.pc + +%files -n tde-cmake-macros +%{_usr}/share/cmake/Modules/*.cmake + + +%changelog +* Sun Aug 28 2011 Francois Andriot - 3.5.13pre.svn20110828-0.el6 +- Import to GIT +- Built with future TDE version (3.5.13 + cmake + QT3.3.8d) From 3d77bbc6e6ae58fb1f8e4d7dad86331e5d9fd253 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 4 Sep 2011 17:18:54 +0200 Subject: [PATCH 4/9] Initial DBUS-TQT build for RHEL For TDE 3.5.13 (and later). --- .../dbus-tqt/dbus-tqt-3.5.13.spec | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec new file mode 100644 index 000000000..94d9644cc --- /dev/null +++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.spec @@ -0,0 +1,74 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _libdir %{_prefix}/lib +%endif + +Name: dbus-tqt +Version: %{?version} +Release: 0%{?dist}%{?_variant} +License: GPL +Summary: Dbus TQT Interface +Vendor: Trinity Project +Packager: Francois Andriot + +Prefix: %{_prefix} +Source0: %{name}-%{version}.tar.gz + +BuildRequires: qt3-devel >= 3.3.8d +BuildRequires: gcc-c++ +BuildRequires: dbus-qt-devel +BuildRequires: tqtinterface-devel +BuildRequires: cmake >= 2.8 + +Requires: qt3 >= 3.3.8d + +%description +Dbus TQT Interface + +%package devel +Requires: %{name} +Summary: %{name} - Development files + +%description devel +Development files for %{name} + +%prep +%setup -q -n dependencies/%{name} + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh + +%__mkdir build +cd build +%cmake .. + +%__make %{?_smp_mflags} + + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot}%{_includedir} +%make_install -C build + +%clean +%__rm -rf %{?buildroot} + +%files +%{_libdir}/*.so.* + +%files devel +%{_includedir}/dbus-1.0/* +%{_libdir}/*.so +%{_libdir}/*.la +%{_libdir}/pkgconfig/*.pc + +%changelog +* Sun Sep 02 2011 Francois Andriot - 3.5.13pre-0 +- Import to GIT +- Built with future TDE version (3.5.13 + cmake + QT3.3.8d) From 7c45e68e084ed5c7e68c25f25a6c459ceb9b598b Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 4 Sep 2011 17:29:48 +0200 Subject: [PATCH 5/9] Initial ARTS for RHEL For TDE 3.5.12 and TDE 3.5.13 --- .../arts/trinity-arts-3.5.12.spec | 132 ++++++++++++++++++ .../arts/trinity-arts-3.5.13.spec | 117 ++++++++++++++++ 2 files changed, 249 insertions(+) create mode 100755 redhat/dependencies/arts/trinity-arts-3.5.12.spec create mode 100755 redhat/dependencies/arts/trinity-arts-3.5.13.spec diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec new file mode 100755 index 000000000..bea5bcef3 --- /dev/null +++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec @@ -0,0 +1,132 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _libdir %{_prefix}/lib +%endif + + +Name: trinity-arts +Version: 3.5.12 +Release: 4%{?dist}%{?_variant} +License: GPL +Summary: aRts (analog realtime synthesizer) - the KDE sound system +Vendor: Trinity Project +Packager: Francois Andriot + +Source0: http://mirror3.tokra.lv/releases/3.5.12/dependencies/arts-3.5.12.tar.gz +Prefix: %{_prefix} + +BuildRequires: autoconf automake libtool m4 +BuildRequires: qt3-devel >= 3.3.8b +BuildRequires: tqtinterface-devel +BuildRequires: audiofile-devel +BuildRequires: alsa-lib-devel +BuildRequires: glib2-devel +BuildRequires: libtool-ltdl-devel + +Requires: qt3 >= 3.3.8d +Requires: tqtinterface +Requires: audiofile + +%if "%{?_prefix}" == "/usr" +Obsoletes: arts +%endif + +%description +arts (analog real-time synthesizer) is the sound system of KDE 3. + +The principle of arts is to create/process sound using small modules which do +certain tasks. These may be create a waveform (oscillators), play samples, +filter data, add signals, perform effects like delay/flanger/chorus, or +output the data to the soundcard. + +By connecting all those small modules together, you can perform complex +tasks like simulating a mixer, generating an instrument or things like +playing a wave file with some effects. + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +%if "%{?_prefix}" == "/usr" +Obsoletes: arts-devel +%endif + +%description devel +Development files for %{name} + +%prep +%setup -q -n dependencies/arts + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" +%configure \ + --disable-rpath \ + --disable-debug --disable-warnings \ + --disable-dependency-tracking \ + --enable-new-ldflags \ + --disable-libmad \ + --with-alsa \ + --enable-final \ + --with-extra-includes=%{_includedir}/tqt + +%__make %{?_smp_mflags} + +%install +%make_install + +%clean +%__rm -rf %{?buildroot} + +%files +%defattr(-,root,root,-) +%doc COPYING.LIB +%dir %{_libdir}/mcop +%dir %{_libdir}/mcop/Arts +%{_libdir}/mcop/Arts/* +%{_libdir}/mcop/*.mcopclass +%{_libdir}/mcop/*.mcoptype +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la +%{_bindir}/artscat +%{_bindir}/artsd +%{_bindir}/artsdsp +%{_bindir}/artsplay +%{_bindir}/artsrec +%{_bindir}/artsshell +%{_bindir}/artswrapper + +%files devel +%defattr(-,root,root,-) +%{_bindir}/mcopidl +%dir %{_includedir} +%{_includedir}/arts/ +%{_includedir}/artsc/ +%{_bindir}/artsc-config +%{_libdir}/lib*.so + + +%changelog +* Sun Sep 04 2011 Francois Andriot - 3.5.12-4 +- Import to GIT +- Removes cmake stuff, build with autotools only + +* Mon Aug 22 2011 Francois Andriot - 3.5.12-3 +- Correct macro to install under "/opt", if desired + +* Sat Dec 18 2010 Francois Andriot - 3.5.12-2 +- Add cmake support +- Add some BuildRequires + +* Fri Dec 17 2010 Francois Andriot - 3.5.12-1 +- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/trinity) +- Add '--with-extra-includes=%{_includedir}/tqt' + +* Tue Dec 07 2010 Francois Andriot - 3.5.12-0 +- Initial version + diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec new file mode 100755 index 000000000..23d08c4d9 --- /dev/null +++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec @@ -0,0 +1,117 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 1.5.10 +%endif + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _libdir %{_prefix}/lib +%endif + + +Name: trinity-arts +Version: %{version} +Release: 0%{?dist}%{?_variant} +License: GPL +Summary: aRts (analog realtime synthesizer) - the KDE sound system +Vendor: Trinity Project +Packager: Francois Andriot + +Source0: arts-%{version}.tar.gz +Prefix: %{_prefix} + +BuildRequires: cmake >= 2.8 +BuildRequires: tde-cmake-macros +BuildRequires: qt3-devel >= 3.3.8d +BuildRequires: tqtinterface-devel +BuildRequires: audiofile-devel +BuildRequires: alsa-lib-devel +BuildRequires: glib2-devel +BuildRequires: libtool-ltdl-devel + +Requires: qt3 >= 3.3.8d +Requires: tqtinterface +Requires: audiofile + +%if "%{?_prefix}" == "/usr" +Obsoletes: arts +%endif + +%description +arts (analog real-time synthesizer) is the sound system of KDE 3. + +The principle of arts is to create/process sound using small modules which do +certain tasks. These may be create a waveform (oscillators), play samples, +filter data, add signals, perform effects like delay/flanger/chorus, or +output the data to the soundcard. + +By connecting all those small modules together, you can perform complex +tasks like simulating a mixer, generating an instrument or things like +playing a wave file with some effects. + + +%package devel +Requires: %{name} +Summary: %{name} - Development files +%if "%{?_prefix}" == "/usr" +Obsoletes: arts-devel +%endif + +%description devel +Development files for %{name} + +%prep +%setup -q -n dependencies/arts + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh + +%__mkdir build +cd build +%cmake \ + -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \ + -DWITH_MAD=OFF \ + .. + +%__make %{?_smp_mflags} + +%install +%make_install -C build + +%clean +%__rm -rf %{?buildroot} + +%files +%defattr(-,root,root,-) +%doc COPYING.LIB +%dir %{_libdir}/mcop +%dir %{_libdir}/mcop/Arts +%{_libdir}/mcop/Arts/* +%{_libdir}/mcop/*.mcopclass +%{_libdir}/mcop/*.mcoptype +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la +%{_bindir}/artscat +%{_bindir}/artsd +%{_bindir}/artsdsp +%{_bindir}/artsplay +%{_bindir}/artsrec +%{_bindir}/artsshell +%{_bindir}/artswrapper + +%files devel +%defattr(-,root,root,-) +%{_bindir}/mcopidl +%dir %{_includedir} +%{_includedir}/*/ +%{_bindir}/artsc-config +%{_libdir}/lib*.so +%{_libdir}/pkgconfig/*.pc +%exclude %{_libdir}/*.a + + +%changelog +* Fri Sep 02 2011 Francois Andriot - 1.5.10-0 +- Import to GIT +- Built with future TDE version (3.5.13 + cmake + QT3.3.8d) From aa68ab3ac0eb04feea60826d19e41e1c53ac9e0f Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 4 Sep 2011 18:46:03 +0200 Subject: [PATCH 6/9] Fixed requires QT3 error in ARTS 3.5.12 ... --- redhat/dependencies/arts/trinity-arts-3.5.12.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec index bea5bcef3..63cd0e5ac 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec @@ -24,7 +24,7 @@ BuildRequires: alsa-lib-devel BuildRequires: glib2-devel BuildRequires: libtool-ltdl-devel -Requires: qt3 >= 3.3.8d +Requires: qt3 >= 3.3.8b Requires: tqtinterface Requires: audiofile From 21debd86d012442ee121ce271d56967290343975 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 4 Sep 2011 19:00:24 +0200 Subject: [PATCH 7/9] Initial KDELIBS build for RHEL 6 Versions 3.5.12 and 3.5.13 --- redhat/kdelibs/trinity-kdelibs-3.5.12.spec | 263 +++++++++++++++++++++ redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 252 ++++++++++++++++++++ 2 files changed, 515 insertions(+) create mode 100755 redhat/kdelibs/trinity-kdelibs-3.5.12.spec create mode 100755 redhat/kdelibs/trinity-kdelibs-3.5.13.spec diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec new file mode 100755 index 000000000..b6d1eaa16 --- /dev/null +++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec @@ -0,0 +1,263 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _libdir %{_prefix}/lib +%define _docdir %{_prefix}/share/doc +%endif + + +Name: trinity-kdelibs +Version: 3.5.12 +Release: 5%{?dist}%{?_variant} +License: GPL +Vendor: Trinity Project +Packager: Francois Andriot +Summary: Trinity KDE Libraries + +Source0: kdelibs-%{version}.tar.gz +Prefix: %{_prefix} + +BuildRequires: autoconf automake libtool m4 +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: qt3-devel +BuildRequires: avahi-devel avahi-qt3-devel +BuildRequires: lua-devel +BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel +BuildRequires: libutempter-devel +BuildRequires: bzip2-devel +BuildRequires: openssl-devel + +Requires: tqtinterface +Requires: trinity-arts +Requires: qt3 +Requires: avahi avahi-qt3 + +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs3 +%endif + +%description +Libraries for the Trinity K Desktop Environment + +%package devel +Requires: %{name} +Summary: %{name} - Development files +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs3-devel +%endif + +%description devel +Development files for %{name} + +%package apidocs +Requires: %{name} +Summary: %{name} - API documentation + +%description apidocs +This package includes the KDE 3 API documentation in HTML +format for easy browsing + +%prep +%setup -q -n kdelibs +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LD_LIBRARY_PATH="%{_libdir}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" +%configure \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-debug --disable-warnings --enable-final \ + --disable-fast-malloc \ + --enable-cups \ + --enable-mitshm \ + --enable-pie \ + --enable-sendfile \ + --with-distribution="$(cat /etc/redhat-release 2>/dev/null)" \ + --with-alsa \ + --without-aspell \ + --without-hspell \ + --disable-libfam \ + --enable-dnotify \ + --enable-inotify \ + --with-utempter \ + --with-jasper \ + --with-openexr \ + --with-xinerama \ + --with-extra-includes=%{_includedir}/tqt + +# Do NOT use %{?_smp_mflags} for this package, or it will fail to build ! +%__make + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot} +%make_install + +%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d +cat <%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf +%if "%{?_prefix}" != "/usr" +%{_libdir} +%endif +%{_libdir}/trinity +EOF + +%clean +%__rm -rf %{?buildroot} + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc README +%doc COPYING.LIB +%{_bindir}/artsmessage +%{_bindir}/cupsdconf +%{_bindir}/cupsdoprint +%{_bindir}/dcop +%{_bindir}/dcopclient +%{_bindir}/dcopfind +%{_bindir}/dcopobject +%{_bindir}/dcopquit +%{_bindir}/dcopref +%{_bindir}/dcopserver +%{_bindir}/dcopserver_shutdown +%{_bindir}/dcopstart +%{_bindir}/filesharelist +%{_bindir}/fileshareset +%{_bindir}/imagetops +%{_bindir}/kab2kabc +%{_bindir}/kaddprinterwizard +%{_bindir}/kbuildsycoca +%{_bindir}/kcmshell +%{_bindir}/kconf_update +%{_bindir}/kcookiejar +%{_bindir}/kde-config +%{_bindir}/kde-menu +%{_bindir}/kded +%{_bindir}/kdeinit +%{_bindir}/kdeinit_shutdown +%{_bindir}/kdeinit_wrapper +%{_bindir}/kdesu_stub +%{_bindir}/kdontchangethehostname +%{_bindir}/kdostartupconfig +%{_bindir}/kfile +%{_bindir}/kfmexec +%{_bindir}/khotnewstuff +%{_bindir}/kinstalltheme +%{_bindir}/kio_http_cache_cleaner +%{_bindir}/kio_uiserver +%{_bindir}/kioexec +%{_bindir}/kioslave +%{_bindir}/klauncher +%{_bindir}/kmailservice +%{_bindir}/kmimelist +%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper +%{_bindir}/ksendbugmail +%{_bindir}/kshell +%{_bindir}/kstartupconfig +%{_bindir}/ktelnetservice +%{_bindir}/ktradertest +%{_bindir}/kwrapper +%{_bindir}/lnusertemp +%{_bindir}/make_driver_db_cups +%{_bindir}/make_driver_db_lpr +%{_bindir}/meinproc +%{_bindir}/networkstatustestservice +%{_bindir}/start_kdeinit +%{_bindir}/start_kdeinit_wrapper +%attr(4755,root,root) %{_bindir}/kgrantpty +%{_libdir}/lib*.so.* +%{_libdir}/libkdeinit_*.so +%{_libdir}/lib*.la +%{_libdir}/kde3/ +%{_datadir}/applications/kde/*.desktop +%{_datadir}/autostart/kab2kabc.desktop +%{_datadir}/applnk/kio_iso.desktop +%{_datadir}/apps/* +%exclude %{_datadir}/apps/ksgmltools2/ +%config(noreplace) %{_datadir}/config/* +%{_datadir}/emoticons/* +%{_datadir}/icons/default.kde +%{_datadir}/mimelnk/magic +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/icons/crystalsvg/ +%{_docdir}/HTML/en/kspell +# remove conflicts with kdelibs-4 +%if "%{?_prefix}" != "/usr" +%{_bindir}/checkXML +%{_bindir}/ksvgtopng +%{_bindir}/kunittestmodrunner +%{_bindir}/preparetips +%{_datadir}/icons/hicolor/index.theme +%{_datadir}/locale/all_languages +%{_docdir}/HTML/en/common/* +%else +%exclude %{_bindir}/checkXML +%exclude %{_bindir}/ksvgtopng +%exclude %{_bindir}/kunittestmodrunner +%exclude %{_bindir}/preparetips +%exclude %{_datadir}/config/colors +%exclude %{_datadir}/config/kdebug.areas +%exclude %{_datadir}/config/kdebugrc +%exclude %{_datadir}/config/ksslcalist +%exclude %{_datadir}/config/ui/ui_standards.rc +%exclude %{_datadir}/icons/hicolor/index.theme +%exclude %{_datadir}/locale/all_languages +%exclude %{_docdir}/HTML/en/common/* +%endif +%{_sysconfdir}/ld.so.conf.d/trinity.conf + +# Provided by 'redhat-menus' package +%exclude %{_sysconfdir}/xdg/menus/applications.menu + +%files devel +%defattr(-,root,root,-) +%{_bindir}/dcopidl* +%{_bindir}/kconfig_compiler +%{_bindir}/makekdewidgets +%{_datadir}/apps/ksgmltools2/ +%{_includedir}/ +%{_libdir}/lib*.so +%{_libdir}/lib*.a +%exclude %{_libdir}/libkdeinit_*.so + +%files apidocs +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version}/ +%{_docdir}/HTML/en/kdelibs* + + +%changelog +* Sun Sep 04 2011 Francois Andriot - 3.5.12-5 +- Import to GIT +- Removes cmake stuff, build with autotools only + +* Tue Aug 23 2011 Francois Andriot - 3.5.12-4 +- Add missing BuildRequires + +* Mon Aug 22 2011 Francois Andriot - 3.5.12-3 +- Correct macro to install under "/opt", if desired + +* Sun Dec 19 2010 Francois Andriot - 3.5.12-2 +- Rebuilt + +* Fri Dec 17 2010 Francois Andriot - 3.5.12-1 +- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/trinity) +- Add '--with-extra-includes=%{_includedir}/tqt' + +* Wed Dec 14 2010 Francois Andriot - 3.5.12-0 +- Initial version + diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec new file mode 100755 index 000000000..e122f53bd --- /dev/null +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -0,0 +1,252 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _libdir %{_prefix}/lib +%define _docdir %{_prefix}/share/doc +%endif + + +Name: trinity-kdelibs +Version: %{version} +Release: 0%{?dist}%{?_variant} +License: GPL +Vendor: Trinity Project +Packager: Francois Andriot +Summary: Trinity KDE Libraries + +Source0: kdelibs-%{version}.tar.gz +Prefix: %{_prefix} + +BuildRequires: cmake >= 2.8 +BuildRequires: libtool +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: qt3-devel +BuildRequires: avahi-devel avahi-qt3-devel +#BuildRequires: lua-devel +BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel +BuildRequires: libutempter-devel +BuildRequires: bzip2-devel +BuildRequires: openssl-devel + +Requires: tqtinterface +Requires: trinity-arts +Requires: qt3 +Requires: avahi avahi-qt3 + +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs3 +%endif + +%description +Libraries for the Trinity K Desktop Environment + +%package devel +Requires: %{name} +Summary: %{name} - Development files +%if "%{?_prefix}" == "/usr" +Obsoletes: kdelibs3-devel +%endif + +%description devel +Development files for %{name} + +%package apidocs +Requires: %{name} +Summary: %{name} - API documentation + +%description apidocs +This package includes the KDE 3 API documentation in HTML +format for easy browsing + +%prep +%setup -q -n kdelibs + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LD_LIBRARY_PATH="%{_libdir}" +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" + +%__mkdir build +cd build +%cmake \ + -DWITH_ARTS=ON \ + -DWITH_ALSA=ON \ + -DWITH_LIBART=ON \ + -DWITH_LIBIDN=OFF \ + -DWITH_SSL=ON \ + -DWITH_CUPS=ON \ + -DWITH_LUA=OFF \ + -DWITH_TIFF=ON \ + -DWITH_JASPER=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_UTEMPTER=ON \ + -DWITH_AVAHI=ON \ + -DWITH_ASPELL=OFF \ + -DWITH_HSPELL=OFF \ + .. + +%__make %{?_smp_mflags} + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot} +%make_install -C build + +%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d +cat <%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf +%if "%{?_prefix}" != "/usr" +%{_libdir} +%endif +%{_libdir}/trinity +EOF + +%clean +%__rm -rf %{?buildroot} + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc README +%doc COPYING.LIB +%{_bindir}/artsmessage +%{_bindir}/cupsdconf +%{_bindir}/cupsdoprint +%{_bindir}/dcop +%{_bindir}/dcopclient +%{_bindir}/dcopfind +%{_bindir}/dcopobject +%{_bindir}/dcopquit +%{_bindir}/dcopref +%{_bindir}/dcopserver +%{_bindir}/dcopserver_shutdown +%{_bindir}/dcopstart +%{_bindir}/filesharelist +%{_bindir}/fileshareset +%{_bindir}/imagetops +%{_bindir}/kab2kabc +%{_bindir}/kaddprinterwizard +%{_bindir}/kbuildsycoca +%{_bindir}/kcmshell +%{_bindir}/kconf_update +%{_bindir}/kcookiejar +%{_bindir}/kde-config +%{_bindir}/kde-menu +%{_bindir}/kded +%{_bindir}/kdeinit +%{_bindir}/kdeinit_shutdown +%{_bindir}/kdeinit_wrapper +%{_bindir}/kdesu_stub +%{_bindir}/kdontchangethehostname +%{_bindir}/kdostartupconfig +%{_bindir}/kfile +%{_bindir}/kfmexec +%{_bindir}/khotnewstuff +%{_bindir}/kinstalltheme +%{_bindir}/kio_http_cache_cleaner +%{_bindir}/kio_uiserver +%{_bindir}/kioexec +%{_bindir}/kioslave +%{_bindir}/klauncher +%{_bindir}/kmailservice +%{_bindir}/kmimelist +%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper +%{_bindir}/ksendbugmail +%{_bindir}/kshell +%{_bindir}/kstartupconfig +%{_bindir}/ktelnetservice +%{_bindir}/ktradertest +%{_bindir}/kwrapper +%{_bindir}/lnusertemp +%{_bindir}/make_driver_db_cups +%{_bindir}/make_driver_db_lpr +%{_bindir}/meinproc +%{_bindir}/networkstatustestservice +%{_bindir}/start_kdeinit +%{_bindir}/start_kdeinit_wrapper +%attr(4755,root,root) %{_bindir}/kgrantpty +%{_libdir}/lib*.so.* +%{_libdir}/libkdeinit_*.so +%{_libdir}/lib*.la +%{_libdir}/trinity/ +%{_datadir}/applications/kde/*.desktop +%{_datadir}/autostart/kab2kabc.desktop +%{_datadir}/applnk/kio_iso.desktop +%{_datadir}/apps/* +%exclude %{_datadir}/apps/ksgmltools2/ +%config(noreplace) %{_datadir}/config/* +%{_datadir}/emoticons/* +%{_datadir}/icons/default.kde +%{_datadir}/mimelnk/magic +%{_datadir}/mimelnk/*/*.desktop +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/icons/crystalsvg/ +%{_docdir}/kde/HTML/en/kspell +# remove conflicts with kdelibs-4 +%if "%{?_prefix}" != "/usr" +%{_bindir}/checkXML +%{_bindir}/ksvgtopng +%{_bindir}/kunittestmodrunner +%{_bindir}/preparetips +%{_datadir}/icons/hicolor/index.theme +%{_datadir}/locale/all_languages +%{_docdir}/kde/HTML/en/common/* +%else +%exclude %{_bindir}/checkXML +%exclude %{_bindir}/ksvgtopng +%exclude %{_bindir}/kunittestmodrunner +%exclude %{_bindir}/preparetips +%exclude %{_datadir}/config/colors +%exclude %{_datadir}/config/kdebug.areas +%exclude %{_datadir}/config/kdebugrc +%exclude %{_datadir}/config/ksslcalist +%exclude %{_datadir}/config/ui/ui_standards.rc +%exclude %{_datadir}/icons/hicolor/index.theme +%exclude %{_datadir}/locale/all_languages +%exclude %{_docdir}/kde/HTML/en/common/* +%endif +%{_sysconfdir}/ld.so.conf.d/trinity.conf + +# Provided by 'redhat-menus' package +%exclude %{_sysconfdir}/xdg/menus/applications.menu + +# New in TDE 3.5.13 +%{_bindir}/kdetcompmgr + +%files devel +%defattr(-,root,root,-) +%{_bindir}/dcopidl* +%{_bindir}/kconfig_compiler +%{_bindir}/makekdewidgets +%{_datadir}/apps/ksgmltools2/ +%{_includedir}/ +%{_libdir}/lib*.so +%{_libdir}/lib*.a +%exclude %{_libdir}/libkdeinit_*.so + +# New in TDE 3.5.13 +%{_datadir}/cmake/kdelibs.cmake + +%files apidocs +%defattr(-,root,root,-) +%{_docdir}/%{name}-%{version}/ +#%{_docdir}/kde/HTML/en/kdelibs* + + +%changelog +* Wed Sep 02 2011 Francois Andriot - 3.5.13pre.svn20110902-0.el6 +- Import to GIT +- Built with future TDE version (3.5.13 + cmake + QT3.3.8d) From adfc29286dee5690521f2cd177bc0e9f97cab2d4 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 4 Sep 2011 19:47:42 +0200 Subject: [PATCH 8/9] Initial KDEBASE build for RHEL 6 Versions 3.5.12 and 3.5.13 Including some RHEL/Fedora specific patches. --- ...base-3.5.12-desktop-openterminalhere.patch | 19 + .../kdebase-3.5.12-halmountoptions.patch | 78 +++ .../kdebase-3.5.12-kdesu-noignorebutton.patch | 45 ++ redhat/kdebase/kdebase-3.5.12-r1220927.patch | 29 + redhat/kdebase/kdebase-3.5.12-r1220975.patch | 19 + ...base-3.5.12-shutdowndlg-dbus-include.patch | 20 + .../kdebase-3.5.13-kdesu-noignorebutton.patch | 45 ++ redhat/kdebase/plasma-desktop | 9 + redhat/kdebase/trinity-kdebase-3.5.12.spec | 507 ++++++++++++++++++ redhat/kdebase/trinity-kdebase-3.5.13.spec | 450 ++++++++++++++++ 10 files changed, 1221 insertions(+) create mode 100644 redhat/kdebase/kdebase-3.5.12-desktop-openterminalhere.patch create mode 100644 redhat/kdebase/kdebase-3.5.12-halmountoptions.patch create mode 100644 redhat/kdebase/kdebase-3.5.12-kdesu-noignorebutton.patch create mode 100644 redhat/kdebase/kdebase-3.5.12-r1220927.patch create mode 100644 redhat/kdebase/kdebase-3.5.12-r1220975.patch create mode 100644 redhat/kdebase/kdebase-3.5.12-shutdowndlg-dbus-include.patch create mode 100644 redhat/kdebase/kdebase-3.5.13-kdesu-noignorebutton.patch create mode 100755 redhat/kdebase/plasma-desktop create mode 100755 redhat/kdebase/trinity-kdebase-3.5.12.spec create mode 100755 redhat/kdebase/trinity-kdebase-3.5.13.spec diff --git a/redhat/kdebase/kdebase-3.5.12-desktop-openterminalhere.patch b/redhat/kdebase/kdebase-3.5.12-desktop-openterminalhere.patch new file mode 100644 index 000000000..1dc03e97e --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.12-desktop-openterminalhere.patch @@ -0,0 +1,19 @@ +*** kdebase/kdesktop/krootwm.cc.ori 2011-07-20 14:14:25.822954866 +0200 +--- kdebase/kdesktop/krootwm.cc 2011-07-20 14:16:09.964002976 +0200 +*************** +*** 760,766 **** + KConfigGroupSaver gs(KGlobal::config(), "General"); + TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole"); + +! *p << terminal << "--workdir=" + KGlobalSettings::desktopPath() + "/"; + + p->start(KProcess::DontCare); + +--- 760,766 ---- + KConfigGroupSaver gs(KGlobal::config(), "General"); + TQString terminal = KGlobal::config()->readPathEntry("TerminalApplication", "konsole"); + +! *p << terminal; + + p->start(KProcess::DontCare); + diff --git a/redhat/kdebase/kdebase-3.5.12-halmountoptions.patch b/redhat/kdebase/kdebase-3.5.12-halmountoptions.patch new file mode 100644 index 000000000..31a6717b3 --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.12-halmountoptions.patch @@ -0,0 +1,78 @@ +*** kdebase/kioslave/media/mediamanager/halbackend.cpp.orig 2010-09-30 00:24:28.000000000 +0200 +--- kdebase/kioslave/media/mediamanager/halbackend.cpp 2011-07-20 16:39:40.933056051 +0200 +*************** +*** 873,878 **** +--- 873,905 ---- + s_HALBackend->DeviceCondition(udi, condition_name); + } + ++ TQStringList HALBackend::getHALmountoptions(TQString udi) ++ { ++ const char* _ppt_string; ++ LibHalVolume* volume; ++ LibHalDrive* drive; ++ ++ TQString _ppt_QString; ++ ++ volume = libhal_volume_from_udi( m_halContext, udi.latin1() ); ++ if( volume ) ++ drive = libhal_drive_from_udi( m_halContext, libhal_volume_get_storage_device_udi( volume ) ); ++ else ++ drive = libhal_drive_from_udi( m_halContext, udi.latin1() ); ++ ++ if( !drive ) ++ return TQString::null; ++ ++ if( volume ) ++ _ppt_string = libhal_volume_policy_get_mount_options ( drive, volume, NULL ); ++ else ++ _ppt_string = libhal_drive_policy_get_mount_options ( drive, NULL ); ++ ++ _ppt_QString = TQString(_ppt_string ? _ppt_string : ""); ++ ++ return TQStringList::split(",",_ppt_QString); ++ } ++ + TQStringList HALBackend::mountoptions(const TQString &name) + { + const Medium* medium = m_mediaList.findById(name); +*************** +*** 1472,1481 **** +--- 1499,1524 ---- + soptions << TQString("data=ordered"); + } + ++ TQStringList hal_mount_options = getHALmountoptions(medium->id()); ++ for (TQValueListIterator it=hal_mount_options.begin();it!=hal_mount_options.end();it++) ++ { ++ soptions << *it; ++ kdDebug()<<"HALOption: "<<*it<setGroup("super-user-command"); +--- 15,21 ---- + #include "sudlg.h" + + KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton) +! : KPasswordDialog(Password, enableKeep, 0, icon) + { + KConfig* config = KGlobal::config(); + config->setGroup("super-user-command"); +*************** +*** 34,45 **** + } else { + if (m_User == "root") { + prompt = i18n("The action you requested needs root privileges. " +! "Please enter root's password below or click " +! "Ignore to continue with your current privileges."); + } else { + prompt = i18n("The action you requested needs additional privileges. " +! "Please enter the password for \"%1\" below or click " +! "Ignore to continue with your current privileges.").arg(m_User); + } + } + setPrompt(prompt); +--- 34,43 ---- + } else { + if (m_User == "root") { + prompt = i18n("The action you requested needs root privileges. " +! "Please enter root's password below."); + } else { + prompt = i18n("The action you requested needs additional privileges. " +! "Please enter the password for \"%1\" below.").arg(m_User); + } + } + setPrompt(prompt); diff --git a/redhat/kdebase/kdebase-3.5.12-r1220927.patch b/redhat/kdebase/kdebase-3.5.12-r1220927.patch new file mode 100644 index 000000000..8048cc929 --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.12-r1220927.patch @@ -0,0 +1,29 @@ +Index: kdebase/kcontrol/iccconfig/iccconfig.cpp +=================================================================== +--- kdebase/kcontrol/iccconfig/iccconfig.cpp (revision 1220926) ++++ kdebase/kcontrol/iccconfig/iccconfig.cpp (revision 1220927) +@@ -286,7 +286,7 @@ + base->deleteProfileButton->setFixedWidth(90); + + XRROutputInfo *output_info; +- KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI(); ++ KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI(); + + config->setReadDefaults( useDefaults ); + +@@ -356,7 +356,7 @@ + { + int i; + int j; +- KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI::KRandrSimpleAPI(); ++ KRandrSimpleAPI *randrsimple = new KRandrSimpleAPI(); + + // Write system configuration + systemconfig->setGroup(NULL); +@@ -408,4 +408,4 @@ + " for a more lifelike and vibrant image."); + } + +-#include "iccconfig.moc" +\ No newline at end of file ++#include "iccconfig.moc" diff --git a/redhat/kdebase/kdebase-3.5.12-r1220975.patch b/redhat/kdebase/kdebase-3.5.12-r1220975.patch new file mode 100644 index 000000000..d16ce90e0 --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.12-r1220975.patch @@ -0,0 +1,19 @@ +*** kdebase/ksmserver/shutdowndlg.cpp.ORI 2011-08-23 21:42:55.206965177 +0200 +--- kdebase/ksmserver/shutdowndlg.cpp 2011-08-23 21:43:26.429965029 +0200 +*************** +*** 80,86 **** + { + DCOPRef("kicker", "KMenu").call("hideMenu"); // Make sure the K Menu is completely removed from the screen before taking a snapshot... + m_grayImage = TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height()).convertToImage(); +! m_unfadedImage = TQImage::TQImage(); + resize(0, 0); + setShown(true); + TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) ); +--- 80,86 ---- + { + DCOPRef("kicker", "KMenu").call("hideMenu"); // Make sure the K Menu is completely removed from the screen before taking a snapshot... + m_grayImage = TQPixmap::grabWindow(qt_xrootwin(), 0, 0, TQApplication::desktop()->width(), TQApplication::desktop()->height()).convertToImage(); +! m_unfadedImage = TQImage(); + resize(0, 0); + setShown(true); + TQTimer::singleShot( 500, this, TQT_SLOT( slotPaintEffect() ) ); diff --git a/redhat/kdebase/kdebase-3.5.12-shutdowndlg-dbus-include.patch b/redhat/kdebase/kdebase-3.5.12-shutdowndlg-dbus-include.patch new file mode 100644 index 000000000..64af6d86e --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.12-shutdowndlg-dbus-include.patch @@ -0,0 +1,20 @@ +diff -rcb kdebase/ksmserver/shutdowndlg.h kdebase.patch/ksmserver/shutdowndlg.h +*** kdebase/ksmserver/shutdowndlg.h Sat Sep 25 23:33:51 2010 +--- kdebase.patch/ksmserver/shutdowndlg.h Thu Dec 9 14:58:43 2010 +*************** +*** 32,38 **** + + /* We acknowledge the the dbus API is unstable */ + #define DBUS_API_SUBJECT_TO_CHANGE +! #include + #include + + // The (singleton) widget that makes/fades the desktop gray. +--- 32,38 ---- + + /* We acknowledge the the dbus API is unstable */ + #define DBUS_API_SUBJECT_TO_CHANGE +! #include + #include + + // The (singleton) widget that makes/fades the desktop gray. diff --git a/redhat/kdebase/kdebase-3.5.13-kdesu-noignorebutton.patch b/redhat/kdebase/kdebase-3.5.13-kdesu-noignorebutton.patch new file mode 100644 index 000000000..f941cc20a --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-kdesu-noignorebutton.patch @@ -0,0 +1,45 @@ +diff -rcb kdebase.ORI/kdesu/kdesu/sudlg.cpp kdebase/kdesu/kdesu/sudlg.cpp +*** kdebase.ORI/kdesu/kdesu/sudlg.cpp 2010-12-17 22:55:07.725798945 +0100 +--- kdebase/kdesu/kdesu/sudlg.cpp 2010-12-17 22:55:49.378797283 +0100 +*************** +*** 15,21 **** + #include "sudlg.h" + + KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton) +! : KPasswordDialog(Password, enableKeep, (withIgnoreButton ? User1:NoDefault), icon) + { + KConfig* config = KGlobal::config(); + config->setGroup("super-user-command"); +--- 15,21 ---- + #include "sudlg.h" + + KDEsuDialog::KDEsuDialog(TQCString user, TQCString auth_user, bool enableKeep,const TQString& icon, bool withIgnoreButton) +! : KPasswordDialog(Password, enableKeep, 0, icon) + { + KConfig* config = KGlobal::config(); + config->setGroup("super-user-command"); +*************** +*** 34,45 **** + } else { + if (m_User == "root") { + prompt = i18n("The action you requested needs root privileges. " +! "Please enter root's password below or click " +! "Ignore to continue with your current privileges."); + } else { + prompt = i18n("The action you requested needs additional privileges. " +! "Please enter the password for \"%1\" below or click " +! "Ignore to continue with your current privileges.").arg(static_cast(m_User)); + } + } + setPrompt(prompt); +--- 34,43 ---- + } else { + if (m_User == "root") { + prompt = i18n("The action you requested needs root privileges. " +! "Please enter root's password below."); + } else { + prompt = i18n("The action you requested needs additional privileges. " +! "Please enter the password for \"%1\" below.").arg(static_cast(m_User)); + } + } + setPrompt(prompt); diff --git a/redhat/kdebase/plasma-desktop b/redhat/kdebase/plasma-desktop new file mode 100755 index 000000000..9e14070d8 --- /dev/null +++ b/redhat/kdebase/plasma-desktop @@ -0,0 +1,9 @@ +#!/bin/sh + +# This stupid scripts prevent the launch of 'plasma-desktop' +# (from KDE4) alongside with TDE. + +case "${DESKTOP_SESSION}" in + "kde3"|"trinity"|"TDE") ;; + *) exec /usr/bin/plasma-desktop;; +esac diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec new file mode 100755 index 000000000..a617f2f5f --- /dev/null +++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec @@ -0,0 +1,507 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _libdir %{_prefix}/lib +%define _docdir %{_prefix}/share/doc +%endif + + +Name: trinity-kdebase +Version: 3.5.12 +Release: 9%{?dist}%{?_variant} +License: GPL +Vendor: Trinity Project +Packager: Thales Communications +Summary: Trinity KDE Base Programs + +Prefix: %{_prefix} + +Source0: http://mirror3.tokra.lv/releases/3.5.12/kdebase-3.5.12.tar.gz + +# Wrapper script to prevent Plasma launch at Trinity Startup +Source1: plasma-desktop + +# TDE Official patches (from SVN), unmodified +# [kdebase/kcontrol] fix for openssl 1.0 +Patch1: http://www.trinitydesktop.org/patches/r1201523.diff +# [kdebase/kcontrol] make it compatible with openssl < 1.0 +Patch2: http://www.trinitydesktop.org/patches/r1201705.diff +# Fix My Documents shortcut on desktop +Patch4: http://www.trinitydesktop.org/patches/r1182808.diff +# [kdebase] fixed an incompatibility with gcc 4.5 +Patch8: http://www.trinitydesktop.org/patches/r1221326.diff + +# TDE Official patches (from SVN), modified +# [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2 +Patch7: kdebase-3.5.12-r1220975.patch +# [kdebase] Another invalid constructor per gcc 4.5 +Patch9: kdebase-3.5.12-r1220927.patch + +# TDE for RHEL/Fedora specific patches +# Fix for DBUS include files in RHEL6 +Patch0: kdebase-3.5.12-shutdowndlg-dbus-include.patch +# [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box +Patch3: kdebase-3.5.12-kdesu-noignorebutton.patch +# [kdebase/kdesktop] Modifies "open terminal here" on desktop +Patch5: kdebase-3.5.12-desktop-openterminalhere.patch +# [kdebase/kioslave]: Forces HAL backend to use HAL mount options +Patch6: kdebase-3.5.12-halmountoptions.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: qt3-devel >= 3.3.8b +BuildRequires: openssl-devel +BuildRequires: avahi-devel avahi-qt3-devel +BuildRequires: imake +BuildRequires: xorg-x11-proto-devel +BuildRequires: OpenEXR-devel +BuildRequires: libsmbclient-devel +BuildRequires: dbus-devel dbus-qt-devel +BuildRequires: lm_sensors-devel +BuildRequires: libfontenc-devel +BuildRequires: hal-devel +BuildRequires: audiofile-devel +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: libraw1394-devel +BuildRequires: openldap-devel +BuildRequires: libvorbis-devel +BuildRequires: pam-devel +BuildRequires: libXdmcp-devel +BuildRequires: libxkbfile-devel + +Requires: tqtinterface +Requires: trinity-arts +Requires: trinity-kdelibs +Requires: qt3 >= 3.3.8b +Requires: openssl +Requires: avahi avahi-qt3 + + +# RHEL 6 Configuration files are provided in separate packages +%if "%{?_prefix}" == "/usr" +Requires: kde-settings-kdm +%endif +Requires: redhat-menus + +%description +Core applications for the Trinity K Desktop Environment. Included are: kdm +(replacement for xdm), kwin (window manager), konqueror (filemanager, +web browser, ftp client, ...), konsole (xterm replacement), kpanel +(application starter and desktop pager), kaudio (audio server), +kdehelp (viewer for kde help files, info and man pages), kthememgr +(system for managing alternate theme packages) plus other KDE +components (kcheckpass, kikbd, kscreensaver, kcontrol, kfind, +kfontmanager, kmenuedit). + + +%package devel +Requires: %{name} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdelibs-devel +Summary: %{summary} - Development files +%if "%{?_prefix}" == "/usr" +Obsoletes: kdebase3-devel +%endif +Group: Development/Libraries +%description devel +Header files for developing applications using %{name}. +Install kdebase-devel if you want to develop or compile Konqueror, +Kate plugins or KWin styles. + + +%package extras +Summary: Extra applications from %{name} +Group: User Interface/Desktops +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +%description extras +%{summary}, including: + * kappfinder + * kpager + * ktip + * kpersonalizer + + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs >= %{version} +%if "%{?_prefix}" == "/usr" +Obsoletes: kdebase3-libs +%endif +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +%description libs +%{summary} + + +%package pim-ioslaves +Summary: PIM KIOslaves from %{name} +Group: System Environment/Libraries +%description pim-ioslaves +Protocol handlers (KIOslaves) for personal information management, including: + * kio_ldap + * kio_nntp + * kio_pop3 + * kio_smtp + + +%prep +%setup -q -n kdebase +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 + +%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f admin/Makefile.common + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export IMAKEINCLUDE="-I/usr/share/X11/config" + +%configure \ + --disable-rpath \ + --enable-new-ldflags \ + --disable-dependency-tracking \ + --disable-debug --disable-warnings --enable-final \ + --with-pam=yes \ + --with-kdm-pam=kdm \ + --with-kcp-pam=kcheckpass \ + --with-kss-pam=kscreensaver \ + --with-libraw1394 \ + --with-openexr \ + --with-samba \ + --with-xinerama \ + --with-xscreensaver \ + --without-shadow \ + --with-extra-includes=%{_includedir}/tqt + +# Do NOT use %{?_smp_mflags} for this package, or it will fail to build ! +%__make + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot} +%make_install + +# Adds a GDM/KDM/XDM session called 'TDE' +%if "%{?_prefix}" != "/usr" +%__mkdir_p "%{?buildroot}%{_usr}/share/xsessions" +install -m 644 "%{?buildroot}%{_datadir}/apps/kdm/sessions/kde.desktop" "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" +%endif + +# Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE +sed -i "%{?buildroot}%{_bindir}/startkde" \ + -e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,' + +# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard' +mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde + +# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4 +%if "%{?_prefix}" != "/usr" +%{__cp} -f "%{SOURCE1}" "%{?buildroot}%{_bindir}" +%endif + +%clean +%__rm -rf %{?buildroot} + + +%post +touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : +update-desktop-database 2> /dev/null || : +# Dirty hack to install '/etc/ksysguardrc' alongside with KDE4 +[ -r %{_sysconfdir}/ksysguarddrc ] || cp -f %{_sysconfdir}/ksysguarddrc.tde %{_sysconfdir}/ksysguarddrc + +%postun +touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : +update-desktop-database 2> /dev/null || : + + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%post extras +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun extras +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + + +%files extras +%defattr(-,root,root,-) +# kappfinder +%{_bindir}/kappfinder +%{_datadir}/applications/kde/kappfinder.desktop +%{_datadir}/applnk/System/kappfinder.desktop +%{_datadir}/apps/kappfinder/ +%{_datadir}/icons/hicolor/*/apps/kappfinder.png +# ktip +%{_bindir}/ktip +%{_datadir}/applications/kde/ktip.desktop +%{_datadir}/applnk/Toys/ktip.desktop +%{_datadir}/apps/kdewizard +%{_datadir}/autostart/ktip.desktop +%{_datadir}/icons/hicolor/*/apps/ktip* +# kpersonalizer +%{_bindir}/kpersonalizer +%{_datadir}/applications/kde/kpersonalizer.desktop +%{_datadir}/applnk/System/kpersonalizer.desktop +%{_datadir}/apps/kpersonalizer/ +%{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png +# kpager +%{_bindir}/kpager +%{_datadir}/applications/kde/kpager.desktop +%{_datadir}/applnk/Utilities/kpager.desktop +%{_datadir}/icons/hicolor/*/apps/kpager.png + + +%files +%defattr(-,root,root,-) +# kappfinder +%exclude %{_datadir}/applications/kde/kappfinder.desktop +%exclude %{_datadir}/applnk/System/kappfinder.desktop +%exclude %{_datadir}/apps/kappfinder/ +%exclude %{_datadir}/icons/hicolor/*/apps/kappfinder.png +# ktip +%exclude %{_datadir}/applications/kde/ktip.desktop +%exclude %{_datadir}/applnk/Toys/ktip.desktop +%exclude %{_datadir}/apps/kdewizard +%exclude %{_datadir}/autostart/ktip.desktop +%exclude %{_datadir}/icons/hicolor/*/apps/ktip* +# kpersonalizer +%exclude %{_datadir}/applications/kde/kpersonalizer.desktop +%exclude %{_datadir}/applnk/System/kpersonalizer.desktop +%exclude %{_datadir}/apps/kpersonalizer/ +%exclude %{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png +# kpager +%exclude %{_datadir}/applications/kde/kpager.desktop +%exclude %{_datadir}/applnk/Utilities/kpager.desktop +%exclude %{_datadir}/icons/hicolor/*/apps/kpager.png + +%doc AUTHORS COPYING README +%{_docdir}/HTML/en/* +%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde +%{_bindir}/genkdmconf +%{_bindir}/kaccess +%{_bindir}/kapplymousetheme +%{_bindir}/kate +%{_bindir}/kblankscrn.kss +%{_bindir}/kbookmarkmerger +%{_bindir}/kcminit +%{_bindir}/kcminit_startup +%{_bindir}/kcontrol +%{_bindir}/kcontroledit +%{_bindir}/kdebugdialog +%{_bindir}/kdeinstallktheme +%{_bindir}/kdepasswd +%{_bindir}/kdesu +%attr(0755,root,root) %{_bindir}/kdesud +%{_bindir}/kdialog +%{_bindir}/kdm +%{_bindir}/kdmctl +%{_bindir}/keditbookmarks +%{_bindir}/keditfiletype +%{_bindir}/kfind +%{_bindir}/kfmclient +%{_bindir}/khelpcenter +%{_bindir}/khotkeys +%{_bindir}/kinfocenter +%{_bindir}/klipper +%{_bindir}/kmenuedit +%{_bindir}/konqueror +%{_bindir}/konsole +%{_bindir}/krandom.kss +%{_bindir}/krandrtray +%{_bindir}/krdb +%{_bindir}/kreadconfig +%{_bindir}/ksmserver +%{_bindir}/ksplashsimple +%{_bindir}/kstart +%{_bindir}/ksysguard +%{_bindir}/ksysguardd +%{_bindir}/ksystraycmd +%{_bindir}/ktrash +%{_bindir}/kwin +%{_bindir}/kwin_killer_helper +%{_bindir}/kwin_rules_dialog +%{_bindir}/kwrite +%{_bindir}/kwriteconfig +%{_bindir}/kxkb +%{_bindir}/nspluginscan +%{_bindir}/nspluginviewer +%{_bindir}/startkde +%{_bindir}/kcheckrunning +%{_bindir}/kdesktop +%{_bindir}/kdesktop_lock +%{_bindir}/kdm_config +%{_bindir}/kdm_greet +%{_bindir}/kfontinst +%{_bindir}/kfontview +%{_bindir}/krootimage +%{_bindir}/kwebdesktop +%{_datadir}/autostart/* +%{_datadir}/desktop-directories/* +%{_datadir}/locale/*/entry.desktop +%{_datadir}/locale/l10n +%{_datadir}/templates/* +%{_datadir}/templates/.source/* +%{_datadir}/wallpapers/* +%{_bindir}/appletproxy +%{_bindir}/drkonqi +%{_bindir}/extensionproxy +%{_bindir}/kasbar +%attr(4755,root,root) %{_bindir}/kcheckpass +%{_bindir}/kdeeject +%{_bindir}/khc_docbookdig.pl +%{_bindir}/khc_htdig.pl +%{_bindir}/khc_htsearch.pl +%{_bindir}/khc_indexbuilder +%{_bindir}/khc_mansearch.pl +%{_bindir}/kicker +%{_bindir}/knetattach +%{_bindir}/kompmgr +%{_bindir}/kpm +%{_bindir}/ksplash +%{_libdir}/kconf_update_bin +%{_datadir}/applnk/*.desktop +%{_datadir}/applnk/*/* +%{_datadir}/applnk/.hidden/* +%exclude %{_datadir}/applnk/.hidden/.directory +%{_datadir}/config.kcfg/* +%{_bindir}/kde3 +%{_bindir}/kio_media_mounthelper +%{_bindir}/kdcop +%{_bindir}/kdeprintfax +%{_bindir}/khc_beagle_index.pl +%{_bindir}/khc_beagle_search.pl +%{_bindir}/kxdglauncher +%{_bindir}/kjobviewer +%{_bindir}/klocaldomainurifilterhelper +%{_bindir}/kprinter +%{_datadir}/applications/*/* +%exclude %{_datadir}/applications/kde/display.desktop +%{_datadir}/apps/* +%exclude %{_datadir}/fonts/override/fonts.dir +%{_datadir}/icons/*color/*/*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/mimelnk/*/* +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/sounds/* +%{_docdir}/kdm/README +%{_libdir}/kde3/* +%{_libdir}/libkdeinit_*.* +%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu +%{_sysconfdir}/xdg/menus/kde-information.menu +%{_sysconfdir}/xdg/menus/kde-screensavers.menu +%{_sysconfdir}/xdg/menus/kde-settings.menu +/usr/share/xsessions/*.desktop +# Remove conflicts with redhat-menus +%if "%{?_prefix}" != "/usr" +%{_bindir}/plasma-desktop +%config(noreplace) %{_datadir}/config/* +%else +%exclude %{_datadir}/config +%endif +# exclude pim-ioslaves files from main package +%exclude %{_libdir}/kde3/kio_ldap.* +%exclude %{_libdir}/kde3/kio_nntp.* +%exclude %{_libdir}/kde3/kio_pop3.* +%exclude %{_libdir}/kde3/kio_smtp.* +%exclude %{_datadir}/services/ldap*.protocol +%exclude %{_datadir}/services/nntp*.protocol +%exclude %{_datadir}/services/pop3*.protocol +%exclude %{_datadir}/services/smtp*.protocol + +%files libs +%defattr(-,root,root,-) +%exclude %{_libdir}/libkdeinit_*.* +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la + +%files pim-ioslaves +%defattr(-,root,root,-) +%{_libdir}/kde3/kio_ldap.* +%{_libdir}/kde3/kio_nntp.* +%{_libdir}/kde3/kio_pop3.* +%{_libdir}/kde3/kio_smtp.* +%{_datadir}/services/ldap*.protocol +%{_datadir}/services/nntp*.protocol +%{_datadir}/services/pop3*.protocol +%{_datadir}/services/smtp*.protocol + +%files devel +%defattr(-,root,root,-) +%{_includedir}/*.h +%dir %{_includedir}/kate +%{_includedir}/kate/* +%dir %{_includedir}/kwin +%{_includedir}/kwin/* +%dir %{_includedir}/ksgrd +%{_includedir}/ksgrd/* +%dir %{_includedir}/ksplash +%{_includedir}/ksplash/* +%{_libdir}/lib*.so +%exclude %{_libdir}/libkdeinit_*.* + +%changelog +* Sun Sep 04 2011 Francois Andriot - 3.5.12-9 +- Import to GIT + +* Tue Aug 23 2011 Francois Andriot - 3.5.12-8 +- Add missing BuildRequires +- Add Patch7, Patch8, Patch9 to allow compilation under GCC >= 4.5.2 + +* Mon Aug 22 2011 Francois Andriot - 3.5.12-7 +- Correct macro to install under "/opt", if desired + +* Wed Jul 20 2011 Francois Andriot - 3.5.12-6 +- Add patch to force halbackend to use HAL-provided mount options + +* Wed Jul 20 2011 Francois Andriot - 3.5.12-5 +- Add patch to modify "Open terminal here" shortcut (now opens in home directory) + +* Tue Jul 19 2011 Francois Andriot - 3.5.12-4 +- Add 'BuildRequires: dbus-qt' to enable HAL support + +* Wed Jun 22 2011 Francois Andriot - 3.5.12-3 +- Adds setuid bit on '/usr/bin/kcheckpass' +- Removes '/usr/share/applications/kde/display.desktop' (does not work on RHEL 6.0) + +* Mon Dec 20 2010 Francois Andriot - 3.5.12-2 +- Add missing Requires +- Rename 'kde3.desktop' to 'kde.desktop' in case of default prefix + +* Fri Dec 17 2010 Francois Andriot - 3.5.12-1 +- Add macro _kde3_prefix to define custom installation prefix (ex: /opt/kde3) +- Add '--with-extra-includes=%{_includedir}/tqt' +- Add 'patch3' to remove ignore button on kdesu dialog box +- Add 'patch4' r1182808.diff : Fix My Documents shortcut on desktop + +* Wed Dec 14 2010 Francois Andriot - 3.5.12-0 +- Initial version +- Add script 'plasma-desktop' to prevent KDE4 plasma automatic startup +- Add 'patch0' to fix for DBUS include files in RHEL6 +- Add 'patch1' r1201523.diff : [kdebase/kcontrol] fix for openssl 1.0 +- Add 'patch2' r1201705.diff : [kdebase/kcontrol] make it compatible with openssl < 1.0 + diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec new file mode 100755 index 000000000..a6c18371d --- /dev/null +++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec @@ -0,0 +1,450 @@ +# Default version for this component +%if "%{?version}" == "" +%define version 3.5.13 +%endif + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _libdir %{_prefix}/lib +%define _docdir %{_prefix}/share/doc +%endif + + +Name: trinity-kdebase +Version: %{version} +Release: 0%{?dist}%{?_variant} +License: GPL +Vendor: Trinity Project +Packager: Francois Andriot +Summary: Trinity KDE Base Programs + +Prefix: %{_prefix} + +Source0: kdebase-%{version}.tar.gz + +# TDE for RHEL/Fedora specific patches +# [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box +Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch +# [kdebase/kdesktop] Modifies "open terminal here" on desktop +Patch5: kdebase-3.5.12-desktop-openterminalhere.patch +# [kdebase/kioslave]: Forces HAL backend to use HAL mount options +Patch6: kdebase-3.5.12-halmountoptions.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-arts-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: qt3-devel >= 3.3.8d +BuildRequires: openssl-devel +BuildRequires: avahi-devel avahi-qt3-devel +BuildRequires: imake +BuildRequires: xorg-x11-proto-devel +BuildRequires: OpenEXR-devel +BuildRequires: libsmbclient-devel +BuildRequires: dbus-devel dbus-qt-devel +BuildRequires: lm_sensors-devel +BuildRequires: libfontenc-devel +BuildRequires: hal-devel +BuildRequires: audiofile-devel +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: libraw1394-devel +BuildRequires: openldap-devel +BuildRequires: libvorbis-devel +BuildRequires: pam-devel +BuildRequires: libXdmcp-devel +BuildRequires: libxkbfile-devel +BuildRequires: dbus-tqt-devel + +Requires: tqtinterface +Requires: trinity-arts +Requires: trinity-kdelibs +Requires: qt3 >= 3.3.8d +Requires: openssl +Requires: avahi avahi-qt3 +Requires: dbus-tqt + + +# RHEL 6 Configuration files are provided in separate packages +%if "%{?_prefix}" == "/usr" +Requires: kde-settings-kdm +%endif +Requires: redhat-menus + +%description +Core applications for the Trinity K Desktop Environment. Included are: kdm +(replacement for xdm), kwin (window manager), konqueror (filemanager, +web browser, ftp client, ...), konsole (xterm replacement), kpanel +(application starter and desktop pager), kaudio (audio server), +kdehelp (viewer for kde help files, info and man pages), kthememgr +(system for managing alternate theme packages) plus other KDE +components (kcheckpass, kikbd, kscreensaver, kcontrol, kfind, +kfontmanager, kmenuedit). + + +%package devel +Requires: %{name} +Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release} +Requires: trinity-kdelibs-devel +Summary: %{summary} - Development files +%if "%{?_prefix}" == "/usr" +Obsoletes: kdebase3-devel +%endif +Group: Development/Libraries +%description devel +Header files for developing applications using %{name}. +Install kdebase-devel if you want to develop or compile Konqueror, +Kate plugins or KWin styles. + + +%package extras +Summary: Extra applications from %{name} +Group: User Interface/Desktops +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +%description extras +%{summary}, including: + * kappfinder + * kpager + * ktip + * kpersonalizer + + +%package libs +Summary: %{name} runtime libraries +Group: System Environment/Libraries +Requires: trinity-kdelibs >= %{version} +%if "%{?_prefix}" == "/usr" +Obsoletes: kdebase3-libs +%endif +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} +%description libs +%{summary} + + +%package pim-ioslaves +Summary: PIM KIOslaves from %{name} +Group: System Environment/Libraries +%description pim-ioslaves +Protocol handlers (KIOslaves) for personal information management, including: + * kio_ldap + * kio_nntp + * kio_pop3 + * kio_smtp + + +%prep +%setup -q -n kdebase +%patch3 -p1 +%patch5 -p1 +%patch6 -p1 + + +%build +unset QTDIR || : ; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export PKG_CONFIG_PATH="%{_libdir}/pkgconfig" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" +export LD_LIBRARY_PATH="%{_libdir}" + +%__mkdir build +cd build +%cmake \ + -DWITH_SASL=ON \ + -DWITH_LDAP=ON \ + -DWITH_SAMBA=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_XCOMPOSITE=ON \ + -DWITH_XCURSOR=ON \ + -DWITH_XFIXES=ON \ + -DWITH_XRANDR=ON \ + -DWITH_XRENDER=ON \ + -DWITH_XDAMAGE=ON \ + -DWITH_XEXT=ON \ + -DWITH_LIBUSB=ON \ + -DWITH_LIBRAW1394=ON \ + -DWITH_PAM=ON \ + -DWITH_SHADOW=OFF \ + -DWITH_XDMCP=ON \ + -DWITH_XINERAMA=ON \ + -DWITH_ARTS=ON \ + -DWITH_I8K=OFF \ + -DWITH_HAL=ON \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + +%install +%__rm -rf %{?buildroot} +%__mkdir_p %{?buildroot} +%make_install -C build + +# Adds a GDM/KDM/XDM session called 'TDE' +%if "%{?_prefix}" != "/usr" +%__mkdir_p "%{?buildroot}%{_usr}/share/xsessions" +install -m 644 "%{?buildroot}%{_datadir}/apps/kdm/sessions/tde.desktop" "%{?buildroot}%{_usr}/share/xsessions/tde.desktop" +%endif + +# Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE +sed -i "%{?buildroot}%{_bindir}/startkde" \ + -e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,' + +# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard' +mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde + +%clean +%__rm -rf %{?buildroot} + + +%post +touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : +update-desktop-database 2> /dev/null || : +# Dirty hack to install '/etc/ksysguardrc' alongside with KDE4 +[ -r %{_sysconfdir}/ksysguarddrc ] || cp -f %{_sysconfdir}/ksysguarddrc.tde %{_sysconfdir}/ksysguarddrc + +%postun +touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : +gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || : +update-desktop-database 2> /dev/null || : + + +%post libs -p /sbin/ldconfig + +%postun libs -p /sbin/ldconfig + +%post extras +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + +%postun extras +for f in crystalsvg hicolor ; do + touch --no-create %{_datadir}/icons/${f} 2> /dev/null ||: + gtk-update-icon-cache -q %{_datadir}/icons/${f} 2> /dev/null ||: +done +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : + + +%files extras +%defattr(-,root,root,-) +# kappfinder +%{_bindir}/kappfinder +%{_datadir}/applications/kde/kappfinder.desktop +%{_datadir}/applnk/System/kappfinder.desktop +%{_datadir}/apps/kappfinder/ +%{_datadir}/icons/hicolor/*/apps/kappfinder.png +# ktip +%{_bindir}/ktip +%{_datadir}/applications/kde/ktip.desktop +%{_datadir}/applnk/Toys/ktip.desktop +%{_datadir}/apps/kdewizard +%{_datadir}/autostart/ktip.desktop +%{_datadir}/icons/hicolor/*/apps/ktip* +# kpersonalizer +%{_bindir}/kpersonalizer +%{_datadir}/applications/kde/kpersonalizer.desktop +%{_datadir}/applnk/System/kpersonalizer.desktop +%{_datadir}/apps/kpersonalizer/ +%{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png +# kpager +%{_bindir}/kpager +%{_datadir}/applications/kde/kpager.desktop +%{_datadir}/applnk/Utilities/kpager.desktop +%{_datadir}/icons/hicolor/*/apps/kpager.png + + +%files +%defattr(-,root,root,-) +# kappfinder +%exclude %{_datadir}/applications/kde/kappfinder.desktop +%exclude %{_datadir}/applnk/System/kappfinder.desktop +%exclude %{_datadir}/apps/kappfinder/ +%exclude %{_datadir}/icons/hicolor/*/apps/kappfinder.png +# ktip +%exclude %{_datadir}/applications/kde/ktip.desktop +%exclude %{_datadir}/applnk/Toys/ktip.desktop +%exclude %{_datadir}/apps/kdewizard +%exclude %{_datadir}/autostart/ktip.desktop +%exclude %{_datadir}/icons/hicolor/*/apps/ktip* +# kpersonalizer +%exclude %{_datadir}/applications/kde/kpersonalizer.desktop +%exclude %{_datadir}/applnk/System/kpersonalizer.desktop +%exclude %{_datadir}/apps/kpersonalizer/ +%exclude %{_datadir}/icons/crystalsvg/*/apps/kpersonalizer.png +# kpager +%exclude %{_datadir}/applications/kde/kpager.desktop +%exclude %{_datadir}/applnk/Utilities/kpager.desktop +%exclude %{_datadir}/icons/hicolor/*/apps/kpager.png + +%doc AUTHORS COPYING README +%{_docdir}/kde/HTML/en/* +%config(noreplace) %{_sysconfdir}/ksysguarddrc.tde +%{_bindir}/genkdmconf +%{_bindir}/kaccess +%{_bindir}/kapplymousetheme +%{_bindir}/kate +%{_bindir}/kblankscrn.kss +%{_bindir}/kbookmarkmerger +%{_bindir}/kcminit +%{_bindir}/kcminit_startup +%{_bindir}/kcontrol +%{_bindir}/kcontroledit +%{_bindir}/kdebugdialog +%{_bindir}/kdeinstallktheme +%{_bindir}/kdepasswd +%{_bindir}/kdesu +%attr(0755,root,root) %{_bindir}/kdesud +%{_bindir}/kdialog +%{_bindir}/kdm +%{_bindir}/kdmctl +%{_bindir}/keditbookmarks +%{_bindir}/keditfiletype +%{_bindir}/kfind +%{_bindir}/kfmclient +%{_bindir}/khelpcenter +%{_bindir}/khotkeys +%{_bindir}/kinfocenter +%{_bindir}/klipper +%{_bindir}/kmenuedit +%{_bindir}/konqueror +%{_bindir}/konsole +%{_bindir}/krandom.kss +%{_bindir}/krandrtray +%{_bindir}/krdb +%{_bindir}/kreadconfig +%{_bindir}/ksmserver +%{_bindir}/ksplashsimple +%{_bindir}/kstart +%{_bindir}/ksysguard +%{_bindir}/ksysguardd +%{_bindir}/ksystraycmd +%{_bindir}/ktrash +%{_bindir}/kwin +%{_bindir}/kwin_killer_helper +%{_bindir}/kwin_rules_dialog +%{_bindir}/kwrite +%{_bindir}/kwriteconfig +%{_bindir}/kxkb +%{_bindir}/nspluginscan +%{_bindir}/nspluginviewer +%{_bindir}/startkde +%{_bindir}/kcheckrunning +%{_bindir}/kdesktop +%{_bindir}/kdesktop_lock +%{_bindir}/kdm_config +%{_bindir}/kdm_greet +%{_bindir}/kfontinst +%{_bindir}/kfontview +%{_bindir}/krootimage +%{_bindir}/kwebdesktop +%{_datadir}/autostart/* +%{_datadir}/desktop-directories/* +%{_datadir}/locale/*/entry.desktop +%{_datadir}/locale/l10n +%{_datadir}/templates/* +%{_datadir}/templates/.source/* +%{_datadir}/wallpapers/* +%{_bindir}/appletproxy +%{_bindir}/drkonqi +%{_bindir}/extensionproxy +%{_bindir}/kasbar +%attr(4755,root,root) %{_bindir}/kcheckpass +%{_bindir}/kdeeject +%{_bindir}/khc_docbookdig.pl +%{_bindir}/khc_htdig.pl +%{_bindir}/khc_htsearch.pl +%{_bindir}/khc_indexbuilder +%{_bindir}/khc_mansearch.pl +%{_bindir}/kicker +%{_bindir}/knetattach +%{_bindir}/kompmgr +%{_bindir}/kpm +%{_bindir}/ksplash +%{_libdir}/kconf_update_bin +%{_datadir}/applnk/*.desktop +%{_datadir}/applnk/*/* +%{_datadir}/applnk/.hidden/* +%exclude %{_datadir}/applnk/.hidden/.directory +%{_datadir}/config.kcfg/* +%{_bindir}/kio_media_mounthelper +%{_bindir}/kdcop +%{_bindir}/kdeprintfax +%{_bindir}/khc_beagle_index.pl +%{_bindir}/khc_beagle_search.pl +%{_bindir}/kxdglauncher +%{_bindir}/kjobviewer +%{_bindir}/klocaldomainurifilterhelper +%{_bindir}/kprinter +%{_datadir}/applications/*/* +%{_datadir}/apps/* +%{_datadir}/icons/*color/*/*/* +%{_datadir}/icons/crystalsvg/*/*/* +%{_datadir}/mimelnk/*/* +%{_datadir}/services/* +%{_datadir}/servicetypes/* +%{_datadir}/sounds/* +%{_libdir}/trinity/* +%{_libdir}/libkdeinit_*.* +%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu +%{_sysconfdir}/xdg/menus/kde-information.menu +%{_sysconfdir}/xdg/menus/kde-screensavers.menu +%{_sysconfdir}/xdg/menus/kde-settings.menu +/usr/share/xsessions/*.desktop +# Remove conflicts with redhat-menus +%if "%{?_prefix}" != "/usr" +%config(noreplace) %{_datadir}/config/* +%else +%exclude %{_datadir}/config +%endif +# exclude pim-ioslaves files from main package +%exclude %{_libdir}/trinity/kio_ldap.* +%exclude %{_libdir}/trinity/kio_nntp.* +%exclude %{_libdir}/trinity/kio_pop3.* +%exclude %{_libdir}/trinity/kio_smtp.* +%exclude %{_datadir}/services/ldap*.protocol +%exclude %{_datadir}/services/nntp*.protocol +%exclude %{_datadir}/services/pop3*.protocol +%exclude %{_datadir}/services/smtp*.protocol + +# New in TDE 3.5.13 +%{_bindir}/krootbacking + +%files libs +%defattr(-,root,root,-) +%exclude %{_libdir}/libkdeinit_*.* +%{_libdir}/lib*.so.* +%{_libdir}/lib*.la + +%files pim-ioslaves +%defattr(-,root,root,-) +%{_libdir}/trinity/kio_ldap.* +%{_libdir}/trinity/kio_nntp.* +%{_libdir}/trinity/kio_pop3.* +%{_libdir}/trinity/kio_smtp.* +%{_datadir}/services/ldap*.protocol +%{_datadir}/services/nntp*.protocol +%{_datadir}/services/pop3*.protocol +%{_datadir}/services/smtp*.protocol + +%files devel +%defattr(-,root,root,-) +%{_includedir}/*.h +%dir %{_includedir}/kate +%{_includedir}/kate/* +%dir %{_includedir}/kwin +%{_includedir}/kwin/* +%dir %{_includedir}/ksgrd +%{_includedir}/ksgrd/* +%dir %{_includedir}/ksplash +%{_includedir}/ksplash/* +%{_libdir}/lib*.so +%exclude %{_libdir}/libkdeinit_*.* +# New in TDE 3.5.13 +%{_datadir}/cmake/*.cmake + +%changelog +* Sat Sep 03 2011 Francois Andriot - 3.5.12.99-0 +- Import to GIT +- Use TDE 3.5.13, cmake, QT3.3.3.8d From 3c86eeb8b77e5ea83ce7938d75c17b7bde9b31d5 Mon Sep 17 00:00:00 2001 From: albator Date: Sun, 4 Sep 2011 20:52:11 +0200 Subject: [PATCH 9/9] Rollback on TDE 3.5.12: usr "lib64" for libraries instead of "lib" --- redhat/dependencies/arts/trinity-arts-3.5.12.spec | 1 - redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec | 1 - redhat/kdebase/trinity-kdebase-3.5.12.spec | 1 - redhat/kdelibs/trinity-kdelibs-3.5.12.spec | 1 - 4 files changed, 4 deletions(-) diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec index 63cd0e5ac..734ce3074 100755 --- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec +++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec @@ -1,7 +1,6 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _libdir %{_prefix}/lib %endif diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec index 1e745cee7..5fd726021 100755 --- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec +++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.12.spec @@ -1,7 +1,6 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _libdir %{_prefix}/lib %endif # TQT include files may conflict with QT4 includes, so we move them to a subdirectory. diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec index a617f2f5f..8f2012085 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.12.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec @@ -1,7 +1,6 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _libdir %{_prefix}/lib %define _docdir %{_prefix}/share/doc %endif diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec index b6d1eaa16..65c60a318 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.12.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.12.spec @@ -1,7 +1,6 @@ # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _libdir %{_prefix}/lib %define _docdir %{_prefix}/share/doc %endif