rev 3417 - trunk/packages/kdegraphics/debian/patches

[Christopher Martin]

Author: chrsmrtn
Date: 2006-03-29 20:38:40 +0000 (Wed, 29 Mar 2006)
New Revision: 3417

Added:
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r524066.diff
Removed:
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r502992.diff
   trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r506556.diff
Log:
New kdegraphics branch pull.


Deleted: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r502992.diff

Deleted: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r506556.diff

Added: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r524066.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r524066.diff	2006-03-29 19:32:22 UTC (rev 3416)
+++ trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r524066.diff	2006-03-29 20:38:40 UTC (rev 3417)
@@ -0,0 +1,69 @@
+#DPATCHLEVEL=0
+--- kpdf/core/generator_pdf/generator_pdf.cpp	(.../tags/KDE/3.5.2/kdegraphics)	(revision 524066)
++++ kpdf/core/generator_pdf/generator_pdf.cpp	(.../branches/KDE/3.5/kdegraphics)	(revision 524066)
+@@ -731,7 +731,7 @@
+         return i18n( "Unknown Date" );
+ 
+     Object obj;
+-    char *s;
++    const char *s;
+     int year, mon, day, hour, min, sec;
+     Dict *infoDict = info.getDict();
+     UnicodeMap *uMap = globalParams->getTextEncoding();
+@@ -742,7 +742,7 @@
+ 
+     if ( infoDict->lookup( data.latin1(), &obj )->isString() )
+     {
+-        s = obj.getString()->getCString();
++        s = UGString(*obj.getString()).getCString();
+         if ( s[0] == 'D' && s[1] == ':' )
+             s += 2;
+ 
+--- kpdf/xpdf/xpdf/Makefile.am	(.../tags/KDE/3.5.2/kdegraphics)	(revision 524066)
++++ kpdf/xpdf/xpdf/Makefile.am	(.../branches/KDE/3.5/kdegraphics)	(revision 524066)
+@@ -1,4 +1,4 @@
+-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 $(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 
+--- ksvg/core/ksvgrenderer.desktop	(.../tags/KDE/3.5.2/kdegraphics)	(revision 524066)
++++ ksvg/core/ksvgrenderer.desktop	(.../branches/KDE/3.5/kdegraphics)	(revision 524066)
+@@ -17,6 +17,7 @@
+ Comment[eu]=KSVG errendatze programa
+ Comment[fi]=KSVG-piirtäjän taustaohjelma
+ Comment[fr]=Moteur de rendu KSVG
++Comment[ga]=Inneall Rindreála KSVG
+ Comment[gl]=Backend de Renderizado KSVG
+ Comment[he]=מנוע רינדור KSVG
+ Comment[hi]=के-एसवीजी रेंडरिंग बैकएण्ड
+--- ksvg/plugin/backends/libart/ksvglibartcanvas.desktop	(.../tags/KDE/3.5.2/kdegraphics)	(revision 524066)
++++ ksvg/plugin/backends/libart/ksvglibartcanvas.desktop	(.../branches/KDE/3.5/kdegraphics)	(revision 524066)
+@@ -18,6 +18,7 @@
+ Name[eu]=KSVG errendatze programa - Libart
+ Name[fi]=KSVG-piirtäjän taustaohjelma - Libart
+ Name[fr]=Moteur de rendu KSVG - Libart
++Name[ga]=Inneall Rindreála KSVG - Libart
+ Name[hi]=के-एसवीजी रेंडरिंग बैकएण्ड- लिबआर्ट
+ Name[hu]=KSVG megjelenítőmotor - Libart
+ Name[is]=KSVG teiknari - Libart
+--- kamera/configure.in.in	(.../tags/KDE/3.5.2/kdegraphics)	(revision 524066)
++++ kamera/configure.in.in	(.../branches/KDE/3.5/kdegraphics)	(revision 524066)
+@@ -31,12 +31,13 @@
+ 
+ AC_MSG_CHECKING(for gPhoto2)
+ # the pkg-config way first, if user did not use --with-
+-AC_CHECK_PROG(gphoto_devel,gphoto2-config,gphoto2-config,no)
+-if test "$gphoto2_includes" = "" -a "$gphoto2_libraries" = "" -a "$gphoto_devel" = "gphoto2-config" 
++AC_CHECK_PROG(gphoto2_config,gphoto2-config,gphoto2-config,no)
++AC_CHECK_PROG(gphoto2_port_config,gphoto2-port-config,gphoto2-port-config,no)
++if test "$gphoto2_includes" = "" -a "$gphoto2_libraries" = "" -a "$gphoto2_config" != "no" -a "$gphoto2_port_config" != "no"
+ then
+ 	with_kamera="yes"
+-	GPHOTO2_INCS="`$gphoto_devel --cflags`"
+-	GPHOTO2_LIBS="`$gphoto_devel --libs`"
++	GPHOTO2_INCS="`$gphoto2_config --cflags` `$gphoto2_port_config --cflags`"
++	GPHOTO2_LIBS="`$gphoto2_config --libs` `$gphoto2_port_config --libs`"
+ else
+ #
+ # Search for gphoto2 include files.