diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-06-27 13:55:04 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-06-27 13:55:04 +0200 |
| commit | 97e1a5b5fcaa7afe458b5fc12476a458135f7dd7 (patch) | |
| tree | c804440ca20a1a5853cc7d5b6a4244c689efac84 | |
| parent | 4ee30a7fc0bc8782f1d8657c9fdb32158ec84f83 (diff) | |
| download | tde-packaging-97e1a5b5fcaa7afe458b5fc12476a458135f7dd7.tar.gz tde-packaging-97e1a5b5fcaa7afe458b5fc12476a458135f7dd7.zip | |
RPM packaging: update qt3 for opensuse
| -rw-r--r-- | opensuse/core/qt3/patches/3.5.13.2/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff | 4 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3-3.5.13.2.spec | 54 |
2 files changed, 4 insertions, 54 deletions
diff --git a/opensuse/core/qt3/patches/3.5.13.2/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff b/opensuse/core/qt3/patches/3.5.13.2/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff index 3adbc7bf4..02000ff12 100644 --- a/opensuse/core/qt3/patches/3.5.13.2/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff +++ b/opensuse/core/qt3/patches/3.5.13.2/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff @@ -7,8 +7,8 @@ Date: 1386900429 +0100 diff --git a/config.tests/x11/xfreetype.test b/config.tests/x11/xfreetype.test index 5cabc32..d4cb4ba 100755 ---- a/config.tests/x11/xfreetype.test -+++ b/config.tests/x11/xfreetype.test +--- config.tests/x11/xfreetype.test ++++ config.tests/x11/xfreetype.test @@ -116,12 +116,15 @@ fi # check for freetype2 headers FREETYPE2_INCDIR= diff --git a/opensuse/core/qt3/qt3-3.5.13.2.spec b/opensuse/core/qt3/qt3-3.5.13.2.spec index d50e430cd..6d7107598 100644 --- a/opensuse/core/qt3/qt3-3.5.13.2.spec +++ b/opensuse/core/qt3/qt3-3.5.13.2.spec @@ -32,36 +32,9 @@ Source101: qtkdeintegration_x11_p.h Source102: baselibs.conf Source200: attributes Source201: update_spec.pl -Patch1: aliasing.diff -Patch2: head.diff -Patch4: qt3-never-strip.diff -Patch5: external-libs.diff -Patch12: qtrc-path.diff -Patch14: lib64-plugin-support.diff -Patch15: pluginmanager-fix.diff -Patch18: no-rpath.dif -Patch19: shut-up.diff -Patch23: fix-accessible.diff -# From http://www.freedesktop.org/wiki/Software_2fImmoduleQtDownload -# Current version from http://freedesktop.org/~daisuke/qt-x11-immodule-unified-qt3.3.5-20060318.diff.bz2 -Patch31: limit-image-size.diff -Patch37: 0055-qtextedit_zoom.patch -Patch39: fix-qtranslator-crash.diff -Patch42: add_qexport_visibility.patch -Patch54: kmenu-search-fix.diff -Patch113: fix-assistant-path.patch -Patch117: qtimer-debug.diff -Patch121: qt3-warnings.diff -Patch125: qcstring-format-warnings.diff -Patch127: mng-reading-fix.patch -Patch134: fix-xinput-clash.diff -Patch135: parseFontName.diff -Patch136: qt3-no-date.diff -Patch139: gcc46.diff -# Patches from Trinity -# [qt3] Fix FTBFS with libfreetype6 >= 2.5.x . This resolves Bug 1765 -Patch200: 1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff +Patch1: qt3-3.5.13.2.patch +Patch14: lib64-plugin-support.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -122,37 +95,14 @@ the current Qt library! %prep %setup -q -n trinity-qt3-3.5.13.2%{?preversion:~%{preversion}} %patch1 -%patch2 -%patch4 -%patch5 -%patch12 if [ "%_lib" = "lib64" ]; then %patch14 fi -%patch15 -%patch18 -%patch19 -%patch23 -%patch31 -%patch37 -%patch39 -%patch42 -%patch54 -%patch113 -%patch117 -%patch121 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/ -%patch125 -%patch127 -%patch134 -%patch135 -%patch136 -%patch139 -%patch200 -p1 -b .freetype250 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ |