diff options
29 files changed, 0 insertions, 682 deletions
diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch deleted file mode 100644 index f6a362d40..000000000 --- a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-avcodec.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- trinity-k9copy-3.5.13.2/k9author/k9avidecode.h.ORI 2013-07-29 21:52:57.859615464 +0200 -+++ trinity-k9copy-3.5.13.2/k9author/k9avidecode.h 2013-07-29 21:57:19.206481299 +0200 -@@ -43,7 +43,11 @@ - #else - typedef int (*av_find_stream_info_t)(AVFormatContext *); - #endif -+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 26, 0) -+typedef AVCodec* (*avcodec_find_decoder_t)(enum AVCodecID); -+#else - typedef AVCodec* (*avcodec_find_decoder_t)(enum CodecID); -+#endif - #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(53, 8, 0) - typedef int (*avcodec_open2_t)(AVCodecContext *, AVCodec *, AVDictionary **); - #else diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch deleted file mode 100644 index f7858c0a0..000000000 --- a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-fix_k3b_link.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-k9copy-3.5.13.2/src/Makefile.am.ORI 2013-06-17 20:59:49.620929488 +0200 -+++ trinity-k9copy-3.5.13.2/src/Makefile.am 2013-06-17 21:00:11.150425671 +0200 -@@ -35,7 +35,7 @@ - $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ - $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ - $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ -- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -+ $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice - - # this is where the desktop file will go - shelldesktopdir = $(kde_appsdir)/Utilities diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch deleted file mode 100644 index 4dfb39787..000000000 --- a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-ftbfs.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h.ORI 2013-07-28 19:42:30.331485057 +0200 -+++ trinity-k9copy-3.5.13.2/k9decmpeg/mpeg2_internal.h 2013-07-28 19:43:09.713519110 +0200 -@@ -21,6 +21,9 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#ifndef __MPEG2_INTERNAL_H__ -+#define __MPEG2_INTERNAL_H__ -+ - /* macroblock modes */ - #define MACROBLOCK_INTRA 1 - #define MACROBLOCK_PATTERN 2 -@@ -298,3 +301,5 @@ - extern mpeg2_mc_t mpeg2_mc_altivec; - extern mpeg2_mc_t mpeg2_mc_alpha; - extern mpeg2_mc_t mpeg2_mc_vis; -+ -+#endif // __MPEG2_INTERNAL_H__ diff --git a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-use_external_dvdread.patch b/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-use_external_dvdread.patch deleted file mode 100644 index 0cf01006e..000000000 --- a/redhat/applications/k9copy/patches/3.5.13.2/k9copy-3.5.13.2-use_external_dvdread.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- ./k9author/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 -+++ ./k9author/Makefile.am 2013-07-28 20:05:20.857621477 +0200 -@@ -14,5 +14,5 @@ - k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \ - k9menueditor.h k9newdvd.h k9newtitle.h k9title.h - libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_KDEUI) --INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \ -+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \ - -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes) ---- ./k9decmpeg/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 -+++ ./k9decmpeg/Makefile.am 2013-07-28 20:05:20.857621477 +0200 -@@ -12,7 +12,7 @@ - motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \ - mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \ - uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp --INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \ -+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \ - -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy - - noinst_HEADERS = k9decodethread.h k9plaympeg2.h ---- ./k9devices/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 -+++ ./k9devices/Makefile.am 2013-07-28 20:05:20.857621477 +0200 -@@ -1,4 +1,4 @@ --INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \ -+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \ - $(HAL_INCS) $(K3B_INCS) $(all_includes) - METASOURCES = AUTO - libk9devices_la_LDFLAGS = $(all_libraries) ---- ./k9Mplayer/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 -+++ ./k9Mplayer/Makefile.am 2013-07-28 20:05:20.857621477 +0200 -@@ -1,4 +1,4 @@ --INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes) -+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes) - METASOURCES = AUTO - - noinst_LTLIBRARIES = libk9mplayer.la ---- ./k9vamps/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 -+++ ./k9vamps/Makefile.am 2013-07-28 20:05:20.858621351 +0200 -@@ -7,6 +7,6 @@ - noinst_LTLIBRARIES = libk9vamps.la - libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \ - k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp --INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \ -+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \ - -I$(top_srcdir)/libk9copy - noinst_HEADERS = k9requant.h ac.h k9fifo.h ---- ./libdvdnav/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 -+++ ./libdvdnav/Makefile.am 2013-07-28 20:05:20.858621351 +0200 -@@ -11,4 +11,4 @@ - - - --INCLUDES = -I$(top_srcdir)/dvdread -+INCLUDES = -I/usr/include/dvdread ---- ./libk9copy/Makefile.am.dvdread 2013-06-06 19:29:20.000000000 +0200 -+++ ./libk9copy/Makefile.am 2013-07-28 20:05:20.858621351 +0200 -@@ -24,6 +24,6 @@ - k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h - - --INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \ -+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \ - -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav - libk9copy_la_LDFLAGS = $(all_libraries) ---- ./src/Makefile.am.dvdread 2013-07-28 20:05:20.855621729 +0200 -+++ ./src/Makefile.am 2013-07-28 20:09:10.620642017 +0200 -@@ -1,5 +1,5 @@ - # set the include path for X, qt and KDE --INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \ -+INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \ - -I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \ - -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy $(all_includes) - -@@ -35,7 +35,7 @@ - $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ - $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ - $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ -- $(top_builddir)/dvdread/libdvdread.la $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice -+ -ldvdread $(LIB_KDEUI) -lkmdi $(LIBDL) -lk3b -lk3bdevice - - # this is where the desktop file will go - shelldesktopdir = $(kde_appsdir)/Utilities ---- ./Makefile.am.ORI 2013-07-28 20:15:29.961786846 +0200 -+++ ./Makefile.am 2013-07-28 20:15:43.375094511 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \ -+SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \ - po src - - $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs -@@ -29,11 +29,3 @@ - - AM_CXXFLAGS = -O0 -g3 - -- -- -- -- -- -- -- --INCLUDES = -I$(top_srcdir)/dvdread diff --git a/redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff b/redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff deleted file mode 100644 index 9f6f46ba8..000000000 --- a/redhat/applications/kmymoney/patches/3.5.13.2/admin-fix-parallel-test.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh.automake113 2013-06-26 22:35:42.000000000 +0200 -+++ trinity-tdebindings-14.0.0~pre214+2cf2b76c/admin/cvs.sh 2013-08-29 22:27:18.546349736 +0200 -@@ -123,7 +123,7 @@ - fi - - echo "*** Creating Makefile templates" --$AUTOMAKE || exit 1 -+$AUTOMAKE --add-missing || exit 1 - - if test "$UNSERMAKE" = no; then - echo "*** Postprocessing Makefile templates" diff --git a/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch deleted file mode 100644 index 8a6754fb5..000000000 --- a/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-fix_qt3_plugins_location.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- kmymoney/kmymoney2/widgets/Makefile.am.ORI 2012-08-05 18:38:59.001977368 +0200 -+++ kmymoney/kmymoney2/widgets/Makefile.am 2012-08-05 18:39:47.007986865 +0200 -@@ -68,19 +68,19 @@ - # Hence the quick hack to include the required objects from the - # libkmm_mymoney.so directly into libkmymoney.so - libkmymoney_la_CXXFLAGS = -U_CHECK_MEMORY -DKMM_DESIGNER --libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)$(qt_libraries)/../plugins/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -+libkmymoney_la_LDFLAGS = `ls ../mymoney/*.lo` $(KDE_LDFLAGS) $(QT_LDFLAGS) $(X_LDFLAGS) -rpath $(DESTDIR)${QTPLUGINS}/designer $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) - - if INSTALL_QTDESIGNER_SUPPORT - install-exec-local: libkmymoney.la -- $(mkinstalldirs) $(DESTDIR)$(qt_libraries)/../plugins/designer -- $(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)$(qt_libraries)/../plugins/designer -+ $(mkinstalldirs) $(DESTDIR)${QTPLUGINS}/designer -+ $(INSTALL_PROGRAM) .libs/libkmymoney.so $(DESTDIR)${QTPLUGINS}/designer - $(mkinstalldirs) $(DESTDIR)$(kde_datadir)/$(PICS_DIR) - for file in $(WIDGET_PNGS); do \ - $(INSTALL_DATA) $(abs_srcdir)/$$file $(DESTDIR)$(kde_datadir)/$(PICS_DIR); \ - done - - uninstall-local: -- -rm $(DESTDIR)$(qt_libraries)/../plugins/designer/libkmymoney.so -+ -rm $(DESTDIR)${QTPLUGINS}/designer/libkmymoney.so - for file in $(WIDGET_PNGS); do \ - rm -rf $(DESTDIR)$(kde_datadir)/$(PICS_DIR)/$$file; \ - done ---- kmymoney/admin/acinclude.m4.ORI 2012-08-05 19:47:47.819789267 +0200 -+++ kmymoney/admin/acinclude.m4.in 2012-08-05 19:48:35.842776216 +0200 -@@ -6724,7 +6724,11 @@ - QTDIR=`dirname $MOC` - QTDIR=${QTDIR%/bin} - fi -- LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so -+ if test x$QTPLUGINS = x; then -+ LIBSQLITE3=${QTDIR}/plugins/sqldrivers/libsqlite3${qtlib}.so -+ else -+ LIBSQLITE3=${QTPLUGINS}/sqldrivers/libsqlite3${qtlib}.so -+ fi - - # do the checks - if test $enable_sqlite3 = auto; then diff --git a/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch deleted file mode 100644 index c80007000..000000000 --- a/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13-missing_ldflags.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- kmymoney/qt-sqlite3-0.2/sqlite3/sqlite3.pro.ORI 2012-08-05 18:51:56.961702141 +0200 -+++ kmymoney/qt-sqlite3-0.2/sqlite3/sqlite3.pro 2012-08-05 19:05:43.064116419 +0200 -@@ -4,13 +4,13 @@ - # Target is una libreria: qsqlite3 - - INSTALLS += target --target.path = $QTDIR/plugins/sqldrivers -+target.path = $(qt_plugins)/sqldrivers - HEADERS += qsql_sqlite3.h \ - qsqlcachedresult.h - SOURCES += smain.cpp \ - qsql_sqlite3.cpp \ - qsqlcachedresult.cpp --LIBS += -lsqlite3 -+LIBS += -lsqlite3 -L$(QTLIB) - TARGET = qsqlite3 - DESTDIR = ../sqldrivers - CONFIG += release \ diff --git a/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch b/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch deleted file mode 100644 index 87e022f0f..000000000 --- a/redhat/applications/kmymoney/patches/3.5.13.2/kmymoney-3.5.13.2-ftbfs.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- ./kmymoney2/widgets/Makefile.am.ftbfs 2013-06-06 19:37:02.000000000 +0200 -+++ ./kmymoney2/widgets/Makefile.am 2013-07-28 18:58:51.406093917 +0200 -@@ -7,14 +7,14 @@ - libwidgets_a_METASOURCES = AUTO - - libwidgets_a_SOURCES = kbudgetvalues.cpp kbudgetvaluesdecl.ui kguiutils.cpp klistviewsearchline.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneyaccountselector.cpp kmymoneyaccounttreebase.cpp kmymoneyaccounttree.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp kmymoneybriefschedule.cpp kmymoneycalculator.cpp kmymoneycalendar.cpp kmymoneycategory.cpp kmymoneychecklistitem.cpp kmymoneycombo.cpp kmymoneycompletion.cpp kmymoneycurrencyselector.cpp kmymoneydateinput.cpp kmymoneydatetbl.cpp kmymoneyedit.cpp kmymoneyforecastlistviewitem.cpp kmymoneygpgconfig.cpp kmymoneygpgconfigdecl.ui kmymoneylineedit.cpp kmymoneylistviewitem.cpp kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneypriceview.cpp kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyreportcontroldecl.ui kmymoneyscheduledcalendar.cpp kmymoneyscheduleddatetbl.cpp kmymoneyselector.cpp kmymoneytitlelabel.cpp kmymoneywizard.cpp kschedulebriefwidget.ui register.cpp registeritem.cpp registersearchline.cpp transaction.cpp scheduledtransaction.cpp stdtransactiondownloaded.cpp stdtransactionmatched.cpp transactioneditorcontainer.cpp transactionform.cpp kaccounttemplateselectordecl.ui kaccounttemplateselector.cpp \ --transactionsortoption.cpp transactionsortoption.ui \ -+transactionsortoption.ui \ - selectedtransaction.cpp - - #libwidgets_a_SOURCES = kmymoneyregisterinvestment.cpp kmymoneyequity.cpp kmymoneyequitycompletion.cpp kmymoneycompletion.cpp kmymoneyequityselector.cpp kmymoneyaccountcombo.cpp kmymoneyaccountcompletion.cpp kmymoneycurrencyselector.cpp kmymoneypriceview.cpp kmymoneypriceviewdecl.ui kschedulebriefwidget.ui kmymoneyaccountselector.cpp kmymoneyregisterloan.cpp kmymoneyregistersearch.cpp kmymoneybriefschedule.cpp kmymoneyscheduleddatetbl.cpp kmymoneydatetbl.cpp kmymoneyscheduledcalendar.cpp kmymoneycalendar.cpp kmymoneycalculator.cpp kmymoneycategory.cpp kmymoneypayee.cpp kmymoneytransactionform.cpp kmymoneyregistercheckings.cpp kmymoneyregister.cpp kmymoneycombo.cpp kmymoneyhlayout.cpp kmymoneylineedit.cpp kmymoneyedit.cpp kmymoneydateinput.cpp kmymoneyreportcontroldecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportconfigtabchartdecl.ui kmymoneyonlinequoteconfig.cpp kmymoneyonlinequoteconfigdecl.ui kmymoneyaccounttree.cpp kmymoneygpgconfigdecl.ui kmymoneygpgconfig.cpp kmymoneytitlelabel.cpp kguiutils.cpp kmymoneywizard.cpp kmymoneyaccounttreebudget.cpp kmymoneyaccounttreeforecast.cpp \ - #register.cpp registeritem.cpp transaction.cpp transactionform.cpp transactioneditor.cpp transactioneditorcontainer.cpp kmymoneychecklistitem.cpp kmymoneylistviewitem.cpp kmymoneyforecastlistviewitem.cpp kmymoneyselector.cpp \ - #transactionsortoption.ui - --EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui -+EXTRA_DIST = kmymoney.widgets kmymoneygpgconfigdecl.ui kmymoneyonlinequoteconfigdecl.ui kmymoneyreportconfigtab1decl.ui kmymoneyreportconfigtab2decl.ui kmymoneyreportconfigtab3decl.ui kmymoneyreportcontroldecl.ui kschedulebriefwidget.ui kmymoneyreportconfigtabchartdecl.ui transactionsortoption.ui.h sortoptionlistitem.h kbudgetvaluesdecl.ui kaccounttemplateselectordecl.ui - - # include the widgets that are available to 3rd party sw (e.g. plugins or - # Qt designer) here diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch deleted file mode 100644 index 09d697fb4..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.0.5-nodebug.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp.bero 2002-08-21 15:16:19.000000000 +0200 -+++ qt-x11-free-3.0.5/src/tools/qgpluginmanager.cpp 2002-08-21 15:16:41.000000000 +0200 -@@ -501,10 +501,10 @@ - (*f).latin1(), - (const char*) QFile::encodeName( old->library() ) ); - } else { -- qWarning("%s: Feature %s already defined in %s!", -+/* qWarning("%s: Feature %s already defined in %s!", - (const char*) QFile::encodeName( old->library() ), - (*f).latin1(), -- (const char*) QFile::encodeName( plugin->library() ) ); -+ (const char*) QFile::encodeName( plugin->library() ) ); */ - } - } - } diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch deleted file mode 100644 index 009ab81fb..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.1.0-makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.1.0/Makefile.orig 2002-11-14 15:44:17.000000000 +0100 -+++ qt-x11-free-3.1.0/Makefile 2002-11-14 15:49:33.000000000 +0100 -@@ -11,7 +11,7 @@ - install: FORCE - @$(MAKE) qt.install - --all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples -+all: symlinks src-qmake src-moc sub-src sub-tools - @echo - @echo "The Qt library is now built in ./lib" - @echo "The Qt examples are built in the directories in ./examples" diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch deleted file mode 100644 index 5bd5e9e0a..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.4-print-CJK.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp.cjk 2005-01-21 18:16:11.000000000 +0100 -+++ qt-x11-free-3.3.4/src/kernel/qpsprinter.cpp 2005-01-26 15:09:20.911239907 +0100 -@@ -4748,10 +4748,11 @@ - - // GB18030 fonts on Turbolinux - static const psfont SongGBK2K [] = { -- { "MSung-Light-GBK2K-H", 0, 100. }, -- { "MSung-Italic-GBK2K-H", 0, 100. }, -- { "MSung-Bold-GBK2K-H", 0, 100. }, -- { "MSung-BoldItalic-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ { "MSungGBK-Light-GBK2K-H", 0, 100. }, -+ - }; - static const psfont KaiGBK2K [] = { - { "MKai-Medium-GBK2K-H", 0, 100. }, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch deleted file mode 100644 index 9dca7998d..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-214371.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -pruN qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp ---- qt-x11-free-3.3.6.org/src/kernel/qscriptengine_x11.cpp 2006-12-04 18:47:11.000000000 +0530 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-12-05 12:05:10.000000000 +0530 -@@ -1412,7 +1412,10 @@ static bool indic_shape_syllable(QOpenTy - toPos += 2; - if (script == QFont::Devanagari || script == QFont::Gujarati || script == QFont::Bengali) { - if (matra_position == Post || matra_position == Split) { -- toPos = matra+1; -+ if (matra_position == Post ) -+ toPos = matra; -+ else -+ toPos = matra+1; - matra -= 2; - } - } else if (script == QFont::Kannada) { diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch deleted file mode 100644 index 84b885b8b..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-gu-228452.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt3/src/kernel/qscriptengine_x11.cpp.fontrendering-gu-228452 2012-09-29 11:30:23.821539127 +0200 -+++ qt3/src/kernel/qscriptengine_x11.cpp 2012-09-29 11:31:59.679413873 +0200 -@@ -261,7 +261,7 @@ - Other, Other, Other, Other, - Other, Other, Other, Other, - -- Other, Other, Other, Other, -+ Other, Other, VowelMark, VowelMark, - Other, Other, Other, Other, - Other, Other, Other, Other, - Other, Other, Other, Other, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch deleted file mode 100644 index 01f3824c1..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209097.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-13 13:21:37.000000000 +0800 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-13 13:57:36.000000000 +0800 -@@ -868,7 +868,7 @@ - None, None, None, None, - None, None, None, Post, - -- Post, None, Below, None, -+ None, None, None, None, - None, Post, None, None, - None, None, None, None, - None, None, Post, Post, -@@ -1271,6 +1271,16 @@ - int base = 0; - int reph = -1; - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ bool is_special_conjuction_malayalam = false; -+ -+ if ((len == 3) && -+ ((reordered[2] == 0x0d30) || (reordered[2] == 0x0d31)) && -+ (reordered[1] == 0x0d4d) && -+ ((reordered[0] >= 0x0d15) && (reordered[0] <= 0x0d39))) { -+ is_special_conjuction_malayalam = true; -+ } -+ - #ifdef INDIC_DEBUG - IDEBUG("original:"); - for (i = 0; i < len; i++) { -@@ -1547,6 +1557,15 @@ - reph = i; - } - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ if (is_special_conjuction_malayalam) { -+ unsigned short temp; -+ -+ temp = reordered[0]; -+ reordered[0] = reordered[2]; -+ reordered[2] = temp; -+ } -+ - if (item->font->stringToCMap((const QChar *)reordered.data(), len, item->glyphs, item->advances, - &item->num_glyphs, item->flags & QTextEngine::RightToLeft) != QFontEngine::NoError) - return FALSE; -@@ -1658,6 +1677,15 @@ - - // halant always applies - -+ //for the special conjuctions about Cons+0d4d+0d30 and Cons+0d40+0d31 of Malayalam -+ if (is_special_conjuction_malayalam) { -+ unsigned int temp; -+ -+ temp = properties[0]; -+ properties[0] = ~PreSubstProperty; -+ properties[2] = temp; -+ } -+ - #ifdef INDIC_DEBUG - { - IDEBUG("OT properties:"); diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch deleted file mode 100644 index 8dbb2ae98..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-209974.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.orig 2006-11-29 17:17:26.000000000 +0100 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-11-29 17:22:34.000000000 +0100 -@@ -864,7 +864,7 @@ - None, None, None, Post, - - None, None, None, None, -- None, Post, None, None, -+ None, None, None, None, - None, None, None, None, - None, None, Post, Post, - diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch deleted file mode 100644 index eb880b1cc..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-ml_IN-217657.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp ---- qt-x11-free-3.3.6.org/src/kernel/qfont_x11.cpp 2006-03-08 00:00:00.000000000 +0530 -+++ qt-x11-free-3.3.6/src/kernel/qfont_x11.cpp 2006-12-04 18:49:09.000000000 +0530 -@@ -709,7 +709,7 @@ int QFontMetrics::charWidth( const QStri - if ( script >= QFont::Arabic && script <= QFont::Khmer ) { - // complex script shaping. Have to do some hard work - int from = QMAX( 0, pos - 8 ); -- int to = QMIN( (int)str.length(), pos + 8 ); -+ int to = str.length(); - QConstString cstr( str.unicode()+from, to-from); - QTextEngine layout( cstr.string(), d ); - layout.itemize( QTextEngine::WidthOnly ); diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch deleted file mode 100644 index eb3868c96..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.6-fontrendering-te_IN-211259.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp.bak 2006-10-18 17:55:23.000000000 +0800 -+++ qt-x11-free-3.3.6/src/kernel/qscriptengine_x11.cpp 2006-10-19 16:42:31.641160984 +0800 -@@ -786,7 +786,7 @@ - Below, None, Below, Below, - Below, Below, Below, Below, - -- Below, None, Below, Below, -+ Below, Below, Below, Below, - None, Below, Below, Below, - Below, Below, None, None, - None, None, Post, Above, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch deleted file mode 100644 index 41a74fba7..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-214570.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 -+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 -@@ -1240,7 +1240,7 @@ - int script = item->script; - Q_ASSERT(script >= QFont::Devanagari && script <= QFont::Sinhala); - const unsigned short script_base = 0x0900 + 0x80*(script-QFont::Devanagari); -- const unsigned short ra = script_base + 0x30; -+ unsigned short ra = script_base + 0x30; //it was const unsigned short ra before modification - const unsigned short halant = script_base + 0x4d; - const unsigned short nukta = script_base + 0x3c; - -@@ -1278,6 +1278,11 @@ - } - #endif - -+ unsigned short *chkAssamese=reordered.data(); -+ if((script == QFont::Bengali) && (*chkAssamese==0x09F0)) //if it is assamese ra -+ { -+ ra = script_base + 0x70; -+ } - if (len != 1) { - unsigned short *uc = reordered.data(); - bool beginsWithRa = FALSE; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch deleted file mode 100644 index 7583239cc..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-3.3.8-fontrendering-as_IN-209972.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp.orig 2007-04-11 15:05:34.000000000 +0200 -+++ qt-x11-free-3.3.8/src/kernel/qscriptengine_x11.cpp 2007-04-11 15:22:19.000000000 +0200 -@@ -601,7 +601,7 @@ - None, None, None, None, - None, None, None, None, - -- None, None, None, None, -+ Below, None, None, None, - None, None, None, None, - None, None, None, None, - None, None, None, None, diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch deleted file mode 100644 index 02a40b225..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-uic-nostdlib.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- qt-x11-free-3.3.2/tools/designer/uic/main.cpp.sopwith 2004-06-16 17:14:17.000000000 -0400 -+++ qt-x11-free-3.3.2/tools/designer/uic/main.cpp 2004-06-16 17:21:43.000000000 -0400 -@@ -149,6 +149,9 @@ - } else { - trmacro = &opt[1]; - } -+ } else if ( opt == "nostdlib") { -+ QStringList x; -+ QApplication::setLibraryPaths(x); - } else if ( opt == "L" ) { - if ( !(n < argc-1) ) { - error = "Missing plugin path."; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch deleted file mode 100644 index 6dce7aa80..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.2-quiet.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp.orig 2004-05-10 13:54:03.592289052 +0200 -+++ qt-x11-free-3.3.2/src/kernel/qpixmap_x11.cpp 2004-05-10 13:56:10.165560473 +0200 -@@ -288,8 +288,9 @@ - { - #if defined(QT_CHECK_STATE) - if ( qApp->type() == QApplication::Tty ) { -- qWarning( "QPixmap: Cannot create a QPixmap when no GUI " -- "is being used" ); -+// qWarning( "QPixmap: Cannot create a QPixmap when no GUI " -+// "is being used" ); -+ ; - } - #endif - diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch deleted file mode 100644 index 0d03f0809..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.4-fullscreen.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp.orig 2004-11-09 18:57:15.012843629 +0100 -+++ qt-x11-free-3.3.3/src/kernel/qapplication_x11.cpp 2004-11-09 19:02:31.351637807 +0100 -@@ -1412,7 +1412,7 @@ - False, XA_ATOM, &type, &format, &nitems, &after, &data); - - if (type == XA_ATOM && format == 32) { -- ts.writeBlock((const char *) data, nitems * 4); -+ ts.writeBlock((const char *) data, nitems * sizeof(long)); - offset += nitems; - } else - after = 0; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch deleted file mode 100644 index a9cfaf4c3..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qfontdatabase_x11.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp.fonts 2004-08-05 16:42:06.000000000 +0200 -+++ qt-x11-free-3.3.6/src/kernel/qfontdatabase_x11.cpp 2004-09-28 16:11:54.955374161 +0200 -@@ -975,7 +981,7 @@ - }; - const XftDefaultFont defaults[] = { - { "Serif", "serif", FALSE }, -- { "Sans Serif", "sans-serif", FALSE }, -+ { "Sans", "sans-serif", FALSE }, - { "Monospace", "monospace", TRUE }, - { 0, 0, FALSE } - }; diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch deleted file mode 100644 index ee960442e..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-qt-x11-immodule-unified-qt3.3.5-20060318-resetinputcontext.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- ./src/widgets/qtextedit.cpp.resetinputcontext 2012-08-04 14:53:34.000000000 +0200 -+++ ./src/widgets/qtextedit.cpp 2012-09-29 11:36:19.410163805 +0200 -@@ -1904,9 +1904,6 @@ - - void QTextEdit::removeSelectedText( int selNum ) - { -- if(selNum != 0) -- resetInputContext(); -- - QTextCursor c1 = doc->selectionStartCursor( selNum ); - c1.restoreState(); - QTextCursor c2 = doc->selectionEndCursor( selNum ); -@@ -3169,7 +3166,6 @@ - return; - } - #endif -- resetInputContext(); - QTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3196,7 +3192,6 @@ - return; - } - #endif -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3238,7 +3233,6 @@ - if ( d->optimMode ) - return; - #endif -- resetInputContext(); - QTextParagraph *p = doc->paragAt( para ); - if ( !p ) - return; -@@ -3283,7 +3277,6 @@ - if ( isReadOnly() || !doc->commands()->isUndoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3334,7 +3327,6 @@ - if ( isReadOnly() || !doc->commands()->isRedoAvailable() || !undoEnabled ) - return; - -- resetInputContext(); - for ( int i = 0; i < (int)doc->numSelections(); ++i ) - doc->removeSelection( i ); - -@@ -3448,7 +3440,6 @@ - { - if ( isReadOnly() ) - return; -- resetInputContext(); - normalCopy(); - removeSelectedText(); - updateMicroFocusHint(); -@@ -3936,7 +3927,6 @@ - return; - } - #endif -- resetInputContext(); - if ( !isModified() && isReadOnly() && - this->context() == context && this->text() == text ) - return; -@@ -4110,7 +4100,6 @@ - if ( !p ) - return; - -- resetInputContext(); - if ( index > p->length() - 1 ) - index = p->length() - 1; - -@@ -4167,7 +4156,6 @@ - return; - } - #endif -- resetInputContext(); - if ( doc->hasSelection( selNum ) ) { - doc->removeSelection( selNum ); - repaintChanged(); -@@ -5074,7 +5062,6 @@ - } - if ( dc == doc ) - return; -- resetInputContext(); - doc = dc; - delete cursor; - cursor = new QTextCursor( doc ); diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch deleted file mode 100644 index efc24c8a1..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.6-strip.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf.orig 2006-06-21 15:37:53.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++/qmake.conf 2006-06-21 15:38:02.000000000 +0200 -@@ -84,7 +84,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf.orig 2006-06-21 15:37:09.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++-32/qmake.conf 2006-06-21 15:37:19.000000000 +0200 -@@ -84,7 +84,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p ---- qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf.orig 2006-06-21 15:36:23.000000000 +0200 -+++ qt-x11-free-3.3.6/mkspecs/linux-g++-64/qmake.conf 2006-06-21 15:36:56.000000000 +0200 -@@ -87,7 +87,7 @@ - QMAKE_MOVE = mv -f - QMAKE_DEL_FILE = rm -f - QMAKE_DEL_DIR = rmdir --QMAKE_STRIP = strip --QMAKE_STRIPFLAGS_LIB += --strip-unneeded -+QMAKE_STRIP = -+QMAKE_STRIPFLAGS_LIB += - QMAKE_CHK_DIR_EXISTS = test -d - QMAKE_MKDIR = mkdir -p diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch deleted file mode 100644 index f2351909f..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.7-umask.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- qt-x11-free-3.3.7/src/tools/qsettings.cpp.tn 2006-11-09 20:53:25.000000000 +0100 -+++ qt-x11-free-3.3.7/src/tools/qsettings.cpp 2006-11-09 20:59:53.000000000 +0100 -@@ -994,7 +994,10 @@ - #endif - - QFile file( filename + ".tmp" ); -- if (! file.open(IO_WriteOnly)) { -+ mode_t old_umask = umask(0022); -+ bool f = file.open(IO_WriteOnly); -+ umask(old_umask); -+ if (! f) { - - #ifdef QT_CHECK_STATE - qWarning("QSettings::sync: failed to open '%s' for writing", diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch deleted file mode 100644 index c1ff66c2c..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-typo.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml.orig 2010-06-30 01:00:36.000000000 +0200 -+++ qt-x11-free-3.3.8b/mkspecs/macx-mwerks/mwerkstmpl.xml 2010-06-30 01:00:56.000000000 +0200 -@@ -817,7 +817,7 @@ - <PATHFORMAT>MacOS</PATHFORMAT> - </FILEREF> - </GROUP> -- <GROUP><Name>QtGenerated</NAME> -+ <GROUP><NAME>QtGenerated</NAME> - $$CODEWARRIOR_QPREPROCESS_GROUP - $$CODEWARRIOR_QPREPROCESSOUT_GROUP - </GROUP> diff --git a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch b/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch deleted file mode 100644 index 341cab7e1..000000000 --- a/redhat/dependencies/qt3/patches/3.5.13.2/qt-x11-free-3.3.8b-uic-multilib.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/main.cpp ---- qt-x11-free-3.3.8b/tools/designer/uic/main.cpp.orig 2008-01-24 13:25:29.000000000 +0100 -+++ qt-x11-free-3.3.8b/tools/designer/uic/main.cpp 2008-01-24 13:28:17.000000000 +0100 -@@ -320,7 +320,7 @@ int main( int argc, char * argv[] ) - out << "/****************************************************************************" << endl; - out << "** Form "<< (impl? "implementation" : "interface") << " generated from reading ui file '" << fileName << "'" << endl; - out << "**" << endl; -- out << "** Created: " << QDateTime::currentDateTime().toString() << endl; -+ out << "** Created by User Interface Compiler" << endl; - out << "**" << endl; - out << "** WARNING! All changes made in this file will be lost!" << endl; - out << "****************************************************************************/" << endl << endl; -diff -up qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp ---- qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp.orig 2008-01-24 13:28:30.000000000 +0100 -+++ qt-x11-free-3.3.8b/tools/designer/uic/embed.cpp 2008-01-24 13:29:10.000000000 +0100 -@@ -137,7 +137,7 @@ void Uic::embed( QTextStream& out, const - for ( it = images.begin(); it != images.end(); ++it ) - out << "** " << *it << "\n"; - out << "**\n"; -- out << "** Created: " << QDateTime::currentDateTime().toString() << "\n"; -+ out << "** Created by The User Interface Compiler" << "\n"; - out << "**\n"; - out << "** WARNING! All changes made in this file will be lost!\n"; - out << "****************************************************************************/\n"; diff --git a/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch b/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch deleted file mode 100644 index 0c93c416a..000000000 --- a/redhat/dependencies/qt3/patches/obsolete/qt-x11-free-3.3.7-arm.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- qt-x11-free-3.3.7/src/tools/qglobal.h.orig 2007-04-24 09:02:36.000000000 -0400 -+++ qt-x11-free-3.3.7/src/tools/qglobal.h 2007-04-24 09:03:02.000000000 -0400 -@@ -315,9 +315,9 @@ - QString bloat. However, gcc 3.4 doesn't allow us to create references to - members of a packed struct. (Pointers are OK, because then you - supposedly know what you are doing.) */ --# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) -+# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP) && !defined(__ARM_EABI__) - # define Q_PACKED __attribute__ ((packed)) --# if __GNUC__ == 3 && __GNUC_MINOR__ >= 4 -+# if __GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) - # define Q_NO_PACKED_REFERENCE - # endif - # endif ---- qt-x11-free-3.3.7/src/tools/qstring.h.orig 2007-04-24 09:03:11.000000000 -0400 -+++ qt-x11-free-3.3.7/src/tools/qstring.h 2007-04-24 09:03:27.000000000 -0400 -@@ -194,7 +194,7 @@ - char latin1() const { return ucs > 0xff ? 0 : (char) ucs; } - ushort unicode() const { return ucs; } - #ifdef Q_NO_PACKED_REFERENCE -- ushort &unicode() { return *(&ucs); } -+ ushort &unicode() { return *((ushort *)&ucs); } - #else - ushort &unicode() { return ucs; } - #endif |