Thanks to Andrea Cascio for getting Qt3 3.3.8d building!

1 files changed, 7 insertions, 58 deletions

diff --git a/opensuse/core/qt3/qt3-extensions.spec b/opensuse/core/qt3/qt3-extensions.spec
index 969cc4da2..d44f8c188 100644
--- a/opensuse/core/qt3/qt3-extensions.spec
+++ b/opensuse/core/qt3/qt3-extensions.spec
@@ -32,8 +32,6 @@ Group:          Development/Tools/Other
 Summary:        Qt3 Extensions
 # COMMON-BEGIN
 # COMMON-BEGIN
-%define x11_free -x11-free-
-%define rversion 3.3.8b
 Source0:        http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz
 Source1:        build_script.sh
 Source2:        qtconfig3.desktop
@@ -48,8 +46,6 @@ Source10:       qt3.sh
 Source11:       qt3.csh
 # Translations did not change at 3.3.8d
 Source12:       qt3-3.3.8b-translations.tar.bz2
-Source100:      qtkdeintegration_x11.cpp
-Source101:      qtkdeintegration_x11_p.h
 Source102:      baselibs.conf
 Source200:      attributes
 Source201:      update_spec.pl
@@ -62,43 +58,24 @@ Patch14:        lib64-plugin-support.diff
 Patch15:        pluginmanager-fix.diff
 Patch18:        no-rpath.dif
 Patch19:        shut-up.diff
-Patch21:        fix-GL-loading.diff
 Patch23:        fix-accessible.diff
-Patch28:        fix-key-release-event-with-imm.diff
 Patch31:        limit-image-size.diff
-Patch34:        0005-qpixmap_mitshm.patch
 Patch35:        qt-transparency.patch
 Patch37:        0055-qtextedit_zoom.patch
-Patch38:        0048-qclipboard_hack_80072.patch
 Patch39:        fix-qtranslator-crash.diff
-Patch40:        0059-qpopup_has_mouse.patch
-Patch41:        0060-qpopup_ignore_mousepos.patch
 Patch42:        add_qexport_visibility.patch
-Patch43:        0056-khotkeys_input_84434.patch
-Source250:      enable-designer-plugins.diff
-Patch53:        fix-xinerama-dialog-placement.diff
 Patch54:        kmenu-search-fix.diff
-Patch55:        qt3-fix-cast.diff
-Patch100:       qt.patch
-Patch101:       qt3-arm-gcc4.patch
-Patch102:       xinerama.patch
 Patch113:       fix-assistant-path.patch
 Patch117:       qtimer-debug.diff
-Patch119:       xinerama-qpopupmenu.diff
 Patch121:       qt3-warnings.diff
-Patch123:       use-xrandr-1.2.diff
 Patch125:       qcstring-format-warnings.diff
 Patch127:       mng-reading-fix.patch
-Patch128:       0079-compositing-types.patch
-Patch129:       0080-net-wm-sync-request.patch
-Patch132:       revert-qt-3.3.8-khmer-fix.diff
-Patch133:       0085-fix-buildkey.diff
 Patch134:       fix-xinput-clash.diff
 Patch135:       parseFontName.diff
 Patch136:       qt3-no-date.diff
 Patch137:       popen-leak-fix.diff
-Patch138:       qt3-libpng14.diff
 Patch139:       gcc46.diff
+Patch140:       revert-iodbc-to-uodbc.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -106,6 +83,9 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 This package contains extension libraries for Qt 3, such as the
 Netscape plug-in modules.
 
+This package contains extension libraries for Qt 3, such as the
+Netscape plug-in modules.
+
 %define build_sub_dirs src plugins/src tools/designer/uilib/ tools/designer/uic tools/qtconfig tools/assistant/lib tools/assistant tutorial
 
 %prep
@@ -122,55 +102,28 @@ fi
 %patch18
 %patch19
 %patch23
-#%patch28
 %patch31
-%patch34
 %patch35
 %patch37
-%patch38
 %patch39
-%patch40
-%patch41
 %patch42
-%patch43
-%patch100
-%patch102
-%patch53
 %patch54
-%patch55
-%patch101
 %patch113
 %patch117
-%patch119
 %patch121
-%patch123
 ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
 ln -sf $PWD/src/inputmethod/qinputcontextplugin.h  include/
 ln -sf $PWD/src/kernel/qinputcontext.h       include/
 ln -sf $PWD/src/kernel/qinputcontextinterface_p.h include/private/
 ln -sf $PWD/src/kernel/qximinputcontext_p.h       include/private/
-if [ %_lib = "lib" ]; then
-sed 's,/lib64/,/lib/,' %PATCH21 | patch -p0
-else
-%patch21
-fi
 %patch125
 %patch127
-%patch128
-%patch129
-%patch132
-%patch133
 %patch134
 %patch135
 %patch136
 %patch137
-%if %suse_version > 1120
-%patch138 -p1
-%endif
 %patch139
-# copy qt kde integration files
-cp %SOURCE100 %SOURCE101 src/kernel/
-cp %SOURCE101 include/private/
+%patch140
 cd translations
 tar xvjf %SOURCE12
 cd ..
@@ -184,12 +137,6 @@ Netscape plug-in modules.
 This package contains extension libraries for Qt 3, such as the
 Netscape plug-in modules.
 
-This package contains extension libraries for Qt 3, such as the
-Netscape plug-in modules.
-
-This package contains extension libraries for Qt 3, such as the
-Netscape plug-in modules.
-
 %package -n qt3-devel-examples
 Summary:        Programming Examples for Qt 3
 AutoReqProv:    on
@@ -415,6 +362,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 #/usr/bin/designer
 #/usr/bin/linguist
+/usr/lib/qt3/bin/createcw
+/usr/lib/qt3/bin/makeqpf
 /usr/lib/qt3/bin/qconfig
 /usr/lib/qt3/bin/findtr
 /usr/lib/qt3/bin/qt20fix