From 20ebc908500abb9227a275539e2b76b87db19d2b Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 29 Jun 2006 10:01:04 +0000 Subject: [PATCH] - apply upstream patches --- kdelibs.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/kdelibs.spec b/kdelibs.spec index 0123106..7d13779 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -18,8 +18,6 @@ %define dnotify 1 %define arts 1 -%define disable_gcc_check_and_hidden_visibility 1 - Version: 3.5.3 Release: 5 Summary: K Desktop Environment - Libraries @@ -54,6 +52,13 @@ Patch38: kdelibs-3.5.2-cupsdconf2-group.patch Patch100: kdelibs-3.5.3-konqueror-khtml.patch Patch101: kdelibs-3.5.3-khtml-regression.patch Patch102: kdelibs-3.5.3.diff +Patch103: kdelibs-3.5.3-kde#57159.patch +Patch104: kdelibs-3.5.3-kde#118277.patch +Patch105: kdelibs-3.5.3-kde#123315.patch +Patch106: kdelibs-3.5.3-kde#65546.patch +Patch107: kdelibs-3.5.3-kde#128842.patch +Patch108: kdelibs-3.5.3-kde#128902.patch +Patch109: kdelibs-3.5.3-kde#67849.patch %if %{arts} Requires: arts >= %{arts_epoch}:%{arts_version} @@ -186,6 +191,13 @@ format for easy browsing %patch100 -p1 -b .konqueror-khtml %patch101 -p1 -b .khtml-regression %patch102 -p0 -b .return-check +%patch103 -p0 -b .kde#57159 +%patch104 -p0 -b .kde#118277 +%patch105 -p0 -b .kde#123315 +%patch106 -p0 -b .kde#65546 +%patch107 -p0 -b .kde#128842 +%patch108 -p0 -b .kde#128902 +%patch109 -p0 -b .kde#67849 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h @@ -215,9 +227,7 @@ fi --enable-cups \ --enable-mitshm \ --with-xinerama \ -%if %{disable_gcc_check_and_hidden_visibility} --disable-gcc-hidden-visibility \ -%endif --enable-pie \ %if %{arts} == 0 --without-arts \