diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-04-09 10:50:39 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-04-09 10:50:39 +0200 |
| commit | 28ee26436c2d314e2f6d16defd705a78f6fcd17c (patch) | |
| tree | 3ea1172b1f51fc8b05923353f58944dec622f40b /opensuse/core | |
| parent | bbf51c9c3453eaeb9192af27aa797edffe66ff80 (diff) | |
| download | tde-packaging-28ee26436c2d314e2f6d16defd705a78f6fcd17c.tar.gz tde-packaging-28ee26436c2d314e2f6d16defd705a78f6fcd17c.zip | |
RPM Packaging: updates for 3.5.13.2 packages build on OBS
Diffstat (limited to 'opensuse/core')
| -rw-r--r-- | opensuse/core/qt3/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff | 28 | ||||
| -rw-r--r-- | opensuse/core/qt3/qt3-3.5.13.2.spec | 8 |
2 files changed, 36 insertions, 0 deletions
diff --git a/opensuse/core/qt3/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff b/opensuse/core/qt3/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff new file mode 100644 index 000000000..3adbc7bf4 --- /dev/null +++ b/opensuse/core/qt3/1386900429_1ee1ffbae69dc78721af139f0794628571fd35ef.diff @@ -0,0 +1,28 @@ +commit 1ee1ffbae69dc78721af139f0794628571fd35ef +Author: Slávek Banko <slavek.banko@axis.cz> +Date: 1386900429 +0100 + + Fix FTBFS with libfreetype6 >= 2.5.x + This resolves Bug 1765 + +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 +@@ -116,12 +116,15 @@ fi + # check for freetype2 headers + FREETYPE2_INCDIR= + if [ "$XFT" = "yes" ]; then +- INC="freetype2/freetype/freetype.h" + XDIRS=`sed -n -e '/^QMAKE_INCDIR_X11[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` + LDIRS=`sed -n -e '/^QMAKE_INCDIR[ ]*=/ { s/[^=]*=[ ]*//; s/-I/ /g; p; }' $XCONFIG` + INCDIRS="$IN_INCDIRS $XDIRS $LDIRS /usr/include /include" + F= + for INCDIR in $INCDIRS; do ++ INC="freetype2/freetype/freetype.h" # libfreetype <= 2.4.9-1.1 ++ if ! [ -f $INCDIR/$INC ]; then ++ INC="freetype2/freetype.h" # libfreetype >= 2.5.1-1 ++ fi + if [ -f $INCDIR/$INC ]; then + # detect major version of freetype2 + FREETYPE_MAJOR=`grep "#define FREETYPE_MAJOR" $INCDIR/$INC | head -n 1 | awk '{ print \$3 }'` diff --git a/opensuse/core/qt3/qt3-3.5.13.2.spec b/opensuse/core/qt3/qt3-3.5.13.2.spec index 32263d8d4..d50e430cd 100644 --- a/opensuse/core/qt3/qt3-3.5.13.2.spec +++ b/opensuse/core/qt3/qt3-3.5.13.2.spec @@ -59,6 +59,10 @@ 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 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #Remember also to modify Requires in -devel package @@ -80,12 +84,15 @@ BuildRequires: glu-devel # PNG support %if %suse_version >= 1310 +BuildRequires: libpng16-devel BuildRequires: libpng16-compat-devel %endif %if %suse_version == 1230 +BuildRequires: libpng15-devel BuildRequires: libpng15-compat-devel %endif %if %suse_version >= 1110 && %suse_version <= 1220 +BuildRequires: libpng14-devel BuildRequires: libpng14-compat-devel %endif @@ -145,6 +152,7 @@ ln -sf $PWD/src/kernel/qximinputcontext_p.h include/private/ %patch135 %patch136 %patch139 +%patch200 -p1 -b .freetype250 # copy qt kde integration files cp %SOURCE100 %SOURCE101 src/kernel/ cp %SOURCE101 include/private/ |