rev 9437 - in trunk/packages/kdegraphics/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Tue Feb 19 10:18:29 UTC 2008
Author: modax-guest
Date: 2008-02-19 10:18:04 +0000 (Tue, 19 Feb 2008)
New Revision: 9437
Added:
trunk/packages/kdegraphics/debian/patches/01_admin_cleanup.diff
trunk/packages/kdegraphics/debian/patches/02_makefile_am_cleanup.diff
Removed:
trunk/packages/kdegraphics/debian/patches/02_kpdf_branch_r761840.diff
trunk/packages/kdegraphics/debian/patches/03_kpdf_branch_r740624.diff
trunk/packages/kdegraphics/debian/patches/22_security_3.5.8-kdegraphics-kpdf.diff
Modified:
trunk/packages/kdegraphics/debian/changelog
trunk/packages/kdegraphics/debian/control
trunk/packages/kdegraphics/debian/control.in
trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
trunk/packages/kdegraphics/debian/rules
Log:
Prepared kdegraphics 3.5.9-1. Patch 01_ and 02_ added to satisfy dpkg-shlibdeps. It is as much as it's possible to do without --as-needed
Modified: trunk/packages/kdegraphics/debian/changelog
===================================================================
--- trunk/packages/kdegraphics/debian/changelog 2008-02-19 07:06:44 UTC (rev 9436)
+++ trunk/packages/kdegraphics/debian/changelog 2008-02-19 10:18:04 UTC (rev 9437)
@@ -1,5 +1,24 @@
-kdegraphics (4:3.5.8-3) UNRELEASED; urgency=low
+kdegraphics (4:3.5.9-1~pre2) unstable; urgency=low
+ +++ Changes by Modestas Vainius:
+
+ * New upstream release (3.5.9).
+ * Resync patches:
+ - 02_kpdf_branch_r761840.diff - removed, was taken from upstream.
+ - 03_kpdf_branch_r740624.diff - removed, was taken from upstream.
+ - 22_security_3.5.8-kdegraphics-kpdf.diff - removed, merge upstream.
+ * Tighten shlibs to 3.5.9 in debian/rules.
+ * Add new patches to make dpkg-shlibdeps more happy and to a lot of
+ undefined symbols in libraries:
+ - 01_admin_cleanup.diff - clean up $(LIB_QT) variable and patch libtool
+ to avoid useless dependencies when linking with static libraries.
+ - 02_makefile_am_clean.diff - many fixes to Makefile.am files all over the
+ place to resolve undefined and unused symbol errors.
+ * Remove PACKAGES_WITH_LIBS from debian/rules. It's no longer needed with
+ recent dpkg-shlibdeps.
+ * debian/control: use ${source:Upstream-Version} for dependency on
+ kdelibs4-dev.
+
* Update libkscan1 description. sane-> SANE. (Closes: #457834)
+++ Changes by Sune Vuorela:
@@ -15,7 +34,7 @@
* Add 03_kpdf_branch_r740624 patch (Closes: #459592)
- sscanf crashes on a NULL pointer so verify s is not empty.
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 30 Dec 2007 22:16:18 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 19 Feb 2008 12:05:56 +0200
kdegraphics (4:3.5.8-2) unstable; urgency=low
@@ -25,8 +44,10 @@
-- Ana Beatriz Guerrero Lopez <ana at debian.org> Sun, 11 Nov 2007 19:50:13 +0100
+
kdegraphics (4:3.5.8-1) unstable; urgency=low
+
* New upstream release.
+++ Changes by Francesco Pedrini:
@@ -55,6 +76,7 @@
-- Ana Beatriz Guerrero Lopez <ana at debian.org> Wed, 26 Sep 2007 11:15:28 +0200
+
kdegraphics (4:3.5.7-3) unstable; urgency=high
* Implement use of uploaders.mk and update uploaders.
Modified: trunk/packages/kdegraphics/debian/control
===================================================================
--- trunk/packages/kdegraphics/debian/control 2008-02-19 07:06:44 UTC (rev 9436)
+++ trunk/packages/kdegraphics/debian/control 2008-02-19 10:18:04 UTC (rev 9437)
@@ -2,8 +2,8 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Francesco Pedrini <francesco.pedrini at gmail.com>, Josh Metzler <joshdeb at metzlers.org>, Sune Vuorela <debian at pusling.com>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.6), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>, Francesco Pedrini <francesco.pedrini at gmail.com>, Modestas Vainius <modestas at vainius.eu>, Sune Vuorela <debian at pusling.com>
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 3.5.8), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/kdegraphics
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdegraphics
@@ -67,7 +67,7 @@
Package: kdegraphics-dev
Section: devel
Architecture: any
-Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), kdelibs4-dev (>= ${source:Upstream-Version})
Description: development files for the KDE graphics module
This package contains headers and other development files for the KDE
graphics module.
@@ -128,6 +128,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Suggests: khelpcenter
+Homepage: http://kgamma.berlios.de/index2.php
Description: gamma correction module for the KDE Control Center
KGamma is a KDE Control Center module for gamma calibration/correction
of XFree86. With proper gamma settings, your display (websites, images,
@@ -136,12 +137,11 @@
This package is part of KDE, as a component of the KDE graphics module.
See the 'kde' and 'kdegraphics' packages for more information.
.
- Homepage: http://kgamma.berlios.de/index2.php
Package: kghostview
Section: graphics
Architecture: any
-Depends: ${shlibs:Depends}, ghostscript-x
+Depends: ${shlibs:Depends}, gs
Suggests: khelpcenter
Provides: postscript-viewer, pdf-viewer
Description: PostScript viewer for KDE
@@ -185,6 +185,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Suggests: khelpcenter
+Homepage: http://kolourpaint.sourceforge.net
Description: a simple paint program for KDE
KolourPaint is a very simple paint program for KDE. It aims to be
conceptually simple to understand; providing a level of functionality
@@ -198,11 +199,8 @@
drawing lines become near impossible. Nor is it so simple that it lacks
essential features like Undo/Redo.
.
- Homepage: http://kolourpaint.sourceforge.net
- .
This package is part of KDE, as a component of the KDE graphics module.
See the 'kde' and 'kdegraphics' packages for more information.
-
Package: kooka
Section: graphics
@@ -210,6 +208,7 @@
Depends: ${shlibs:Depends}
Recommends: ocrad | gocr
Suggests: khelpcenter
+Homepage: http://kooka.kde.org/
Description: scanner program for KDE
Kooka is an open source GNU/Linux scan program based on SANE and
KScan library.
@@ -223,8 +222,6 @@
Install ocrad or gocr if you wish to enable optical character recognition
in kooka.
.
- Homepage: http://kooka.kde.org/
- .
This package is part of KDE, as a component of the KDE graphics module.
See the 'kde' and 'kdegraphics' packages for more information.
@@ -248,6 +245,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Suggests: khelpcenter, povray
+Homepage: http://www.kpovmodeler.org
Description: a graphical editor for povray scenes
KPovmodeler is KDE's graphical editor for povray scenes. KPovModeler is a
modeling and composition program for creating POV-Ray scenes in KDE.
@@ -261,12 +259,10 @@
kpovmodeler uses the povray package, currently available only in Debian's
non-free, unsupported repository.
.
- Homepage: http://www.kpovmodeler.org
- .
This package is part of KDE, as a component of the KDE graphics module.
See the 'kde' and 'kdegraphics' packages for more information.
+ .
-
Package: kruler
Section: graphics
Architecture: any
@@ -309,6 +305,7 @@
Architecture: any
Depends: ${shlibs:Depends}
Suggests: khelpcenter
+Homepage: http://kuickshow.sourceforge.net
Description: KDE image/slideshow viewer
KuickShow is an image browser/viewer with a nice filebrowser to select
images to be shown, slideshow support and the ability to display the
@@ -317,8 +314,6 @@
as the image, or fullscreen (which shrinks images too large to
display). KuickShow also has a slideshow mode.
.
- Homepage: http://kuickshow.sourceforge.net
- .
This package is part of KDE, as a component of the KDE graphics module.
See the 'kde' and 'kdegraphics' packages for more information.
@@ -353,7 +348,7 @@
Package: libkscan-dev
Section: libdevel
Architecture: any
-Depends: libkscan1 (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libkscan1 (= ${binary:Version}), kdelibs4-dev (>= ${source:Upstream-Version})
Description: development files for the KDE scanner library
This package contains development files for KDE's scanner library.
.
Modified: trunk/packages/kdegraphics/debian/control.in
===================================================================
--- trunk/packages/kdegraphics/debian/control.in 2008-02-19 07:06:44 UTC (rev 9436)
+++ trunk/packages/kdegraphics/debian/control.in 2008-02-19 10:18:04 UTC (rev 9437)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: @@@MAINTAINER@@@
Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 4:3.5.6), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, imlib11-dev, kdelibs4-dev (>= 3.5.8), libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-2-dev, libltdl3-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-qt-dev, libsane-dev (>> 1.0.15), libtiff4-dev, libtiff-tools, libusb-dev, sharutils, libxxf86vm-dev, xpdf-common, chrpath [powerpc]
Standards-Version: 3.7.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-kde/trunk/packages/kdegraphics
Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdegraphics
@@ -67,7 +67,7 @@
Package: kdegraphics-dev
Section: devel
Architecture: any
-Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: kghostview (= ${binary:Version}), kmrml (= ${binary:Version}), kpovmodeler (= ${binary:Version}), ksvg (= ${binary:Version}), kuickshow (= ${binary:Version}), kview (= ${binary:Version}), kviewshell (= ${binary:Version}), kdelibs4-dev (>= ${source:Upstream-Version})
Description: development files for the KDE graphics module
This package contains headers and other development files for the KDE
graphics module.
@@ -348,7 +348,7 @@
Package: libkscan-dev
Section: libdevel
Architecture: any
-Depends: libkscan1 (= ${binary:Version}), kdelibs4-dev (>= 4:3.5.8)
+Depends: libkscan1 (= ${binary:Version}), kdelibs4-dev (>= ${source:Upstream-Version})
Description: development files for the KDE scanner library
This package contains development files for KDE's scanner library.
.
Added: trunk/packages/kdegraphics/debian/patches/01_admin_cleanup.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/01_admin_cleanup.diff (rev 0)
+++ trunk/packages/kdegraphics/debian/patches/01_admin_cleanup.diff 2008-02-19 10:18:04 UTC (rev 9437)
@@ -0,0 +1,54 @@
+diff -uNr admin/acinclude.m4.in /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/acinclude.m4.in
+--- kde/admin/acinclude.m4.in 2008-02-19 03:20:35.000000000 +0200
++++ kde/admin/acinclude.m4.in 2008-02-19 01:31:24.000000000 +0200
+@@ -1613,6 +1613,11 @@
+ fi
+ done
+
++# Export just Qt libs in LIB_QT, "extended" version will be exported as LIB_QT_EXT
++LIB_QT_EXT="$LIB_QT"
++LIB_QT="$kde_int_qt"
++
++AC_SUBST(LIB_QT_EXT)
+ AC_SUBST(LIB_QT)
+ AC_SUBST(LIB_QPE)
+
+@@ -2696,7 +2701,7 @@
+ ],
+ [return (TIFFOpen( "", "r") == 0); ],
+ [
+- kde_cv_libtiff_$1="-l$1 $LIBJPEG $LIBZ"
++ kde_cv_libtiff_$1="-l$1"
+ ], [
+ kde_cv_libtiff_$1=no
+ ])
+diff -uNr admin/ltmain.sh /var/cache/pbuilder/build/cow.3429/tmp/buildd/kdegraphics-3.5.9/admin/ltmain.sh
+--- kde/admin/ltmain.sh 2008-02-19 03:20:35.000000000 +0200
++++ kde/admin/ltmain.sh 2008-02-19 03:16:14.000000000 +0200
+@@ -2377,16 +2377,16 @@
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- deplibs="$deplib $deplibs"
+- if test "X$duplicate_deps" = "Xyes" ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
++# tmp_libs=
++# for deplib in $dependency_libs; do
++# deplibs="$deplib $deplibs"
++# if test "X$duplicate_deps" = "Xyes" ; then
++# case "$tmp_libs " in
++# *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++# esac
++# fi
++# tmp_libs="$tmp_libs $deplib"
++# done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ exit $EXIT_FAILURE
Deleted: trunk/packages/kdegraphics/debian/patches/02_kpdf_branch_r761840.diff
Added: trunk/packages/kdegraphics/debian/patches/02_makefile_am_cleanup.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/02_makefile_am_cleanup.diff (rev 0)
+++ trunk/packages/kdegraphics/debian/patches/02_makefile_am_cleanup.diff 2008-02-19 10:18:04 UTC (rev 9437)
@@ -0,0 +1,643 @@
+--- kdegraphics-3.5.9/kmrml/kmrml/Makefile.am 2008-02-19 11:35:33.000000000 +0200
++++ kdegraphics-3.5.9/kmrml/kmrml/Makefile.am 2008-02-19 00:52:23.000000000 +0200
+@@ -9,13 +9,13 @@
+ kde_module_LTLIBRARIES = kio_mrml.la libkmrmlpart.la
+
+ kio_mrml_la_SOURCES = mrml.cpp
+-kio_mrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO)
++kio_mrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ kio_mrml_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+
+ libkmrmlpart_la_SOURCES = mrml_part.cpp mrml_view.cpp loader.cpp \
+ mrml_elements.cpp mrml_creator.cpp browser.cpp algorithmdialog.cpp \
+ collectioncombo.cpp algorithmcombo.cpp propertysheet.cpp
+-libkmrmlpart_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KPARTS)
++libkmrmlpart_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ libkmrmlpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
+
+ services_DATA = mrml.protocol mrml_part.desktop
+@@ -32,7 +32,7 @@
+ lib_LTLIBRARIES =
+ kdeinit_LTLIBRARIES = mrmlsearch.la
+
+-mrmlsearch_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KDECORE)
++mrmlsearch_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KDECORE) $(LIB_QT) -lDCOP
+ mrmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version
+ mrmlsearch_la_SOURCES = mrmlsearch.cpp
+
+--- kdegraphics-3.5.9/ksvg/impl/libs/libtext2path/src/Makefile.am 2008-02-19 11:29:19.000000000 +0200
++++ kdegraphics-3.5.9/ksvg/impl/libs/libtext2path/src/Makefile.am 2008-02-19 11:29:33.000000000 +0200
+@@ -7,4 +7,4 @@
+ libtext2path_include_HEADERS = BezierPath.h Glyph.h GlyphTracer.h
+
+ libtext2path_la_SOURCES = Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp GlyphTracer.cpp Converter.cpp QtUnicode.cpp
+-libtext2path_la_LDFLAGS = $(FRIBIDI_LIBS) $(FONTCONFIG_LIBS)
++libtext2path_la_LDFLAGS = $(FRIBIDI_LIBS) $(FONTCONFIG_LIBS) -lfreetype
+--- kdegraphics-3.5.9/kamera/kcontrol/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kamera/kcontrol/Makefile.am 2008-02-19 01:04:41.000000000 +0200
+@@ -3,7 +3,7 @@
+ kcm_kamera_la_SOURCES = kamera.cpp kameradevice.cpp kameraconfigdialog.cpp
+
+ kcm_kamera_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kcm_kamera_la_LIBADD = $(LIB_KIO) $(GPHOTO2_LIBS)
++kcm_kamera_la_LIBADD = $(GPHOTO2_LIBS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ INCLUDES= $(all_includes) $(GPHOTO2_INCS)
+
+ kcm_kamera_la_METASOURCES = AUTO
+--- kdegraphics-3.5.9/kamera/kioslave/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kamera/kioslave/Makefile.am 2008-02-19 01:06:22.000000000 +0200
+@@ -8,7 +8,7 @@
+ kde_module_LTLIBRARIES = kio_kamera.la
+
+ kio_kamera_la_SOURCES = kamera.cpp
+-kio_kamera_la_LIBADD = $(LIB_KIO) -lgphoto2
++kio_kamera_la_LIBADD = $(LIB_KIO) -lgphoto2 $(LIB_QT) $(LIB_KDECORE)
+ kio_kamera_la_LDFLAGS = $(all_libraries) $(GPHOTO2_LIBS) -module $(KDE_PLUGIN)
+
+ noinst_HEADERS = kamera.h
+--- kdegraphics-3.5.9/kdvi/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kdvi/Makefile.am 2008-02-19 01:16:15.000000000 +0200
+@@ -31,6 +31,7 @@
+
+ kdvipart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+ kdvipart_la_LIBADD = $(LIBFREETYPE_LIBS) -lkparts \
++ $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KDEPRINT) $(LIB_KIO) \
+ $(top_builddir)/kviewshell/libkmultipage.la
+
+ # Which sources should be compiled for squeeze.
+--- kdegraphics-3.5.9/kfaxview/libkfaximage/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfaxview/libkfaximage/Makefile.am 2008-02-19 00:43:23.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ lib_LTLIBRARIES = libkfaximage.la
+ libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
+-libkfaximage_la_LIBADD = $(LIB_KDECORE)
++libkfaximage_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
+ libkfaximage_la_SOURCES = kfaximage.cpp faxexpand.cpp faxinit.cpp
+
+ include_HEADERS = kfaximage.h
+--- kdegraphics-3.5.9/kfaxview/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfaxview/Makefile.am 2008-02-19 01:16:42.000000000 +0200
+@@ -23,7 +23,8 @@
+
+ kde_module_LTLIBRARIES = kfaxviewpart.la
+ kfaxviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kfaxviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libkfaximage/libkfaximage.la
++kfaxviewpart_la_LIBADD = -lkparts $(top_builddir)/kviewshell/libkmultipage.la libkfaximage/libkfaximage.la \
++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
+ kfaxviewpart_la_SOURCES = faxmultipage.cpp faxrenderer.cpp
+
+ partdir = $(kde_datadir)/kfaxview
+--- kdegraphics-3.5.9/kfile-plugins/bmp/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/bmp/Makefile.am 2008-02-19 00:54:01.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ kfile_bmp_la_SOURCES = kfile_bmp.cpp
+ kfile_bmp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_bmp_la_LIBADD = $(LIB_KSYCOCA)
++kfile_bmp_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/dds/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/dds/Makefile.am 2008-02-19 00:31:41.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ kfile_dds_la_SOURCES = kfile_dds.cpp
+ kfile_dds_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_dds_la_LIBADD = $(LIB_KSYCOCA)
++kfile_dds_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/dvi/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/dvi/Makefile.am 2008-02-19 00:32:21.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ kfile_dvi_la_SOURCES = kfile_dvi.cpp
+ kfile_dvi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_dvi_la_LIBADD = $(LIB_KIO)
++kfile_dvi_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/exr/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/exr/Makefile.am 2008-02-19 01:10:31.000000000 +0200
+@@ -13,7 +13,7 @@
+
+ kfile_exr_la_SOURCES = kfile_exr.cpp
+ kfile_exr_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_exr_la_LIBADD = $(LIB_KIO) $(LIB_EXR)
++kfile_exr_la_LIBADD = $(LIB_KIO) -lIlmImf $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/gif/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/gif/Makefile.am 2008-02-19 00:55:46.000000000 +0200
+@@ -12,7 +12,7 @@
+
+ kfile_gif_la_SOURCES = kfile_gif.cpp
+ kfile_gif_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_gif_la_LIBADD = $(LIB_KIO)
++kfile_gif_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/ico/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/ico/Makefile.am 2008-02-19 00:56:16.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ kfile_ico_la_SOURCES = kfile_ico.cpp
+ kfile_ico_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_ico_la_LIBADD = $(LIB_KSYCOCA)
++kfile_ico_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/jpeg/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/jpeg/Makefile.am 2008-02-19 00:56:08.000000000 +0200
+@@ -12,7 +12,7 @@
+
+ kfile_jpeg_la_SOURCES = kfile_jpeg.cpp exif.cpp kfile_setcomment.cpp
+ kfile_jpeg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_jpeg_la_LIBADD = $(LIB_KIO)
++kfile_jpeg_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/pcx/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/pcx/Makefile.am 2008-02-19 01:12:23.000000000 +0200
+@@ -9,7 +9,7 @@
+
+ kfile_pcx_la_SOURCES = kfile_pcx.cpp
+ kfile_pcx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_pcx_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
++kfile_pcx_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/pdf/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/pdf/Makefile.am 2008-02-19 01:07:08.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ kfile_pdf_la_SOURCES = kfile_pdf.cpp
+ kfile_pdf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_pdf_la_LIBADD = $(LIB_KIO) $(POPPLER_LIBS)
++kfile_pdf_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) -lpoppler-qt
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/png/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/png/Makefile.am 2008-02-19 00:38:03.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ kfile_png_la_SOURCES = kfile_png.cpp
+ kfile_png_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_png_la_LIBADD = $(LIB_KIO)
++kfile_png_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE) $(LIBZ)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/pnm/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/pnm/Makefile.am 2008-02-19 00:12:43.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ kfile_pnm_la_SOURCES = kfile_pnm.cpp
+ kfile_pnm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_pnm_la_LIBADD = $(LIB_KIO)
++kfile_pnm_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/ps/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/ps/Makefile.am 2008-02-19 00:45:27.000000000 +0200
+@@ -10,10 +10,10 @@
+
+ kfile_ps_la_SOURCES = kfile_ps.cpp
+ kfile_ps_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_ps_la_LIBADD = $(LIB_KIO) ../../kghostview/libdscparse.la
++kfile_ps_la_LIBADD = $(LIB_KIO) ../../kghostview/libdscparse.la $(LIB_KDECORE) $(LIB_QT)
+
+ gsthumbnail_la_SOURCES = gscreator.cpp
+-gsthumbnail_la_LIBADD = $(LIB_KDECORE) ../../kghostview/libdscparse.la
++gsthumbnail_la_LIBADD = $(LIB_QT) ../../kghostview/libdscparse.la
+ gsthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+ # let automoc handle all of the meta source files (moc)
+--- kdegraphics-3.5.9/kfile-plugins/raw/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/raw/Makefile.am 2008-02-19 00:31:55.000000000 +0200
+@@ -9,7 +9,7 @@
+ kde_module_LTLIBRARIES = kfile_raw.la
+
+ kfile_raw_la_SOURCES = kcamerarawplugin.cpp parse.c
+-kfile_raw_la_LIBADD = $(LIB_KIO)
++kfile_raw_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ kfile_raw_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+ # let automoc handle all of the meta source files (moc)
+--- kdegraphics-3.5.9/kfile-plugins/rgb/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/rgb/Makefile.am 2008-02-19 00:51:53.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ kfile_rgb_la_SOURCES = kfile_rgb.cpp
+ kfile_rgb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_rgb_la_LIBADD = $(LIB_KSYCOCA)
++kfile_rgb_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/tga/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/tga/Makefile.am 2008-02-19 00:50:22.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ kfile_tga_la_SOURCES = kfile_tga.cpp
+ kfile_tga_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_tga_la_LIBADD = $(LIB_KSYCOCA)
++kfile_tga_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/tiff/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/tiff/Makefile.am 2008-02-19 01:08:51.000000000 +0200
+@@ -9,7 +9,7 @@
+
+ kfile_tiff_la_SOURCES = kfile_tiff.cpp
+ kfile_tiff_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_tiff_la_LIBADD = $(LIB_KIO) $(LIBTIFF)
++kfile_tiff_la_LIBADD = $(LIB_KIO) $(LIBTIFF) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/xbm/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/xbm/Makefile.am 2008-02-19 00:57:59.000000000 +0200
+@@ -10,7 +10,7 @@
+
+ kfile_xbm_la_SOURCES = kfile_xbm.cpp
+ kfile_xbm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_xbm_la_LIBADD = $(LIB_KSYCOCA)
++kfile_xbm_la_LIBADD = $(LIB_KSYCOCA) $(LIB_QT) $(LIB_KDECORE)
+
+ # let automoc handle all of the meta source files (moc)
+ METASOURCES = AUTO
+--- kdegraphics-3.5.9/kfile-plugins/xpm/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kfile-plugins/xpm/Makefile.am 2008-02-19 00:55:56.000000000 +0200
+@@ -9,7 +9,7 @@
+
+ kfile_xpm_la_SOURCES = kfile_xpm.cpp
+ kfile_xpm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kfile_xpm_la_LIBADD = $(LIB_KIO)
++kfile_xpm_la_LIBADD = $(LIB_KIO) $(LIB_QT) $(LIB_KDECORE)
+ kfile_xpm_la_METASOURCES = kfile_xpm.moc
+
+ # let automoc handle all of the meta source files (moc)
+--- kdegraphics-3.5.9/kgamma/kcmkgamma/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kgamma/kcmkgamma/Makefile.am 2008-02-19 00:25:49.000000000 +0200
+@@ -5,7 +5,7 @@
+ kcm_kgamma_la_METASOURCES=AUTO
+ kcm_kgamma_la_SOURCES = xf86configpath.cpp xvidextwrap.cpp displaynumber.cpp \
+ gammactrl.cpp kgamma.cpp
+-kcm_kgamma_la_LIBADD = $(LIBVM) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
++kcm_kgamma_la_LIBADD = $(LIBVM) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIB_X11)
+ kcm_kgamma_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+ SUBDIRS = pics
+--- kdegraphics-3.5.9/kghostview/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kghostview/Makefile.am 2008-02-19 01:17:49.000000000 +0200
+@@ -10,10 +10,11 @@
+ noinst_LTLIBRARIES = libdscparse.la
+
+ libkghostviewlib_la_LDFLAGS = $(all_libraries)
+-libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint libdscparse.la
++libkghostviewlib_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KDEPRINT) libdscparse.la \
++ $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_X11)
+
+ libkghostviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-libkghostviewpart_la_LIBADD = libkghostviewlib.la
++libkghostviewpart_la_LIBADD = libkghostviewlib.la $(LIB_QT)
+
+ # Check "make final" after making changes to the following line!!
+ libkghostviewlib_la_SOURCES = kgvshell.cpp kgvdocument.cpp kgv_miniwidget.cpp \
+--- kdegraphics-3.5.9/kmrml/kmrml/kcontrol/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kmrml/kmrml/kcontrol/Makefile.am 2008-02-19 00:56:41.000000000 +0200
+@@ -4,7 +4,7 @@
+
+ kcm_kmrml_la_SOURCES = kcmkmrml.cpp mainpage.cpp indexer.cpp serverconfigwidget.ui indexcleaner.cpp
+ kcm_kmrml_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
+-kcm_kmrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO)
++kcm_kmrml_la_LIBADD = $(LIB_KMRMLSTUFF) $(LIB_KIO) $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE) -lDCOP
+ INCLUDES= -I$(top_srcdir)/kmrml/kmrml/lib $(all_includes)
+
+ kcm_kmrml_la_METASOURCES = AUTO
+--- kdegraphics-3.5.9/kmrml/kmrml/server/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kmrml/kmrml/server/Makefile.am 2008-02-19 01:20:05.000000000 +0200
+@@ -4,7 +4,8 @@
+ kded_daemonwatcher_la_SOURCES = watcher.cpp watcher.skel
+ # watcher.stub
+ kded_daemonwatcher_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kded_daemonwatcher_la_LIBADD = $(LIB_KSYCOCA) $(LIB_KDEUI)
++kded_daemonwatcher_la_LIBADD = $(LIB_KDEUI) \
++ $(LIB_QT) $(LIB_KDECORE) -lDCOP -lkdeinit_kded $(LIB_QT) $(LIB_KDECORE)
+
+ METASOURCES = AUTO
+
+--- kdegraphics-3.5.9/kooka/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kooka/Makefile.am 2008-02-19 01:22:53.000000000 +0200
+@@ -16,7 +16,7 @@
+ kocrocrad.cpp
+ # pagesetup.cpp
+
+-kooka_LDADD = $(LIB_KFILE) -lkdeprint -lktexteditor $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB) $(LIB_KSPELL)
++kooka_LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) $(LIBTIFF) $(top_builddir)/libkscan/libkscan.la $(KADMOS_LIB)
+ kooka_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+
+ INCLUDES = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC)
+--- kdegraphics-3.5.9/kpdf/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kpdf/Makefile.am 2008-02-19 00:34:21.000000000 +0200
+@@ -19,7 +19,9 @@
+ libkpdfpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+ libkpdfpart_la_LIBADD = xpdf/xpdf/libxpdf.la conf/libkpdfconf.la \
+ core/libkpdfcore.la ui/libkpdfui.la $(LIB_KPARTS) \
+- $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KUTILS) -lm
++ $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KUTILS) -lm \
++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx -lDCOP \
++ -lkwalletclient -lfreetype $(XFT_LIBS) $(LIBPAPER_LIBS)
+
+ partdesktopdir = $(kde_servicesdir)
+ partdesktop_DATA = kpdf_part.desktop
+--- kdegraphics-3.5.9/kpovmodeler/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kpovmodeler/Makefile.am 2008-02-19 01:32:30.000000000 +0200
+@@ -110,7 +110,8 @@
+ pmpartiface.skel
+
+ libkpovmodeler_la_LDFLAGS = $(all_libraries) -version-info 0:0:0 -no-undefined $(LIBFREETYPE_RPATH)
+-libkpovmodeler_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KPARTS) $(GLLIB) -lXmu -lXi
++libkpovmodeler_la_LIBADD = -lfreetype $(LIB_KPARTS) $(GLLIB) -lXmu \
++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lDCOP
+ METASOURCES = AUTO
+
+ noinst_HEADERS = pmpart.h pmfactory.h pmview.h pmshell.h pmobjectdrag.h \
+@@ -218,7 +219,7 @@
+ kde_module_LTLIBRARIES = libkpovmodelerpart.la
+
+ libkpovmodelerpart_la_SOURCES = dummy.cpp
+-libkpovmodelerpart_la_LIBADD = libkpovmodeler.la
++libkpovmodelerpart_la_LIBADD =
+ libkpovmodelerpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+ ####
+--- kdegraphics-3.5.9/ksvg/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/ksvg/Makefile.am 2008-02-19 01:33:09.000000000 +0200
+@@ -6,7 +6,8 @@
+ libksvg_la_LDFLAGS = -version-info 0:1:0 -no-undefined $(all_libraries)
+ libksvg_la_LIBADD = dom/libksvgdom.la impl/libksvgdomimpl.la core/libksvgcore.la ecma/libksvgecma.la \
+ $(LCMS_LIBS) impl/libs/xrgbrender/libksvgxrgbrender.la impl/libs/libtext2path/src/libtext2path.la \
+- impl/libs/art_support/libksvgart.la -lkjs $(LIB_KHTML) $(LIBART_LIBS) $(FREETYPE_LIBS) $(FONTCONFIG_LIBS)
++ impl/libs/art_support/libksvgart.la -lkjs $(LIB_KHTML) $(LIBART_LIBS) \
++ $(LIB_KDECORE) $(LIB_QT) $(LIB_KDEUI) $(LIB_KDEUI) $(LIB_X11) $(LIB_KIO)
+
+ INCLUDES = -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl $(all_includes)
+
+--- kdegraphics-3.5.9/ksvg/plugin/backends/libart/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/ksvg/plugin/backends/libart/Makefile.am 2008-02-19 00:42:03.000000000 +0200
+@@ -2,7 +2,8 @@
+
+ libksvgrendererlibart_la_SOURCES = BezierPathLibart.cpp GlyphTracerLibart.cpp LibartCanvas.cpp LibartCanvasItems.cpp LibartCanvasFactory.cpp
+ libksvgrendererlibart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-libksvgrendererlibart_la_LIBADD = ../../../libksvg.la
++libksvgrendererlibart_la_LIBADD = ../../../libksvg.la $(LIB_QT) $(LIB_KDECORE) \
++ $(LIB_KHTML) $(LIBART_LIBS) ../../../impl/libs/libtext2path/src/libtext2path.la
+ libksvgrendererlibart_la_METASOURCES = AUTO
+
+ kde_services_DATA = ksvglibartcanvas.desktop
+--- kdegraphics-3.5.9/ksvg/plugin/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/ksvg/plugin/Makefile.am 2008-02-19 00:48:02.000000000 +0200
+@@ -7,7 +7,9 @@
+ kde_module_LTLIBRARIES = libksvgplugin.la svgthumbnail.la
+
+ libksvgplugin_la_SOURCES = ksvg_plugin.cpp ksvg_factory.cpp ksvg_widget.cpp
+-libksvgplugin_la_LIBADD = ../libksvg.la
++libksvgplugin_la_LIBADD = ../libksvg.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \
++ $(LIB_KPARTS) $(LIB_KHTML) $(LIB_KIO) \
++ ../impl/libs/libtext2path/src/libtext2path.la
+ libksvgplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+
+ ksvginclude_HEADERS = ksvg_plugin.h
+@@ -16,7 +18,7 @@
+ kde_services_DATA = ksvgplugin.desktop
+
+ svgthumbnail_la_SOURCES = svgcreator.cpp
+-svgthumbnail_la_LIBADD = ../libksvg.la
++svgthumbnail_la_LIBADD = ../libksvg.la $(LIB_QT) $(LIB_KDECORE)
+ svgthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+ services_DATA = svgthumbnail.desktop
+--- kdegraphics-3.5.9/kuickshow/src/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kuickshow/src/Makefile.am 2008-02-19 01:34:59.000000000 +0200
+@@ -10,7 +10,8 @@
+ METASOURCES = AUTO
+
+ kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB)
++kuickshow_la_LIBADD = $(LIB_KDEPRINT) -lImlib $(LIB_QT) \
++ $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_X11)
+ kuickshow_la_SOURCES = kuickshow.cpp \
+ aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp \
+ defaultswidget.cpp imagewindow.cpp kuickdata.cpp \
+--- kdegraphics-3.5.9/kview/config/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/config/Makefile.am 2008-02-19 00:44:01.000000000 +0200
+@@ -9,7 +9,7 @@
+
+ kcm_kviewgeneralconfig_la_SOURCES = kviewconfmodules.cpp
+ kcm_kviewgeneralconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kcm_kviewgeneralconfig_la_LIBADD = $(LIB_KDEUI)
++kcm_kviewgeneralconfig_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+
+ kcm_kviewgeneralconfig_DATA = kviewgeneralconfig.desktop
+ kcm_kviewgeneralconfigdir = $(kde_servicesdir)/kconfiguredialog
+--- kdegraphics-3.5.9/kview/config/plugins/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/config/plugins/Makefile.am 2008-02-19 00:58:29.000000000 +0200
+@@ -8,7 +8,7 @@
+
+ kcm_kviewpluginsconfig_la_SOURCES = kviewpluginsconfig.cpp
+ kcm_kviewpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kcm_kviewpluginsconfig_la_LIBADD = $(LIB_KUTILS)
++kcm_kviewpluginsconfig_la_LIBADD = $(LIB_KUTILS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+
+ kcm_kviewpluginsconfig_DATA = kviewpluginsconfig.desktop
+ kcm_kviewpluginsconfigdir = $(kde_servicesdir)/kconfiguredialog
+--- kdegraphics-3.5.9/kview/kimageviewer/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/kimageviewer/Makefile.am 2008-02-19 00:53:45.000000000 +0200
+@@ -6,7 +6,7 @@
+
+ libkimageviewer_la_SOURCES = canvas.cpp viewer.cpp
+ libkimageviewer_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 0:0
+-libkimageviewer_la_LIBADD = $(LIB_KPARTS)
++libkimageviewer_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDEUI)
+
+ INCLUDES = $(all_includes)
+
+--- kdegraphics-3.5.9/kview/kviewcanvas/config/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/kviewcanvas/config/Makefile.am 2008-02-19 00:33:09.000000000 +0200
+@@ -5,7 +5,7 @@
+
+ kcm_kviewcanvasconfig_la_SOURCES = generalconfigwidget.ui confmodules.cpp
+ kcm_kviewcanvasconfig_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
+-kcm_kviewcanvasconfig_la_LIBADD = $(LIB_KDEUI)
++kcm_kviewcanvasconfig_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
+
+ kcm_kviewcanvasconfig_DATA = kviewcanvasconfig.desktop
+ kcm_kviewcanvasconfigdir = $(kde_servicesdir)/kconfiguredialog
+--- kdegraphics-3.5.9/kview/kviewcanvas/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/kviewcanvas/Makefile.am 2008-02-19 01:37:07.000000000 +0200
+@@ -7,8 +7,8 @@
+
+ libkviewcanvas_la_SOURCES = kimageholder.cpp kimagecanvas.cpp
+ libkviewcanvas_la_LDFLAGS = $(all_libraries) -module -no-undefined -avoid-version
+-libkviewcanvas_la_LIBADD = $(LIB_KPARTS) $(LIB_KDEPRINT) $(LIB_KUTILS) \
+- $(top_builddir)/kview/kimageviewer/libkimageviewer.la
++libkviewcanvas_la_LIBADD = $(LIB_KUTILS) $(top_builddir)/kview/kimageviewer/libkimageviewer.la \
++ $(LIB_QT) $(LIB_KDECORE) -lkdefx
+
+ METASOURCES = AUTO
+
+--- kdegraphics-3.5.9/kview/kviewviewer/config/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/kviewviewer/config/Makefile.am 2008-02-19 00:44:30.000000000 +0200
+@@ -8,7 +8,7 @@
+
+ kcm_kviewviewerpluginsconfig_la_SOURCES = kviewviewerpluginsconfig.cpp
+ kcm_kviewviewerpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+-kcm_kviewviewerpluginsconfig_la_LIBADD = $(LIB_KUTILS)
++kcm_kviewviewerpluginsconfig_la_LIBADD = $(LIB_KUTILS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+
+ kcm_kviewviewerpluginsconfig_DATA = kviewviewerpluginsconfig.desktop
+ kcm_kviewviewerpluginsconfigdir = $(kde_servicesdir)/kconfiguredialog
+--- kdegraphics-3.5.9/kview/kviewviewer/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/kviewviewer/Makefile.am 2008-02-19 00:53:29.000000000 +0200
+@@ -8,7 +8,8 @@
+ libkviewviewer_la_SOURCES = printimagesettings.ui imagesettings.cpp kviewkonqextension.cpp kviewviewer.cpp
+ libkviewviewer_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
+ libkviewviewer_la_LIBADD = $(LIB_KDEPRINT) $(LIB_KUTILS) \
+- $(top_builddir)/kview/kimageviewer/libkimageviewer.la
++ $(top_builddir)/kview/kimageviewer/libkimageviewer.la \
++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(LIB_KIO)
+
+ METASOURCES = AUTO
+
+--- kdegraphics-3.5.9/kview/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/Makefile.am 2008-02-19 00:48:35.000000000 +0200
+@@ -12,7 +12,7 @@
+
+ kview_la_SOURCES = kview.cpp main.cpp
+ kview_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module -avoid-version
+-kview_la_LIBADD = $(LIB_KPARTS) $(LIB_KUTILS)
++kview_la_LIBADD = $(LIB_KPARTS) $(LIB_KUTILS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+
+ xdg_apps_DATA = kview.desktop
+
+--- kdegraphics-3.5.9/kview/modules/browser/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/modules/browser/Makefile.am 2008-02-19 01:35:42.000000000 +0200
+@@ -3,7 +3,8 @@
+ kde_module_LTLIBRARIES = kview_browserplugin.la
+
+ kview_browserplugin_la_SOURCES = kmyfileitemlist.cpp kviewbrowser.cpp
+-kview_browserplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint
++kview_browserplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) \
++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ kview_browserplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+ plugdir = $(kde_datadir)/kviewviewer/kpartplugins
+--- kdegraphics-3.5.9/kview/modules/effects/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/modules/effects/Makefile.am 2008-02-19 01:36:11.000000000 +0200
+@@ -3,7 +3,7 @@
+ kde_module_LTLIBRARIES = kview_effectsplugin.la
+
+ kview_effectsplugin_la_SOURCES = kvieweffects.cpp
+-kview_effectsplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint
++kview_effectsplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
+ kview_effectsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+ plugdir = $(kde_datadir)/kview/kpartplugins
+--- kdegraphics-3.5.9/kview/modules/presenter/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/modules/presenter/Makefile.am 2008-02-19 00:17:19.000000000 +0200
+@@ -5,7 +5,7 @@
+ kde_module_LTLIBRARIES = kview_presenterplugin.la
+
+ kview_presenterplugin_la_SOURCES = imagelistitem.cpp imagelistdialog.ui kviewpresenter.cpp
+-kview_presenterplugin_la_LIBADD = $(LIB_KIO) $(LIB_KPARTS)
++kview_presenterplugin_la_LIBADD = $(LIB_KIO) $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ kview_presenterplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+ plugdir = $(kde_datadir)/kview/kpartplugins
+--- kdegraphics-3.5.9/kview/modules/scanner/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/modules/scanner/Makefile.am 2008-02-19 01:36:19.000000000 +0200
+@@ -3,7 +3,7 @@
+ kde_module_LTLIBRARIES = kview_scannerplugin.la
+
+ kview_scannerplugin_la_SOURCES = kviewscanner.cpp
+-kview_scannerplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) -lkdeprint
++kview_scannerplugin_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+ kview_scannerplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+
+ plugdir = $(kde_datadir)/kview/kpartplugins
+--- kdegraphics-3.5.9/kview/photobook/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/kview/photobook/Makefile.am 2008-02-19 00:59:21.000000000 +0200
+@@ -6,7 +6,7 @@
+ libphotobook_la_SOURCES = photobook.cpp
+
+ libphotobook_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
+-libphotobook_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS)
++libphotobook_la_LIBADD = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+
+ partrcdir = $(kde_servicesdir)
+ partrc_DATA = photobook.desktop
+--- kdegraphics-3.5.9/kviewshell/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kviewshell/Makefile.am 2008-02-19 00:59:02.000000000 +0200
+@@ -18,7 +18,8 @@
+ optionDialogGUIWidget_base.ui optionDialogAccessibilityWidget.ui simplePageSize.cpp
+
+ kviewerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-kviewerpart_la_LIBADD = ./libifaces.la $(LIB_KFILE) -lkparts
++kviewerpart_la_LIBADD = ./libifaces.la $(LIB_KFILE) -lkparts \
++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
+
+ libkmultipage_la_SOURCES = kmultipage.cpp pageView.cpp marklist.cpp kmultipageInterface.skel \
+ units.cpp pageSize.cpp simplePageSize.cpp renderedDocumentPage.cpp renderedDocumentPagePixmap.cpp \
+@@ -30,11 +31,12 @@
+ kde_kcfg_DATA = kviewshell.kcfg
+
+ libkmultipage_la_LDFLAGS = $(all_libraries)
+-libkmultipage_la_LIBADD = $(LIB_KFILE) -lkdeprint -lkparts
++libkmultipage_la_LIBADD = $(LIB_KFILE) $(LIB_KDEPRINT) $(LIB_KPARTS) \
++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP -lkdefx
+
+ emptymultipagepart_la_SOURCES = empty_multipage.cpp emptyRenderer.cpp
+ emptymultipagepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-emptymultipagepart_la_LIBADD = -lkparts libkmultipage.la
++emptymultipagepart_la_LIBADD = -lkparts libkmultipage.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lDCOP
+
+ libkviewshell_la_SOURCES = kviewshell.cpp
+
+--- kdegraphics-3.5.9/kviewshell/plugins/djvu/Makefile.am 2008-02-18 15:49:33.000000000 +0200
++++ kdegraphics-3.5.9/kviewshell/plugins/djvu/Makefile.am 2008-02-19 00:57:32.000000000 +0200
+@@ -18,7 +18,8 @@
+
+ kde_module_LTLIBRARIES = djvuviewpart.la
+ djvuviewpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+-djvuviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libdjvu/libdjvu.la
++djvuviewpart_la_LIBADD = -lkdeprint -lkparts $(top_builddir)/kviewshell/libkmultipage.la libdjvu/libdjvu.la \
++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) -lDCOP
+ djvuviewpart_la_SOURCES = djvumultipage.cpp djvurenderer.cpp kprintDialogPage_DJVUpageoptions.cpp \
+ kprintDialogPage_DJVUconversionoptions.cpp kprintDialogPage_DJVUconversionoptions_basewidget.ui \
+ pageRangeWidget_base.ui pageRangeWidget.cpp \
+--- kdegraphics-3.5.9/libkscan/Makefile.am 2008-02-18 15:49:32.000000000 +0200
++++ kdegraphics-3.5.9/libkscan/Makefile.am 2008-02-19 00:51:34.000000000 +0200
+@@ -19,7 +19,8 @@
+
+
+ libkscan_la_LDFLAGS = $(all_libraries) $(LIBSANE_LDFLAGS) -no-undefined -version-info 1:0
+-libkscan_la_LIBADD = $(LIBSANE_LIBS) $(LIB_KFILE)
++libkscan_la_LIBADD = $(LIBSANE_LIBS) $(LIB_KFILE) \
++ $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx
+
+ kde_services_DATA = scanservice.desktop
+
Deleted: trunk/packages/kdegraphics/debian/patches/03_kpdf_branch_r740624.diff
Deleted: trunk/packages/kdegraphics/debian/patches/22_security_3.5.8-kdegraphics-kpdf.diff
Modified: trunk/packages/kdegraphics/debian/patches/98_buildprep.diff
===================================================================
Modified: trunk/packages/kdegraphics/debian/rules
===================================================================
--- trunk/packages/kdegraphics/debian/rules 2008-02-19 07:06:44 UTC (rev 9436)
+++ trunk/packages/kdegraphics/debian/rules 2008-02-19 10:18:04 UTC (rev 9437)
@@ -7,16 +7,13 @@
DEB_DH_STRIP_ARGS := --dbg-package=kdegraphics-dbg
-PACKAGES_WITH_LIBS := kfaxview kghostview kmrml kpovmodeler ksvg \
- kuickshow kview kviewshell libkscan1
+DEB_DH_MAKESHLIBS_ARGS_kghostview := -V'kghostview (>= 4:3.5.9-1)'
+DEB_DH_MAKESHLIBS_ARGS_kpovmodeler := -V'kpovmodeler (>= 4:3.5.9-1)'
+DEB_DH_MAKESHLIBS_ARGS_ksvg := -V'ksvg (>= 4:3.5.9-1)'
+DEB_DH_MAKESHLIBS_ARGS_kview := -V'kview (>= 4:3.5.9-1)'
+DEB_DH_MAKESHLIBS_ARGS_kviewshell := -V'kviewshell (>= 4:3.5.9-1)'
+DEB_DH_MAKESHLIBS_ARGS_libkscan1 := -V'libkscan1 (>= 4:3.5.9-1)'
-DEB_DH_MAKESHLIBS_ARGS_kghostview := -V'kghostview (>= 4:3.5.5-1)'
-DEB_DH_MAKESHLIBS_ARGS_kpovmodeler := -V'kpovmodeler (>= 4:3.5.5-1)'
-DEB_DH_MAKESHLIBS_ARGS_ksvg := -V'ksvg (>= 4:3.5.5-1)'
-DEB_DH_MAKESHLIBS_ARGS_kview := -V'kview (>= 4:3.5.5-1)'
-DEB_DH_MAKESHLIBS_ARGS_kviewshell := -V'kviewshell (>= 4:3.5.5-1)'
-DEB_DH_MAKESHLIBS_ARGS_libkscan1 := -V'libkscan1 (>= 4:3.5.5-1)'
-
binary-post-install/kuickshow::
ifeq ($(DEB_HOST_ARCH), powerpc)
chrpath -d -k debian/kuickshow/usr/lib/libkdeinit_kuickshow.so
More information about the pkg-kde-commits
mailing list