Sync from devel:
Tue Aug 26 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-1
- kde-3.5.10
Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-18
- fix build against Rawhide kernel headers (fix flock and flock64
redefinition)
This commit is contained in:
Kevin Kofler
parent
f2029eba95
commit
77a2cf577e
|
|
@ -1 +1 @@
|
|||
kdelibs-3.5.9.tar.bz2
|
||||
kdelibs-3.5.10.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,133 +0,0 @@
|
|||
Index: kioslave/metainfo/Makefile.am
|
||||
===================================================================
|
||||
--- kioslave/metainfo/Makefile.am (Revision 606834)
|
||||
+++ kioslave/metainfo/Makefile.am (Arbeitskopie)
|
||||
@@ -2,7 +2,7 @@
|
||||
## Makefile.am of kdebase/kioslave/metainfo
|
||||
|
||||
INCLUDES = $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
METASOURCES = AUTO
|
||||
|
||||
kde_module_LTLIBRARIES = kio_metainfo.la
|
||||
Index: kioslave/gzip/Makefile.am
|
||||
===================================================================
|
||||
--- kioslave/gzip/Makefile.am (Revision 606834)
|
||||
+++ kioslave/gzip/Makefile.am (Arbeitskopie)
|
||||
@@ -1,5 +1,5 @@
|
||||
INCLUDES = -I$(top_srcdir)/kio $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
METASOURCES = AUTO
|
||||
|
||||
kde_module_LTLIBRARIES = kgzipfilter.la
|
||||
Index: kio/tests/Makefile.am
|
||||
===================================================================
|
||||
--- kio/tests/Makefile.am (Revision 606834)
|
||||
+++ kio/tests/Makefile.am (Arbeitskopie)
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio $(all_includes)
|
||||
LDADD = $(LIB_KIO)
|
||||
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
+AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
check_PROGRAMS = ksycocatest getalltest kruntest ktartest kziptest\
|
||||
kioslavetest kdirwatchtest kshredtest speed kurifiltertest \
|
||||
Index: dcop/tests/Makefile.am
|
||||
===================================================================
|
||||
--- dcop/tests/Makefile.am (Revision 606834)
|
||||
+++ dcop/tests/Makefile.am (Arbeitskopie)
|
||||
@@ -3,7 +3,6 @@
|
||||
@echo -e "dcop tests not run.\nRun make tests in the tests directory to make them"
|
||||
|
||||
INCLUDES = $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries)
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
@@ -17,7 +16,7 @@
|
||||
|
||||
driver_SOURCES = driver.cpp test.stub
|
||||
driver_LDADD = $(LIB_KDECORE)
|
||||
-driver_LDFLAGS = $(KDE_RPATH)
|
||||
+driver_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
CLEANFILES = batch.generated definitions.generated driver.generated shell.generated
|
||||
|
||||
Index: dcop/dcopidl2cpp/Makefile.am
|
||||
===================================================================
|
||||
--- dcop/dcopidl2cpp/Makefile.am (Revision 606834)
|
||||
+++ dcop/dcopidl2cpp/Makefile.am (Arbeitskopie)
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
INCLUDES = $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries)
|
||||
|
||||
####### Files
|
||||
|
||||
@@ -10,7 +9,7 @@
|
||||
noinst_HEADERS = main.h
|
||||
|
||||
dcopidl2cpp_LDADD = $(LIB_QT)
|
||||
-dcopidl2cpp_LDFLAGS = $(KDE_RPATH)
|
||||
+dcopidl2cpp_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
|
||||
dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
|
||||
../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl
|
||||
Index: dcop/client/Makefile.am
|
||||
===================================================================
|
||||
--- dcop/client/Makefile.am (Revision 606834)
|
||||
+++ dcop/client/Makefile.am (Arbeitskopie)
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
INCLUDES = $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries)
|
||||
DCOP_LIB = ../libDCOP.la
|
||||
|
||||
####### Files
|
||||
@@ -9,19 +8,19 @@
|
||||
|
||||
dcop_SOURCES = dcop.cpp
|
||||
dcop_LDADD = $(LIB_QT) $(DCOP_LIB)
|
||||
-dcop_LDFLAGS = $(KDE_RPATH)
|
||||
+dcop_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
dcopstart_SOURCES = dcopstart.cpp
|
||||
dcopstart_LDADD = $(LIB_QT) $(DCOP_LIB)
|
||||
-dcopstart_LDFLAGS = $(KDE_RPATH)
|
||||
+dcopstart_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
dcopquit_SOURCES = dcopquit.cpp
|
||||
dcopquit_LDADD = $(LIB_QT) $(DCOP_LIB)
|
||||
-dcopquit_LDFLAGS = $(KDE_RPATH)
|
||||
+dcopquit_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
dcopfind_SOURCES = dcopfind.cpp
|
||||
dcopfind_LDADD = $(LIB_QT) $(DCOP_LIB)
|
||||
-dcopfind_LDFLAGS = $(KDE_RPATH)
|
||||
+dcopfind_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
dcopclient_SOURCES = dcopclient.c
|
||||
dcopobject_SOURCES = dcopobject.c
|
||||
Index: dcop/dcopidl/Makefile.am
|
||||
===================================================================
|
||||
--- dcop/dcopidl/Makefile.am (Revision 606834)
|
||||
+++ dcop/dcopidl/Makefile.am (Arbeitskopie)
|
||||
@@ -1,6 +1,5 @@
|
||||
|
||||
INCLUDES = $(all_includes)
|
||||
-AM_LDFLAGS = $(all_libraries)
|
||||
AM_CPPFLAGS = -DYYDEBUG
|
||||
|
||||
####### Files
|
||||
@@ -11,7 +10,7 @@
|
||||
noinst_HEADERS = yacc.cc.h
|
||||
|
||||
dcopidl_LDADD = $(LIB_QT)
|
||||
-dcopidl_LDFLAGS = $(KDE_RPATH)
|
||||
+dcopidl_LDFLAGS = $(KDE_RPATH) $(all_libraries)
|
||||
|
||||
####### Build rules
|
||||
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp
|
||||
--- kdelibs-3.5.9/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200
|
||||
+++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp 2008-08-23 00:59:17.000000000 +0200
|
||||
@@ -71,7 +71,11 @@
|
||||
#include <linux/types.h>
|
||||
// Linux kernel headers are documented to not compile
|
||||
#define _S390_BITOPS_H
|
||||
+#define flock linux_flock
|
||||
+#define flock64 linux_flock64
|
||||
#include <linux/inotify.h>
|
||||
+#undef flock
|
||||
+#undef flock64
|
||||
|
||||
static inline int inotify_init (void)
|
||||
{
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- kdelibs/kate/part/katesupercursor.cpp 2008/02/08 14:17:43 772352
|
||||
+++ kdelibs/kate/part/katesupercursor.cpp 2008/02/20 11:02:18 777286
|
||||
@@ -186,7 +186,7 @@
|
||||
{
|
||||
if (newLine)
|
||||
{
|
||||
- if (m_line > int(line) || (m_line == int(line) && m_col > int(col)))
|
||||
+ if (m_line > int(line) || (m_line == int(line) && m_col >= int(col)))
|
||||
{
|
||||
if(m_line == int(line))
|
||||
m_col -= col;
|
||||
|
|
@ -1,15 +1,22 @@
|
|||
# kdelibs3 review: http://bugzilla.redhat.com/248899
|
||||
|
||||
%define _default_patch_fuzz 2
|
||||
|
||||
%define distname "Fedora"
|
||||
|
||||
%define kde_settings 1
|
||||
|
||||
%define arts 1
|
||||
%define arts_epoch 8
|
||||
%define arts_version 1.5.9
|
||||
%define arts_ev 8:1.5.9
|
||||
|
||||
%define qt3_epoch 1
|
||||
%if 0%{?fedora} > 8
|
||||
%define qt3 qt3
|
||||
%else
|
||||
%define qt3_epoch 1:
|
||||
%define qt3 qt
|
||||
%endif
|
||||
%define qt3_version 3.3.8b
|
||||
%define qt3_ev %{?qt3_epoch}%{qt3_version}
|
||||
# unfortunately, this doesn't work for 3.3.8b which still identifies as 3.3.8
|
||||
#global qt3_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt3_version})
|
||||
%define qt3_ver %{qt3_version}
|
||||
|
|
@ -28,8 +35,8 @@
|
|||
%define include_crystalsvg 1
|
||||
|
||||
Summary: K Desktop Environment 3 - Libraries
|
||||
Version: 3.5.9
|
||||
Release: 17%{?dist}
|
||||
Version: 3.5.10
|
||||
Release: 1%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs3
|
||||
|
|
@ -79,21 +86,20 @@ Patch51: kdelibs-3.5.9-cupsserverbin.patch
|
|||
Patch52: kdelibs-3.5.9-KDE3.patch
|
||||
# use /usr/libexec/kde4/drkonqi in KCrash (#453243)
|
||||
Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
|
||||
# fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
|
||||
Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
|
||||
|
||||
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
||||
Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
||||
# http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
|
||||
Patch101: kde-3.5-libtool-shlibext.patch
|
||||
# automake-1.10, $(all_libraries) is missing from a few LDFLAGS (kde #137675)
|
||||
Patch102: kdelibs-3.5.6-137675.patch
|
||||
# kget ignores simultaneous download limit (kde #101956)
|
||||
Patch103: kdelibs-3.5.0-101956.patch
|
||||
|
||||
## upstream patches
|
||||
Patch200: kdelibs-3.5.9-kate-regression.patch
|
||||
|
||||
#{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
|
||||
#Requires: qt3 >= %{qt3_epoch}:%{qt3_ver}
|
||||
#{?arts:Requires: arts >= %{arts_ev}}
|
||||
#Requires: %{qt3} >= %{qt3_ev}
|
||||
Requires: hicolor-icon-theme
|
||||
%if %{kde_settings}
|
||||
Requires: kde-settings >= 3.5
|
||||
|
|
@ -128,8 +134,8 @@ BuildRequires: kde4-macros(api)
|
|||
BuildRequires: gettext
|
||||
BuildRequires: pcre-devel
|
||||
BuildRequires: cups-devel cups
|
||||
BuildRequires: qt3-devel qt3-devel-docs
|
||||
%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}}
|
||||
BuildRequires: %{qt3}-devel %{qt3}-devel-docs
|
||||
%{?arts:BuildRequires: arts-devel >= %{arts_ev}}
|
||||
BuildRequires: flex >= 2.5.4a-13
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: libxslt-devel
|
||||
|
|
@ -207,7 +213,7 @@ Obsoletes: kdelibs-devel < 6:%{version}-%{release}
|
|||
Provides: kdelibs-devel = 6:%{version}-%{release}
|
||||
%endif
|
||||
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
|
||||
Requires: qt3-devel
|
||||
Requires: %{qt3}-devel
|
||||
Requires: openssl-devel
|
||||
%{?arts:Requires: arts-devel}
|
||||
%{?libkdnssd:Requires: libkdnssd-devel}
|
||||
|
|
@ -261,13 +267,12 @@ format for easy browsing
|
|||
%if "%{name}" != "kdelibs"
|
||||
%patch53 -p1 -b .drkonqi-kde4
|
||||
%endif
|
||||
%patch54 -p1 -b .flock-redefinition
|
||||
|
||||
%patch100 -p1 -b .kstandarddirs
|
||||
%patch101 -p1 -b .libtool-shlibext
|
||||
%patch102 -p0 -b .kde#137675
|
||||
|
||||
# upstream patches
|
||||
%patch200 -p1 -b .kate-regression
|
||||
|
||||
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
||||
|
||||
|
|
@ -620,6 +625,12 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 26 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-1
|
||||
- kde-3.5.10
|
||||
|
||||
* Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-18
|
||||
- fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
|
||||
|
||||
* Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-17
|
||||
- fix logic error in OnlyShowIn=KDE3 patch
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue