commit 006a744a60ab0e05de8a9bf89a27269b1b46e7be
Author: Jan Rękorajski <[email protected]>
Date: Tue Aug 17 10:53:50 2021 +0200
- rediff patcches
qt-FHS.patch | 38 ++++++++++++++++++++------------------
qt-make_use_of_locale.patch | 29 ++++++++++++++++-------------
qt-qmake-opt.patch | 11 ++++++-----
3 files changed, 42 insertions(+), 36 deletions(-)
---
diff --git a/qt-FHS.patch b/qt-FHS.patch
index bda059f..adaada4 100644
--- a/qt-FHS.patch
+++ b/qt-FHS.patch
@@ -1,18 +1,7 @@
-diff -ur qt-x11-free-3.0.5.orig/tools/designer/designer/newformimpl.cpp
qt-x11-free-3.0.5/tools/designer/designer/newformimpl.cpp
---- qt-x11-free-3.0.5.orig/tools/designer/designer/newformimpl.cpp Wed Jun
19 17:25:56 2002
-+++ qt-x11-free-3.0.5/tools/designer/designer/newformimpl.cpp Wed Jul 31
10:53:51 2002
-@@ -287,7 +287,7 @@
- if(qtdir) //try the tools/designer directory last!
- templRoots << QString(qtdir) + "/tools/designer";
- for ( QStringList::Iterator it = templRoots.begin(); it !=
templRoots.end(); ++it ) {
-- QString path = (*it) + "/templates";
-+ QString path = (*it) + "/share/qt/designer/templates";
- if ( QFile::exists( path )) {
- templPath = path;
- break;
---- qt-copy/doc/html/designer-manual-9.html.orig Fri Sep 6 14:29:34 2002
-+++ qt-copy/doc/html/designer-manual-9.html Sat Sep 28 16:53:26 2002
-@@ -87,7 +87,7 @@
+diff -urNp -x '*.orig' qt3.org/doc/html/designer-manual-9.html
qt3/doc/html/designer-manual-9.html
+--- qt3.org/doc/html/designer-manual-9.html 2011-10-30 19:55:56.000000000
+0100
++++ qt3/doc/html/designer-manual-9.html 2021-08-17 10:20:47.768608009
+0200
+@@ -87,7 +87,7 @@ body { background: #ffffff; color: black
<ol type=1><li><p>Click <b>File|New</b> to invoke the <em>New File</em>
dialog. Click the Dialog template then click <b>OK</b>.</p>
<li><p>Click the <b>Text Label</b> toolbar button, then click near the top
left of the form. Change the font Point Size property to 16 and change the
<em>text</em> property to your or your company's name. Click the <b>Line</b>
toolbar button, then click the form below the label; click Horizontal on the
pop-up menu.</p>
<li><p>Select the label and the line. (<b>Ctrl+Click</b> the form, then drag
the rubber band so that it touches or includes the line and the label.) Press
<b>Ctrl+L</b> to lay them out vertically.</p>
@@ -21,9 +10,10 @@ diff -ur
qt-x11-free-3.0.5.orig/tools/designer/designer/newformimpl.cpp qt-x11-f
<li><p>Right click the form in the Forms list, then click Remove form from
project.</p>
</ol><p>Now that we have the simple template we are ready to use it. Click
<b>File|New</b> to invoke the <em>New File</em> dialog. One of the templates
that will appear is 'Simple Dialog'. Click the simple dialog, then click
<b>OK</b>. A new form will appear with the same widgets and layout as the
template. Add any other widgets and functionality. When you attempt to save the
form you will be prompted for a new form name.</p>
<h4><a name="2-2"></a>Base-class Templates</h4>
---- qt-copy/tools/designer/designer/designer.pro~ 2003-06-23
18:59:53.000000000 +0200
-+++ qt-copy/tools/designer/designer/designer.pro 2003-06-23
20:23:44.000000000 +0200
-@@ -427,7 +427,7 @@
+diff -urNp -x '*.orig' qt3.org/tools/designer/designer/designer.pro
qt3/tools/designer/designer/designer.pro
+--- qt3.org/tools/designer/designer/designer.pro 2011-10-30
19:55:58.000000000 +0100
++++ qt3/tools/designer/designer/designer.pro 2021-08-17 10:20:47.768608009
+0200
+@@ -432,7 +432,7 @@ TRANSLATIONS = designer_de.ts designer_f
target.path=$$libs.path
INSTALLS += target
@@ -32,3 +22,15 @@ diff -ur
qt-x11-free-3.0.5.orig/tools/designer/designer/newformimpl.cpp qt-x11-f
templates.files = ../templates/*
INSTALLS += templates
+diff -urNp -x '*.orig' qt3.org/tools/designer/designer/newformimpl.cpp
qt3/tools/designer/designer/newformimpl.cpp
+--- qt3.org/tools/designer/designer/newformimpl.cpp 2011-10-30
19:55:58.000000000 +0100
++++ qt3/tools/designer/designer/newformimpl.cpp 2021-08-17
10:20:47.768608009 +0200
+@@ -293,7 +293,7 @@ void NewForm::insertTemplates( QIconView
+ if(qtdir) //try the tools/designer directory last!
+ templRoots << (QString(qtdir) + "/tools/designer");
+ for ( QStringList::Iterator it = templRoots.begin(); it !=
templRoots.end(); ++it ) {
+- QString path = (*it) + "/templates";
++ QString path = (*it) + "/share/qt/designer/templates";
+ if ( QFile::exists( path )) {
+ templPath = path;
+ break;
diff --git a/qt-make_use_of_locale.patch b/qt-make_use_of_locale.patch
index 2afe395..d6ef8ea 100644
--- a/qt-make_use_of_locale.patch
+++ b/qt-make_use_of_locale.patch
@@ -1,7 +1,8 @@
---- qt-x11-free-3.2.0/tools/assistant/main.cpp.orig 2003-08-09
13:32:43.000000000 +0200
-+++ qt-x11-free-3.2.0/tools/assistant/main.cpp 2003-08-09 13:56:54.000000000
+0200
-@@ -249,11 +249,11 @@
- fprintf( stderr, "Resource file directory '%s' does not exist!\n",
resourceDir.latin1() );
+diff -urNp -x '*.orig' qt3.org/tools/assistant/main.cpp
qt3/tools/assistant/main.cpp
+--- qt3.org/tools/assistant/main.cpp 2011-10-30 19:55:58.000000000 +0100
++++ qt3/tools/assistant/main.cpp 2021-08-17 10:20:51.821943941 +0200
+@@ -289,11 +289,11 @@ int main( int argc, char ** argv )
+ resourceDir = qInstallPathTranslations();
QTranslator translator( 0 );
- translator.load( QString("assistant_") + QTextCodec::locale(),
resourceDir );
@@ -13,10 +14,11 @@
+ qtTranslator.load( QString("qt"), resourceDir + QString("/") +
QString::fromLatin1(QTextCodec::locale()) + QString("/LC_MESSAGES") );
a.installTranslator( &qtTranslator );
- Config *conf = Config::loadConfig( profileName );
---- qt-x11-free-3.2.0/tools/designer/app/main.cpp.orig 2003-08-12
20:00:11.821715736 +0200
-+++ qt-x11-free-3.2.0/tools/designer/app/main.cpp 2003-08-12
19:59:12.017807312 +0200
-@@ -41,6 +41,7 @@
+
+diff -urNp -x '*.orig' qt3.org/tools/designer/app/main.cpp
qt3/tools/designer/app/main.cpp
+--- qt3.org/tools/designer/app/main.cpp 2011-10-30 19:55:58.000000000
+0100
++++ qt3/tools/designer/app/main.cpp 2021-08-17 10:20:51.821943941 +0200
+@@ -48,6 +48,7 @@
#include <qsettings.h>
#include <qsplashscreen.h>
#include <qdir.h>
@@ -24,7 +26,7 @@
#include <stdlib.h>
#include <signal.h>
-@@ -179,6 +180,14 @@
+@@ -186,6 +187,14 @@ int main( int argc, char *argv[] )
signal( SIGTERM, exitHandler );
}
@@ -39,9 +41,10 @@
extern void qInitImages_designercore();
qInitImages_designercore();
---- qt-x11-free-3.2.0/tools/linguist/linguist/main.cpp.orig 2003-05-13
09:08:55.000000000 +0200
-+++ qt-x11-free-3.2.0/tools/linguist/linguist/main.cpp 2003-08-12
20:10:04.402629744 +0200
-@@ -34,6 +34,7 @@
+diff -urNp -x '*.orig' qt3.org/tools/linguist/linguist/main.cpp
qt3/tools/linguist/linguist/main.cpp
+--- qt3.org/tools/linguist/linguist/main.cpp 2011-10-30 19:55:58.000000000
+0100
++++ qt3/tools/linguist/linguist/main.cpp 2021-08-17 10:20:51.821943941
+0200
+@@ -41,6 +41,7 @@
#include <qtranslator.h>
#include <qsettings.h>
#include <qsplashscreen.h>
@@ -49,7 +52,7 @@
int main( int argc, char **argv )
{
-@@ -41,10 +42,16 @@
+@@ -48,10 +49,16 @@ int main( int argc, char **argv )
QApplication::setOverrideCursor( Qt::waitCursor );
diff --git a/qt-qmake-opt.patch b/qt-qmake-opt.patch
index 320c1c4..83f6d07 100644
--- a/qt-qmake-opt.patch
+++ b/qt-qmake-opt.patch
@@ -1,8 +1,9 @@
---- qt-x11-free-3.1.1/configure.orig Fri Nov 29 15:26:24 2002
-+++ qt-x11-free-3.1.1/configure Fri Feb 14 09:59:20 2003
-@@ -2185,6 +2185,9 @@
- grep "QMAKE_CFLAGS_DEBUG[^_A-Z0-9]" $QMAKESPEC/qmake.conf
>>$mkfile
- EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_DEBUG)"
+diff -urNp -x '*.orig' qt3.org/configure qt3/configure
+--- qt3.org/configure 2011-10-30 19:55:56.000000000 +0100
++++ qt3/configure 2021-08-17 10:20:52.835277924 +0200
+@@ -2665,6 +2665,9 @@ if true; then ###[ '!' -f "$outpath/bin/
+ EXTRA_CFLAGS="$EXTRA_CFLAGS \$(QMAKE_CFLAGS_RELEASE)"
+ EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS \$(QMAKE_CXXFLAGS_RELEASE)"
fi
+ if [ -n "$OPTFLAGS" ]; then
+ EXTRA_CFLAGS="$EXTRA_CFLAGS $OPTFLAGS"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt.git/commitdiff/fbdff27a78ea1e78df68c2dac477e07dc2c8d0f2
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
