[20188] trunk/dports/kde/kdegraphics3
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 27 11:22:26 PDT 2006
Revision: 20188
http://trac.macosforge.org/projects/macports/changeset/20188
Author: takanori at macports.org
Date: 2006-10-27 11:22:26 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
Version 3.5.4.
Modified Paths:
--------------
trunk/dports/kde/kdegraphics3/Portfile
trunk/dports/kde/kdegraphics3/files/CompileScript.sh
trunk/dports/kde/kdegraphics3/files/InstallScript.sh
trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch
Modified: trunk/dports/kde/kdegraphics3/Portfile
===================================================================
--- trunk/dports/kde/kdegraphics3/Portfile 2006-10-27 18:22:19 UTC (rev 20187)
+++ trunk/dports/kde/kdegraphics3/Portfile 2006-10-27 18:22:26 UTC (rev 20188)
@@ -1,62 +1,61 @@
# $Id$
-#Synced with Fink, Version 3.5.1-1023
+#Synced with Fink, Version 3.5.4-1021
PortSystem 1.0
name kdegraphics3
-version 3.5.1
-revision 1
-set kdeadmin kde-admindir-3.5.1
+version 3.5.4
+set kdeadmin kde-admindir-252
categories kde
maintainers ben at macports.org takanori at macports.org
description KDE graphics. \
- NB No KDE sound support.
+ NB No KDE sound support.
+long_description ${description}
platforms darwin
-master_sites opendarwin::kde351 \
+homepage http://www.kde.org/
+master_sites opendarwin::kde354 \
opendarwin::admin
# kde:stable/${version}/src
# http://ranger.befunk.com/fink/:admin
-extract.suffix .tar.bz2
use_bzip2 yes
distname kdegraphics-${version}
-distfiles ${distname}.tar.bz2:kde351 \
+distfiles ${distname}.tar.bz2:kde354 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
- port:automake
-depends_lib port:kdebase3 \
- port:sane-backends \
- port:fribidi \
- port:lcms \
+ port:unsermake
+depends_lib port:fribidi \
port:imlib \
- port:xpdf \
- port:libusb
-#poppler-qt3
+ port:kdebase3 \
+ port:lcms \
+ port:libusb \
+ port:sane-backends \
+ port:xpdf
+# bin:tex:teTeX
+# port:libwww
+# port:poppler-qt3
-checksums ${distname}.tar.bz2 md5 2cd1c5348b7df46cf7f9d91e1dbfebd2 \
- ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
-extract.only ${distname}.tar.bz2
-post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+checksums ${distname}.tar.bz2 md5 de1f6d0597235f52186aaeeaabe7dc08 \
+ ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
+extract.only ${distname}.tar.bz2
+post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+
patchfiles kdegraphics3.patch dp01.patch
patch {
cd ${worksrcpath}
foreach file $patchfiles {
- system "sed -e 's, at FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+ system "sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
}
+ system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
}
-post-patch {
- reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
- reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch {
+ reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
- reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
- foreach file [glob ${worksrcpath}/admin/*] {
- reinplace "s|-O2|-Os|g" $file
- reinplace "s|doc/HTML|doc/kde|g" $file
- reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
- }
+ reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
+ reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
foreach file {CompileScript.sh InstallScript.sh} {
- file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+ file copy ${filespath}/${file} ${worksrcpath}
reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
@@ -68,17 +67,13 @@
}
}
-configure.args --without-kamera --with-imlib-config=${prefix}/bin --with-distribution='DarwinPorts/Mac OS X' --without-arts
+configure.args --without-kamera --with-imlib-config=${prefix}/bin --with-distribution='MacPorts/Mac OS X' --without-arts
configure {}
build { system "cd ${worksrcpath} && ./CompileScript.sh" }
destroot { system "cd ${worksrcpath} && ./InstallScript.sh" }
-post-destroot {
+post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog INSTALL README ${destroot}${prefix}/share/doc/${name}
}
-
-platform darwin 6 {
- depends_lib-append lib:libdl:dlcompat
-}
Modified: trunk/dports/kde/kdegraphics3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdegraphics3/files/CompileScript.sh 2006-10-27 18:22:19 UTC (rev 20187)
+++ trunk/dports/kde/kdegraphics3/files/CompileScript.sh 2006-10-27 18:22:26 UTC (rev 20188)
@@ -1,15 +1,8 @@
#!/bin/sh -e
- export HOME=/tmp
- export PREFIX="%p"
+ export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
- export lt_cv_sys_max_cmd_len=65536
-#unsermake
- export UNSERMAKE="no"
-
- export CC=gcc CXX=g++
-
./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
- ./build-helper.sh make %N %v %r make all all_libraries="$ALL_LIBRARIES"
+ ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS
Modified: trunk/dports/kde/kdegraphics3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdegraphics3/files/InstallScript.sh 2006-10-27 18:22:19 UTC (rev 20187)
+++ trunk/dports/kde/kdegraphics3/files/InstallScript.sh 2006-10-27 18:22:26 UTC (rev 20188)
@@ -1,13 +1,10 @@
#!/bin/sh -e
- export PREFIX="%p"
+ export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
-#darwinports
- export UNSERMAKE="no"
+ ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
- ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
-
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
touch %i/share/doc/installed-packages/%N-base
Modified: trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch
===================================================================
--- trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch 2006-10-27 18:22:19 UTC (rev 20187)
+++ trunk/dports/kde/kdegraphics3/files/kdegraphics3.patch 2006-10-27 18:22:26 UTC (rev 20188)
@@ -1,5 +1,6 @@
---- kdegraphics-3.5.0/kcoloredit/Makefile.am 2005-09-10 04:18:59.000000000 -0400
-+++ kdegraphics-3.5.0-new/kcoloredit/Makefile.am 2005-11-22 13:52:45.000000000 -0500
+
+--- kdegraphics-3.5.4/kcoloredit/Makefile.am 2006-07-22 04:10:29.000000000 -0400
++++ kdegraphics-3.5.4-new/kcoloredit/Makefile.am 2006-07-31 01:04:48.000000000 -0400
@@ -1,21 +1,24 @@
INCLUDES = $(all_includes)
@@ -8,13 +9,13 @@
texteditselection.cpp gradientselection.cpp colorselector.cpp \
kxycolorselector.cpp paletteview.cpp paletteviewscrolledarea.cpp \
editablestreamhistory.cpp color.cpp palette.cpp loadpalettedlg.cpp \
- kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
+ kcoloreditview.cpp kcoloreditdoc.cpp kcoloredit.cpp main.cpp
-kcoloredit_METASOURCES = AUTO
-kcoloredit_LDADD = $(LIB_KDEUI) $(LIB_KFILE)
-kcoloredit_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kcoloredit_la_METASOURCES = AUTO
+kcoloredit_la_LIBADD = $(LIB_KDEUI) $(LIB_KFILE)
-+kcoloredit_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
++kcoloredit_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
rcdir = $(kde_datadir)/kcoloredit
rc_DATA = kcoloreditui.rc
@@ -24,17 +25,17 @@
-kcolorchooser_LDADD = $(LIB_KDEUI)
-kcolorchooser_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+bin_PROGRAMS =
-+lib_LTLIBRARIES =
++lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = kcoloredit.la kcolorchooser.la
+
+kcolorchooser_la_SOURCES = kcolorchooser.cpp
+kcolorchooser_la_LIBADD = $(LIB_KDEUI)
-+kcolorchooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
++kcolorchooser_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_PLUGIN)
noinst_HEADERS = color.h colorselector.h editablestreamhistory.h \
gradientselection.h imageselection.h kcoloredit.h kcoloreditdoc.h \
---- kdegraphics-3.5.0/kcoloredit/kcolorchooser.cpp 2005-09-10 04:18:59.000000000 -0400
-+++ kdegraphics-3.5.0-new/kcoloredit/kcolorchooser.cpp 2005-11-22 13:52:45.000000000 -0500
+--- kdegraphics-3.5.4/kcoloredit/kcolorchooser.cpp 2005-09-10 04:18:59.000000000 -0400
++++ kdegraphics-3.5.4-new/kcoloredit/kcolorchooser.cpp 2006-07-31 01:03:32.000000000 -0400
@@ -41,7 +41,7 @@
KCmdLineLastOption
};
@@ -44,8 +45,8 @@
{
KLocale::setMainCatalogue("kdelibs");
KAboutData aboutData( "kcolorchooser", I18N_NOOP("KColorChooser"),
---- kdegraphics-3.5.0/kcoloredit/main.cpp 2005-09-10 04:18:59.000000000 -0400
-+++ kdegraphics-3.5.0-new/kcoloredit/main.cpp 2005-11-22 13:52:45.000000000 -0500
+--- kdegraphics-3.5.4/kcoloredit/main.cpp 2005-09-10 04:18:59.000000000 -0400
++++ kdegraphics-3.5.4-new/kcoloredit/main.cpp 2006-07-31 01:03:32.000000000 -0400
@@ -34,7 +34,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
@@ -55,8 +56,8 @@
{
KAboutData aboutData( "kcoloredit", I18N_NOOP("KColorEdit"),
---- kdegraphics-3.5.0/kdvi/Makefile.am 2005-09-10 04:18:58.000000000 -0400
-+++ kdegraphics-3.5.0-new/kdvi/Makefile.am 2005-11-22 13:52:45.000000000 -0500
+--- kdegraphics-3.5.4/kdvi/Makefile.am 2005-09-10 04:18:58.000000000 -0400
++++ kdegraphics-3.5.4-new/kdvi/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -1,11 +1,13 @@
# set the include path for X, qt and KDE
INCLUDES= -I$(top_srcdir)/kviewshell \
@@ -86,8 +87,8 @@
## this option you can leave out. Just, if you use "make dist", you need it
noinst_HEADERS = dvi.h dviRenderer.h xdvi.h
---- kdegraphics-3.5.0/kdvi/main.cpp 2005-11-08 17:25:52.000000000 -0500
-+++ kdegraphics-3.5.0-new/kdvi/main.cpp 2005-11-22 13:52:46.000000000 -0500
+--- kdegraphics-3.5.4/kdvi/main.cpp 2005-11-08 17:25:52.000000000 -0500
++++ kdegraphics-3.5.4-new/kdvi/main.cpp 2006-07-31 01:03:32.000000000 -0400
@@ -29,7 +29,7 @@
static const char description[] = I18N_NOOP("A previewer for Device Independent files (DVI files) produced by the TeX typesetting system.");
@@ -97,8 +98,8 @@
{
KAboutData about ("kdvi", I18N_NOOP("KDVI"), "1.4",
description, KAboutData::License_GPL,
---- kdegraphics-3.5.0/kfax/Makefile.am 2005-10-10 10:56:54.000000000 -0400
-+++ kdegraphics-3.5.0-new/kfax/Makefile.am 2005-11-22 13:52:46.000000000 -0500
+--- kdegraphics-3.5.4/kfax/Makefile.am 2005-10-10 10:56:54.000000000 -0400
++++ kdegraphics-3.5.4-new/kfax/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -1,16 +1,18 @@
-AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-LDADD = $(LIB_KFILE) $(LIB_KDEPRINT) -lm
@@ -122,9 +123,9 @@
xdg_apps_DATA = kfax.desktop
---- kdegraphics-3.5.0/kfax/kfax.cpp 2005-10-10 10:56:54.000000000 -0400
-+++ kdegraphics-3.5.0-new/kfax/kfax.cpp 2005-11-22 13:52:46.000000000 -0500
-@@ -1682,7 +1682,7 @@
+--- kdegraphics-3.5.4/kfax/kfax.cpp 2006-07-22 04:10:31.000000000 -0400
++++ kdegraphics-3.5.4-new/kfax/kfax.cpp 2006-07-31 01:03:32.000000000 -0400
+@@ -1646,7 +1646,7 @@
KCmdLineLastOption
};
@@ -133,8 +134,19 @@
{
KAboutData aboutData( "kfax", I18N_NOOP("KFax"),
KFAXVERSION, description, KAboutData::License_GPL,
---- kdegraphics-3.5.0/kfile-plugins/png/Makefile.am 2005-09-10 04:19:24.000000000 -0400
-+++ kdegraphics-3.5.0-new/kfile-plugins/png/Makefile.am 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kfaxview/libkfaximage/Makefile.am 2005-09-10 04:18:44.000000000 -0400
++++ kdegraphics-3.5.4-new/kfaxview/libkfaximage/Makefile.am 2006-07-31 01:03:32.000000000 -0400
+@@ -1,7 +1,7 @@
+ INCLUDES = -I$(top_srcdir) $(all_includes)
+
+ lib_LTLIBRARIES = libkfaximage.la
+-libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
++libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined
+ libkfaximage_la_LIBADD = $(LIB_KDECORE)
+ libkfaximage_la_SOURCES = kfaximage.cpp faxexpand.cpp faxinit.cpp
+
+--- kdegraphics-3.5.4/kfile-plugins/png/Makefile.am 2005-09-10 04:19:24.000000000 -0400
++++ kdegraphics-3.5.4-new/kfile-plugins/png/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -10,7 +10,7 @@
kfile_png_la_SOURCES = kfile_png.cpp
@@ -144,8 +156,8 @@
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
---- kdegraphics-3.5.0/kghostview/Makefile.am 2005-09-10 04:19:23.000000000 -0400
-+++ kdegraphics-3.5.0-new/kghostview/Makefile.am 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kghostview/Makefile.am 2006-05-22 14:05:40.000000000 -0400
++++ kdegraphics-3.5.4-new/kghostview/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -4,7 +4,8 @@
####### Files
@@ -169,8 +181,8 @@
libdscparse_la_LDFLAGS = $(all_libraries) -no-undefined
libdscparse_la_LIBADD = $(LIB_QT)
---- kdegraphics-3.5.0/kghostview/main.cpp 2005-10-10 10:56:55.000000000 -0400
-+++ kdegraphics-3.5.0-new/kghostview/main.cpp 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kghostview/main.cpp 2005-10-10 10:56:55.000000000 -0400
++++ kdegraphics-3.5.4-new/kghostview/main.cpp 2006-07-31 01:03:32.000000000 -0400
@@ -43,7 +43,7 @@
KCmdLineLastOption
};
@@ -180,8 +192,8 @@
{
KCmdLineArgs::init( argc, argv, KGVPart::createAboutData() );
KCmdLineArgs::addCmdLineOptions( options );
---- kdegraphics-3.5.0/kiconedit/Makefile.am 2005-09-10 04:19:24.000000000 -0400
-+++ kdegraphics-3.5.0-new/kiconedit/Makefile.am 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kiconedit/Makefile.am 2006-03-17 05:11:23.000000000 -0500
++++ kdegraphics-3.5.4-new/kiconedit/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -1,18 +1,20 @@
INCLUDES = $(all_includes)
SUBDIRS = pics
@@ -208,8 +220,8 @@
DISTCLEANFILES = *~ .deps/* .libs/*
---- kdegraphics-3.5.0/kiconedit/main.cpp 2005-10-10 10:56:55.000000000 -0400
-+++ kdegraphics-3.5.0-new/kiconedit/main.cpp 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kiconedit/main.cpp 2005-10-10 10:56:55.000000000 -0400
++++ kdegraphics-3.5.4-new/kiconedit/main.cpp 2006-07-31 01:03:32.000000000 -0400
@@ -40,7 +40,7 @@
KCmdLineLastOption
};
@@ -219,8 +231,8 @@
{
KAboutData aboutData( "kiconedit", I18N_NOOP("KIconEdit"),
VERSION, description, KAboutData::License_GPL,
---- kdegraphics-3.5.0/kooka/Makefile.am 2005-09-10 04:19:00.000000000 -0400
-+++ kdegraphics-3.5.0-new/kooka/Makefile.am 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kooka/Makefile.am 2005-09-10 04:19:00.000000000 -0400
++++ kdegraphics-3.5.4-new/kooka/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -2,10 +2,13 @@
SUBDIRS = pics
@@ -248,8 +260,8 @@
INCLUDES = -I$(top_srcdir)/libkscan $(all_includes) $(LIBSANE_INCLUDES) $(KADMOS_INC)
---- kdegraphics-3.5.0/kooka/main.cpp 2005-09-10 04:19:00.000000000 -0400
-+++ kdegraphics-3.5.0-new/kooka/main.cpp 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kooka/main.cpp 2005-09-10 04:19:00.000000000 -0400
++++ kdegraphics-3.5.4-new/kooka/main.cpp 2006-07-31 01:03:32.000000000 -0400
@@ -71,7 +71,7 @@
@@ -259,8 +271,8 @@
{
KAboutData about("kooka", I18N_NOOP("Kooka"), KOOKA_VERSION, I18N_NOOP(description),
KAboutData::License_GPL_V2, "(C) 2000 Klaas Freitag", 0,
---- kdegraphics-3.5.0/kpdf/Makefile.am 2005-09-10 04:18:43.000000000 -0400
-+++ kdegraphics-3.5.0-new/kpdf/Makefile.am 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kpdf/Makefile.am 2005-09-10 04:18:43.000000000 -0400
++++ kdegraphics-3.5.4-new/kpdf/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -1,6 +1,6 @@
SUBDIRS = xpdf conf core ui shell
@@ -269,8 +281,8 @@
METASOURCES = AUTO
---- kdegraphics-3.5.0/kpdf/shell/Makefile.am 2005-09-10 04:18:43.000000000 -0400
-+++ kdegraphics-3.5.0-new/kpdf/shell/Makefile.am 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kpdf/shell/Makefile.am 2005-09-10 04:18:43.000000000 -0400
++++ kdegraphics-3.5.4-new/kpdf/shell/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -1,12 +1,15 @@
-INCLUDES = -I$(srcdir)/xpdf -I$(srcdir)/xpdf/goo -I$(top_builddir)/kpdf $(all_includes) $(FREETYPE_CFLAGS)
+INCLUDES = -I$(srcdir)/xpdf -I$(srcdir)/xpdf/goo -I$(top_builddir)/kpdf $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) $(all_includes)
@@ -292,8 +304,8 @@
EXTRA_DIST = kpdf.desktop
xdg_apps_DATA = kpdf.desktop
---- kdegraphics-3.5.0/kpdf/shell/main.cpp 2005-09-10 04:18:43.000000000 -0400
-+++ kdegraphics-3.5.0-new/kpdf/shell/main.cpp 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kpdf/shell/main.cpp 2006-07-23 10:15:17.000000000 -0400
++++ kdegraphics-3.5.4-new/kpdf/shell/main.cpp 2006-07-31 01:03:32.000000000 -0400
@@ -29,7 +29,7 @@
KCmdLineLastOption
};
@@ -303,20 +315,47 @@
{
KAboutData about(
"kpdf",
---- kdegraphics-3.5.0/kpdf/xpdf/xpdf/Makefile.am 2005-09-10 04:18:43.000000000 -0400
-+++ kdegraphics-3.5.0-new/kpdf/xpdf/xpdf/Makefile.am 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kpdf/xpdf/xpdf/GlobalParams.cc 2005-11-08 17:25:47.000000000 -0500
++++ kdegraphics-3.5.4-new/kpdf/xpdf/xpdf/GlobalParams.cc 2006-07-31 01:03:32.000000000 -0400
+@@ -1315,7 +1315,7 @@
+ if (type.contains("Italic")) slant=FC_SLANT_ITALIC;
+ if (type.contains("Bold")) weight=FC_WEIGHT_BOLD;
+ if (type.contains("Light")) weight=FC_WEIGHT_LIGHT;
+- if (type.contains("Condensed")) width=FC_WIDTH_CONDENSED;
++ // if (type.contains("Condensed")) width=FC_WIDTH_CONDENSED;
+ }
+
+ DisplayFontParam *GlobalParams::getDisplayFont(GString *fontName) {
+@@ -1329,13 +1329,14 @@
+ dfp = (DisplayFontParam *)displayFonts->lookup(fontName);
+ // KPDF: try to find font using Xft
+ if (!dfp) {
+- int weight=FC_WEIGHT_MEDIUM, slant=FC_SLANT_ROMAN, width=FC_WIDTH_NORMAL;
++ int weight=FC_WEIGHT_MEDIUM, slant=FC_SLANT_ROMAN, width=0;
+ QString name(fontName->getCString());
+
+ parseStyle(name,weight,slant,width);
+ p = FcPatternBuild(0,FC_FAMILY,FcTypeString, name.ascii(),
+ FC_SLANT, FcTypeInteger, slant, FC_WEIGHT, FcTypeInteger, weight,
+- FC_WIDTH, FcTypeInteger, width, FC_LANG, FcTypeString, "xx", (char*)0);
++ // FC_WIDTH, FcTypeInteger, width, FC_LANG, FcTypeString, "xx", (char*)0);
++ FC_LANG, FcTypeString, "xx", (char*)0);
+ if (!p) goto fin;
+ m = XftFontMatch(qt_xdisplay(),qt_xscreen(),p,&res);
+ if (!m) goto fin;
+--- kdegraphics-3.5.4/kpdf/xpdf/xpdf/Makefile.am 2006-05-22 14:05:33.000000000 -0400
++++ kdegraphics-3.5.4-new/kpdf/xpdf/xpdf/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -1,7 +1,7 @@
--INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(all_includes) $(LIBFREETYPE_CFLAGS) $(XFT_CFLAGS) $(X_INCLUDES) $(QT_INCLUDES)
-+INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) $(all_includes) $(XFT_CFLAGS) $(X_INCLUDES) $(QT_INCLUDES)
+ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/../fofi -I$(srcdir)/../splash -I$(srcdir)/../goo $(LIBFREETYPE_CFLAGS) $(XFT_CFLAGS) $(all_includes)
libxpdf_la_LDFLAGS = $(all_libraries)
-libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
-+libxpdf_la_LIBADD = $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIB_X11) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
++libxpdf_la_LIBADD = $(LIBFREETYPE_LIBS) $(XFT_LIBS) $(LIB_X11) $(LIBPAPER_LIBS) $(LIBJPEG) ../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la
libxpdf_la_SOURCES = Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc \
FontEncodingTables.cc Function.cc Gfx.cc \
---- kdegraphics-3.5.0/kpovmodeler/Makefile.am 2005-09-10 04:18:54.000000000 -0400
-+++ kdegraphics-3.5.0-new/kpovmodeler/Makefile.am 2005-11-22 13:52:47.000000000 -0500
+--- kdegraphics-3.5.4/kpovmodeler/Makefile.am 2005-09-10 04:18:54.000000000 -0400
++++ kdegraphics-3.5.4-new/kpovmodeler/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -224,11 +224,12 @@
####
# the executable
@@ -334,8 +373,8 @@
dummy.cpp:
echo > dummy.cpp
---- kdegraphics-3.5.0/kpovmodeler/main.cpp 2005-09-10 04:18:54.000000000 -0400
-+++ kdegraphics-3.5.0-new/kpovmodeler/main.cpp 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/kpovmodeler/main.cpp 2005-09-10 04:18:54.000000000 -0400
++++ kdegraphics-3.5.4-new/kpovmodeler/main.cpp 2006-07-31 01:03:32.000000000 -0400
@@ -35,7 +35,7 @@
KCmdLineLastOption
};
@@ -345,8 +384,8 @@
{
PMShell* shell = 0;
---- kdegraphics-3.5.0/kruler/Makefile.am 2005-09-10 04:19:23.000000000 -0400
-+++ kdegraphics-3.5.0-new/kruler/Makefile.am 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/kruler/Makefile.am 2005-09-10 04:19:23.000000000 -0400
++++ kdegraphics-3.5.4-new/kruler/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -2,11 +2,14 @@
INCLUDES= $(all_includes)
@@ -367,8 +406,8 @@
xdg_apps_DATA = kruler.desktop
---- kdegraphics-3.5.0/kruler/main.cpp 2005-09-10 04:19:23.000000000 -0400
-+++ kdegraphics-3.5.0-new/kruler/main.cpp 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/kruler/main.cpp 2005-09-10 04:19:23.000000000 -0400
++++ kdegraphics-3.5.4-new/kruler/main.cpp 2006-07-31 01:03:32.000000000 -0400
@@ -22,7 +22,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
@@ -378,8 +417,8 @@
{
---- kdegraphics-3.5.0/ksnapshot/Makefile.am 2005-09-10 04:19:19.000000000 -0400
-+++ kdegraphics-3.5.0-new/ksnapshot/Makefile.am 2005-11-22 13:53:31.000000000 -0500
+--- kdegraphics-3.5.4/ksnapshot/Makefile.am 2005-09-10 04:19:19.000000000 -0400
++++ kdegraphics-3.5.4-new/ksnapshot/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -1,14 +1,16 @@
-bin_PROGRAMS= ksnapshot
+bin_PROGRAMS=
@@ -402,8 +441,8 @@
xdg_apps_DATA = ksnapshot.desktop
---- kdegraphics-3.5.0/ksnapshot/main.cpp 2005-10-10 10:56:53.000000000 -0400
-+++ kdegraphics-3.5.0-new/ksnapshot/main.cpp 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/ksnapshot/main.cpp 2005-10-10 10:56:53.000000000 -0400
++++ kdegraphics-3.5.4-new/ksnapshot/main.cpp 2006-07-31 01:03:32.000000000 -0400
@@ -40,7 +40,7 @@
{ 0, 0, 0 }
};
@@ -413,8 +452,8 @@
{
KAboutData aboutData( "ksnapshot", I18N_NOOP("KSnapshot"),
KSNAPVERSION, description, KAboutData::License_GPL,
---- kdegraphics-3.5.0/ksvg/Makefile.am 2005-09-10 04:19:19.000000000 -0400
-+++ kdegraphics-3.5.0-new/ksvg/Makefile.am 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/ksvg/Makefile.am 2005-09-10 04:19:19.000000000 -0400
++++ kdegraphics-3.5.4-new/ksvg/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -4,9 +4,9 @@
libksvg_la_SOURCES = dummy.cc
libksvg_la_METASOURCES = AUTO
@@ -427,8 +466,8 @@
INCLUDES = -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl $(all_includes)
---- kdegraphics-3.5.0/ksvg/impl/libs/libtext2path/src/Makefile.am 2005-09-10 04:19:14.000000000 -0400
-+++ kdegraphics-3.5.0-new/ksvg/impl/libs/libtext2path/src/Makefile.am 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/ksvg/impl/libs/libtext2path/src/Makefile.am 2005-09-10 04:19:14.000000000 -0400
++++ kdegraphics-3.5.4-new/ksvg/impl/libs/libtext2path/src/Makefile.am 2006-07-31 01:03:32.000000000 -0400
@@ -1,10 +1,10 @@
lib_LTLIBRARIES = libtext2path.la
@@ -442,24 +481,24 @@
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 = $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(FRIBIDI_LIBS)
---- kdegraphics-3.5.0/ksvg/plugin/backends/agg/Makefile.am 2005-09-10 04:19:12.000000000 -0400
-+++ kdegraphics-3.5.0-new/ksvg/plugin/backends/agg/Makefile.am 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/ksvg/plugin/backends/agg/Makefile.am 2005-09-10 04:19:12.000000000 -0400
++++ kdegraphics-3.5.4-new/ksvg/plugin/backends/agg/Makefile.am 2006-07-31 01:03:33.000000000 -0400
@@ -12,4 +12,4 @@
kde_services_DATA = ksvgaggcanvas.desktop
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-INCLUDES = $(KDE_INCLUDES) $(AGG_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
+INCLUDES = $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) $(KDE_INCLUDES) $(AGG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
---- kdegraphics-3.5.0/ksvg/plugin/backends/libart/Makefile.am 2005-09-10 04:19:11.000000000 -0400
-+++ kdegraphics-3.5.0-new/ksvg/plugin/backends/libart/Makefile.am 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/ksvg/plugin/backends/libart/Makefile.am 2005-09-10 04:19:11.000000000 -0400
++++ kdegraphics-3.5.4-new/ksvg/plugin/backends/libart/Makefile.am 2006-07-31 01:03:33.000000000 -0400
@@ -8,4 +8,4 @@
kde_services_DATA = ksvglibartcanvas.desktop
KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-INCLUDES = $(LIBART_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(KDE_INCLUDES) $(all_includes)
+INCLUDES = $(FREETYPE_CFLAGS) $(LIBART_CFLAGS) $(FONTCONFIG_CFLAGS) -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/art_support -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(KDE_INCLUDES) $(all_includes)
---- kdegraphics-3.5.0/ksvg/test/external/Makefile.am 2005-09-10 04:19:09.000000000 -0400
-+++ kdegraphics-3.5.0-new/ksvg/test/external/Makefile.am 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/ksvg/test/external/Makefile.am 2005-09-10 04:19:09.000000000 -0400
++++ kdegraphics-3.5.4-new/ksvg/test/external/Makefile.am 2006-07-31 01:03:33.000000000 -0400
@@ -1,13 +1,16 @@
INCLUDES = $(FREETYPE_CFLAGS) -I$(top_srcdir)/ksvg -I$(top_srcdir)/ksvg/dom -I$(top_srcdir)/ksvg/impl -I$(top_srcdir)/ksvg/ecma -I$(top_srcdir)/ksvg/core -I$(top_srcdir)/ksvg/impl/libs/libtext2path/src $(all_includes)
+LDFLAGS = $(FREETYPE_LDFLAGS)
@@ -484,8 +523,8 @@
+printnodetest_la_SOURCES = printnodetest.cpp
+printnodetest_la_LIBADD = $(LIB_KDECORE) ../../libksvg.la
+printnodetest_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -module
---- kdegraphics-3.5.0/ksvg/test/external/printnodetest.cpp 2005-10-10 10:56:46.000000000 -0400
-+++ kdegraphics-3.5.0-new/ksvg/test/external/printnodetest.cpp 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/ksvg/test/external/printnodetest.cpp 2005-10-10 10:56:46.000000000 -0400
++++ kdegraphics-3.5.4-new/ksvg/test/external/printnodetest.cpp 2006-07-31 01:03:33.000000000 -0400
@@ -44,7 +44,7 @@
exit(0);
}
@@ -495,8 +534,8 @@
{
KAboutData *about = new KAboutData("KSVG printNode test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG printNode test app"));
KCmdLineArgs::init(argc, argv, about);
---- kdegraphics-3.5.0/ksvg/test/external/svgdisplay.cc 2005-09-10 04:19:09.000000000 -0400
-+++ kdegraphics-3.5.0-new/ksvg/test/external/svgdisplay.cc 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/ksvg/test/external/svgdisplay.cc 2005-09-10 04:19:09.000000000 -0400
++++ kdegraphics-3.5.4-new/ksvg/test/external/svgdisplay.cc 2006-07-31 01:03:33.000000000 -0400
@@ -10,7 +10,7 @@
KCmdLineLastOption
};
@@ -506,8 +545,8 @@
{
KAboutData *about = new KAboutData( "KSVG test app", I18N_NOOP("KSVG test"), "0.1", I18N_NOOP("KSVG standalone test app") );
---- kdegraphics-3.5.0/kviewshell/Makefile.am 2005-09-10 04:19:21.000000000 -0400
-+++ kdegraphics-3.5.0-new/kviewshell/Makefile.am 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/kviewshell/Makefile.am 2005-09-10 04:19:21.000000000 -0400
++++ kdegraphics-3.5.4-new/kviewshell/Makefile.am 2006-07-31 01:03:33.000000000 -0400
@@ -5,8 +5,9 @@
####### Files
@@ -532,8 +571,8 @@
kviewshellinclude_HEADERS = anchor.h bookmark.h pageView.h documentPageCache.h documentRenderer.h documentWidget.h \
history.h hyperlink.h kmultipage.h length.h pageNumber.h pageSize.h renderedDocumentPage.h renderedDocumentPagePixmap.h \
---- kdegraphics-3.5.0/kviewshell/main.cpp 2005-11-08 17:25:45.000000000 -0500
-+++ kdegraphics-3.5.0-new/kviewshell/main.cpp 2005-11-22 13:52:48.000000000 -0500
+--- kdegraphics-3.5.4/kviewshell/main.cpp 2005-11-08 17:25:45.000000000 -0500
++++ kdegraphics-3.5.4-new/kviewshell/main.cpp 2006-07-31 01:03:33.000000000 -0400
@@ -32,7 +32,7 @@
static const char description[] = I18N_NOOP("Generic framework for viewer applications");
@@ -543,9 +582,21 @@
{
KAboutData about ("kviewshell", I18N_NOOP("KViewShell"), "0.6",
description, KAboutData::License_GPL,
---- kdegraphics-3.5.0/libkscan/img_canvas.cpp 2005-10-10 10:56:40.000000000 -0400
-+++ kdegraphics-3.5.0-new/libkscan/img_canvas.cpp 2005-11-22 13:52:48.000000000 -0500
-@@ -700,7 +700,7 @@
+--- kdegraphics-3.5.4/kviewshell/plugins/djvu/libdjvu/Makefile.am 2005-11-08 17:25:45.000000000 -0500
++++ kdegraphics-3.5.4-new/kviewshell/plugins/djvu/libdjvu/Makefile.am 2006-07-31 01:03:33.000000000 -0400
+@@ -1,7 +1,7 @@
+ INCLUDES = -I$(top_srcdir) $(all_includes)
+
+-kde_module_LTLIBRARIES = libdjvu.la
+-libdjvu_la_LDFLAGS = -avoid-version $(all_libraries)
++lib_LTLIBRARIES = libdjvu.la
++libdjvu_la_LDFLAGS = $(all_libraries)
+ libdjvu_la_LIBADD = $(LIBJPEG)
+ libdjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \
+ BSByteStream.cpp DjVuDocument.cpp DjVuNavDir.cpp GPixmap.cpp JB2EncodeCodec.cpp \
+--- kdegraphics-3.5.4/libkscan/img_canvas.cpp 2006-05-22 14:05:37.000000000 -0400
++++ kdegraphics-3.5.4-new/libkscan/img_canvas.cpp 2006-07-31 01:03:33.000000000 -0400
+@@ -701,7 +701,7 @@
double(image->width());
kdDebug(29000) << "FIT WIDTH scrollbar to substract: " << sbWidth << endl;
}
@@ -554,7 +605,7 @@
break;
case FIT_HEIGHT:
used_yscaler = used_xscaler = double(noSBSize.height())/double(image->height());
-@@ -715,12 +715,12 @@
+@@ -716,12 +716,12 @@
kdDebug(29000) << "FIT HEIGHT scrollbar to substract: " << sbWidth << endl;
// scale = int(100.0*(noSBSize.height() -sbWidth) / image->height());
}
@@ -569,118 +620,3 @@
break;
default:
break;
---- kdegraphics-3.5.0/kviewshell/plugins/djvu/libdjvu/Makefile.am 2005-11-08 17:25:45.000000000 -0500
-+++ kdegraphics-3.5.0-new/kviewshell/plugins/djvu/libdjvu/Makefile.am 2005-11-26 10:47:53.000000000 -0500
-@@ -1,7 +1,7 @@
- INCLUDES = -I$(top_srcdir) $(all_includes)
-
--kde_module_LTLIBRARIES = libdjvu.la
--libdjvu_la_LDFLAGS = -avoid-version $(all_libraries)
-+lib_LTLIBRARIES = libdjvu.la
-+libdjvu_la_LDFLAGS = $(all_libraries)
- libdjvu_la_LIBADD = $(LIBJPEG)
- libdjvu_la_SOURCES = Arrays.cpp DjVuDocEditor.cpp DjVuMessageLite.cpp GOS.cpp IW44Image.cpp \
- BSByteStream.cpp DjVuDocument.cpp DjVuNavDir.cpp GPixmap.cpp JB2EncodeCodec.cpp \
---- kdegraphics-3.5.0/kfaxview/libkfaximage/Makefile.am 2005-09-10 04:18:44.000000000 -0400
-+++ kdegraphics-3.5.0-new/kfaxview/libkfaximage/Makefile.am 2005-11-27 10:55:12.000000000 -0500
-@@ -1,7 +1,7 @@
- INCLUDES = -I$(top_srcdir) $(all_includes)
-
- lib_LTLIBRARIES = libkfaximage.la
--libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined -avoid-version
-+libkfaximage_la_LDFLAGS = $(all_libraries) -no-undefined
- libkfaximage_la_LIBADD = $(LIB_KDECORE)
- libkfaximage_la_SOURCES = kfaximage.cpp faxexpand.cpp faxinit.cpp
-
---- kdegraphics-3.5.0/kpdf/xpdf/xpdf/GlobalParams.cc Tue Nov 8 17:25:47 2005
-+++ kdegraphics-3.5.0-new/kpdf/xpdf/xpdf/GlobalParams.cc Sat Jan 14 16:23:46 2006
-@@ -1315,7 +1315,7 @@
- if (type.contains("Italic")) slant=FC_SLANT_ITALIC;
- if (type.contains("Bold")) weight=FC_WEIGHT_BOLD;
- if (type.contains("Light")) weight=FC_WEIGHT_LIGHT;
-- if (type.contains("Condensed")) width=FC_WIDTH_CONDENSED;
-+ // if (type.contains("Condensed")) width=FC_WIDTH_CONDENSED;
- }
-
- DisplayFontParam *GlobalParams::getDisplayFont(GString *fontName) {
-@@ -1329,13 +1329,14 @@
- dfp = (DisplayFontParam *)displayFonts->lookup(fontName);
- // KPDF: try to find font using Xft
- if (!dfp) {
-- int weight=FC_WEIGHT_MEDIUM, slant=FC_SLANT_ROMAN, width=FC_WIDTH_NORMAL;
-+ int weight=FC_WEIGHT_MEDIUM, slant=FC_SLANT_ROMAN, width=0;
- QString name(fontName->getCString());
-
- parseStyle(name,weight,slant,width);
- p = FcPatternBuild(0,FC_FAMILY,FcTypeString, name.ascii(),
- FC_SLANT, FcTypeInteger, slant, FC_WEIGHT, FcTypeInteger, weight,
-- FC_WIDTH, FcTypeInteger, width, FC_LANG, FcTypeString, "xx", (char*)0);
-+ // FC_WIDTH, FcTypeInteger, width, FC_LANG, FcTypeString, "xx", (char*)0);
-+ FC_LANG, FcTypeString, "xx", (char*)0);
- if (!p) goto fin;
- m = XftFontMatch(qt_xdisplay(),qt_xscreen(),p,&res);
- if (!m) goto fin;
---- kdegraphics-3.5.1/kpdf/part.cpp 2006-01-19 11:38:22.000000000 -0500
-+++ kdegraphics-3.5.1-new/kpdf/part.cpp 2006-01-24 16:57:42.000000000 -0500
-@@ -697,6 +697,11 @@
- KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
- if ( saveURL.isValid() && !saveURL.isEmpty() )
- {
-+ if (saveURL == url())
-+ {
-+ KMessageBox::information( widget(), i18n("You are trying to overwrite \"%1\" with itself. This is not allowed. Please save it in another location.").arg(saveURL.filename()) );
-+ return;
-+ }
- if ( KIO::NetAccess::exists( saveURL, false, widget() ) )
- {
- if (KMessageBox::warningContinueCancel( widget(), i18n("A file named \"%1\" already exists. Are you sure you want to overwrite it?").arg(saveURL.filename()), QString::null, i18n("Overwrite")) != KMessageBox::Continue)
---- kdegraphics-3.5.1/kpdf/xpdf/splash/SplashXPathScanner.cc (Revision 505052)
-+++ kdegraphics-3.5.1-new/kpdf/xpdf/splash/SplashXPathScanner.cc (Arbeitskopie)
-@@ -186,7 +186,7 @@ GBool SplashXPathScanner::getNextSpan(in
- }
-
- void SplashXPathScanner::computeIntersections(int y) {
-- SplashCoord ySegMin, ySegMax, xx0, xx1;
-+ SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
- SplashXPathSeg *seg;
- int i, j;
-
-@@ -236,19 +236,27 @@ void SplashXPathScanner::computeIntersec
- } else if (seg->flags & splashXPathVert) {
- xx0 = xx1 = seg->x0;
- } else {
-- if (ySegMin <= y) {
-- // intersection with top edge
-- xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
-+ if (seg->x0 < seg->x1) {
-+ xSegMin = seg->x0;
-+ xSegMax = seg->x1;
- } else {
-- // x coord of segment endpoint with min y coord
-- xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0;
-+ xSegMin = seg->x1;
-+ xSegMax = seg->x0;
- }
-- if (ySegMax >= y + 1) {
-- // intersection with bottom edge
-- xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
-- } else {
-- // x coord of segment endpoint with max y coord
-- xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1;
-+ // intersection with top edge
-+ xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy;
-+ // intersection with bottom edge
-+ xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy;
-+ // the segment may not actually extend to the top and/or bottom edges
-+ if (xx0 < xSegMin) {
-+ xx0 = xSegMin;
-+ } else if (xx0 > xSegMax) {
-+ xx0 = xSegMax;
-+ }
-+ if (xx1 < xSegMin) {
-+ xx1 = xSegMin;
-+ } else if (xx1 > xSegMax) {
-+ xx1 = xSegMax;
- }
- }
- if (xx0 < xx1) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061027/3b3bc9f5/attachment.html
More information about the macports-changes
mailing list