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

Christopher Martin chrsmrtn at costa.debian.org
Tue Feb 7 02:03:54 UTC 2006 

Author: chrsmrtn
Date: 2006-02-07 02:03:53 +0000 (Tue, 07 Feb 2006)
New Revision: 3095

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


Added: trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r506556.diff
===================================================================
--- trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r506556.diff	2006-02-07 01:23:00 UTC (rev 3094)
+++ trunk/packages/kdegraphics/debian/patches/01_kdegraphics_branch_r506556.diff	2006-02-07 02:03:53 UTC (rev 3095)
@@ -0,0 +1,222 @@
+#DPATCHLEVEL=0
+--- kpdf/xpdf/xpdf/GfxFont.cc	(revision 502992)
++++ kpdf/xpdf/xpdf/GfxFont.cc	(revision 506556)
+@@ -1493,6 +1493,7 @@
+   unsigned int cidlen;
+ 
+   *mapsizep = 0;
++  if (!ctu) return NULL;
+ 
+   /* we use only unicode cmap */
+   cmap = -1;
+--- kpdf/xpdf/splash/SplashXPathScanner.cc	(revision 502992)
++++ kpdf/xpdf/splash/SplashXPathScanner.cc	(revision 506556)
+@@ -186,7 +186,7 @@
+ }
+ 
+ void SplashXPathScanner::computeIntersections(int y) {
+-  SplashCoord ySegMin, ySegMax, xx0, xx1;
++  SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1;
+   SplashXPathSeg *seg;
+   int i, j;
+ 
+@@ -236,20 +236,28 @@
+     } 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) {
+       inter[interLen].x0 = splashFloor(xx0);
+--- kfaxview/kfaxmultipage_tiff.desktop	(revision 502992)
++++ kfaxview/kfaxmultipage_tiff.desktop	(revision 506556)
+@@ -18,7 +18,7 @@
+ Comment[et]=KView faksifailide plugin
+ Comment[eu]=Fax fitxategientzatko KViewShell-en plugina
+ Comment[fi]=KViewShell sovelma faksitiedostoille
+-Comment[fr]=Module KViewShell pour les fichiers fax
++Comment[fr]=Module KViewShell pour les fichiers de fax
+ Comment[hu]=KViewShell-modul faxfájlokhoz
+ Comment[is]=KViewShell íforrit fyrir faxskrár
+ Comment[it]=Plugin KViewShell per file di fax
+--- kfaxview/kfaxmultipage.desktop	(revision 502992)
++++ kfaxview/kfaxmultipage.desktop	(revision 506556)
+@@ -20,7 +20,7 @@
+ Comment[et]=KView faksifailide plugin
+ Comment[eu]=Fax fitxategientzatko KViewShell-en plugina
+ Comment[fi]=KViewShell sovelma faksitiedostoille
+-Comment[fr]=Module KViewShell pour les fichiers fax
++Comment[fr]=Module KViewShell pour les fichiers de fax
+ Comment[hu]=KViewShell-modul faxfájlokhoz
+ Comment[is]=KViewShell íforrit fyrir faxskrár
+ Comment[it]=Plugin KViewShell per file di fax
+--- kgamma/kcmkgamma/xf86configpath.cpp	(revision 502992)
++++ kgamma/kcmkgamma/xf86configpath.cpp	(revision 506556)
+@@ -34,6 +34,14 @@
+     searchPaths.push_back("/usr/X11R6/lib/X11/XF86Config-4");
+     searchPaths.push_back("/usr/X11R6/lib/X11/XF86Config");
+ 
++    searchPaths.push_back("/etc/X11/xorg.conf-4");
++    searchPaths.push_back("/etc/X11/xorg.conf");
++    searchPaths.push_back("/etc/xorg.conf");
++    searchPaths.push_back("/usr/X11R6/etc/X11/xorg.conf-4");
++    searchPaths.push_back("/usr/X11R6/etc/X11/xorg.conf");
++    searchPaths.push_back("/usr/X11R6/lib/X11/xorg.conf-4");
++    searchPaths.push_back("/usr/X11R6/lib/X11/xorg.conf");
++
+     vector<string>::iterator it = searchPaths.begin();
+     for (; it != searchPaths.end(); ++it )
+       if ( !access( (Path = *it).c_str(), F_OK ) ) break;
+--- kgamma/xf86gammacfg/xf86gammacfg.cpp	(revision 502992)
++++ kgamma/xf86gammacfg/xf86gammacfg.cpp	(revision 506556)
+@@ -46,7 +46,7 @@
+     int Screen = 0;
+     int ScreenCount = (argc-1) / 3;
+     
+-    // First, search for XF86Config
++    // First, search for XF86Config or xorg.conf
+     vector <string> searchPaths;
+     searchPaths.push_back("/etc/X11/XF86Config-4");
+     searchPaths.push_back("/etc/X11/XF86Config");
+@@ -56,6 +56,14 @@
+     searchPaths.push_back("/usr/X11R6/lib/X11/XF86Config-4");
+     searchPaths.push_back("/usr/X11R6/lib/X11/XF86Config");
+ 
++    searchPaths.push_back("/etc/X11/xorg.conf-4");
++    searchPaths.push_back("/etc/X11/xorg.conf");
++    searchPaths.push_back("/etc/xorg.conf");
++    searchPaths.push_back("/usr/X11R6/etc/X11/xorg.conf-4");
++    searchPaths.push_back("/usr/X11R6/etc/X11/xorg.conf");
++    searchPaths.push_back("/usr/X11R6/lib/X11/xorg.conf-4");
++    searchPaths.push_back("/usr/X11R6/lib/X11/xorg.conf");
++
+     std::vector<string>::iterator it = searchPaths.begin();
+     for (; it != searchPaths.end(); ++it ) {
+       //Try to open file
+--- kdvi/special.cpp	(revision 502992)
++++ kdvi/special.cpp	(revision 506556)
+@@ -697,6 +697,7 @@
+       (strncasecmp(cp, "html:<A name=", 13) == 0) ||
+       (strncasecmp(cp, "ps:", 3) == 0) ||
+       (strncasecmp(cp, "papersize", 9) == 0) ||
++      (strncasecmp(cp, "header", 6) == 0) ||
+       (strncasecmp(cp, "background", 10) == 0) )
+     return;
+   
+--- kdvi/dviRenderer_prescan.cpp	(revision 502992)
++++ kdvi/dviRenderer_prescan.cpp	(revision 506556)
+@@ -284,8 +284,20 @@
+   kdDebug(4300) << "PostScript-special, header " << cp.latin1() << endl;
+ #endif
+ 
+-  if (QFile::exists(cp)) 
+-    PS_interface->PostScriptHeaderString->append( QString(" (%1) run\n").arg(cp) );
++  QString _file = cp;
++  
++  // If the file is not found in the current directory, use kpsewhich
++  // to find it.
++  if (!QFile::exists(_file)) {
++    // Otherwise, use kpsewhich to find the eps file.
++    KProcIO proc;
++    proc << "kpsewhich" << cp;
++    proc.start(KProcess::Block);
++    proc.readln(_file);
++  }
++  
++  if (QFile::exists(_file))
++    PS_interface->PostScriptHeaderString->append( QString(" (%1) run\n").arg(_file) );
+ }
+ 
+ 
+@@ -305,7 +317,6 @@
+ {
+ #ifdef DEBUG_PRESCAN
+   kdError(4300) << "PostScript-special, literal PostScript " << cp.latin1() << endl;
+-
+ #endif
+   
+   double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
+--- kamera/kcontrol/kamera.desktop	(revision 502992)
++++ kamera/kcontrol/kamera.desktop	(revision 506556)
+@@ -78,7 +78,7 @@
+ Keywords[et]=gphoto,kaamera,digitaalkaamera,veebikaamera,kamera
+ Keywords[eu]=gphoto,kamera,digicam,webcam,kamera
+ Keywords[fi]=gphoto,kamera,digicam,webcam
+-Keywords[fr]=gphoto,camera,digicam,webcam,kamera,caméscope,caméra
++Keywords[fr]=gphoto,camera,digicam,webcam,kamera,caméscope,caméra,appareil photo
+ Keywords[he]=gphoto,kamera,מצלמה,מצלמת רשת,מצלמה דיגיטלית, amera,digicam,webcam
+ Keywords[hi]=जीफोटो,केमरा,डिजिकेम,वेबकेम,केमरा
+ Keywords[hu]=gphoto,fényképezőgép,digitális fényképezőgép,webkamera,videókamera
+--- kiconedit/kiconedit.desktop	(revision 502992)
++++ kiconedit/kiconedit.desktop	(revision 506556)
+@@ -19,7 +19,7 @@
+ GenericName[et]=Ikoonide redaktor
+ GenericName[eu]=Ikono editorea
+ GenericName[fi]=Kuvakemuokkain
+-GenericName[fr]=Éditeur d'icône
++GenericName[fr]=Éditeur d'icônes
+ GenericName[ga]=Eagarthóir Deilbhíní
+ GenericName[gl]=Editor de iconas
+ GenericName[he]=עורך סמלים
+--- kfile-plugins/raw/x-image-raw.desktop	(revision 502992)
++++ kfile-plugins/raw/x-image-raw.desktop	(revision 506556)
+@@ -15,7 +15,7 @@
+ Comment[et]=Toores kaamerafail (RAW)
+ Comment[eu]=RAW kamera-fitxategiak
+ Comment[fi]=RAW-kuvatiedosto
+-Comment[fr]=Fichiers brut d'appareil photo numériques
++Comment[fr]=Fichiers RAW d'appareil photo
+ Comment[ga]=Comhad Ceamara RAW
+ Comment[hu]=RAW-fájl
+ Comment[is]=RAW myndavélaskrá
+--- kfile-plugins/raw/Makefile.am	(revision 502992)
++++ kfile-plugins/raw/Makefile.am	(revision 506556)
+@@ -24,4 +24,4 @@
+ magicdir = $(kde_confdir)/magic
+ magic_DATA = x-image-raw.magic 
+ 
+-EXTRA_DIST = $(mimetypeimagedata_DATA) $(magic_DATA) parse.c.orig
++EXTRA_DIST = $(mimetypeimagedata_DATA) $(magic_DATA)
+--- kfile-plugins/raw/kfile_raw.desktop	(revision 502992)
++++ kfile-plugins/raw/kfile_raw.desktop	(revision 506556)
+@@ -12,7 +12,7 @@
+ Name[et]=Toored kaamerafailid
+ Name[eu]=RAW kamera-fitxategiak
+ Name[fi]=RAW-kuvatiedostot
+-Name[fr]=Fichiers bruts d'appareil photo numériques
++Name[fr]=Fichiers RAW d'appareil photo numérique
+ Name[ga]=Comhaid Cheamara RAW
+ Name[he]=קבצי מצלמה דיגיטלית גולמיים
+ Name[hu]=RAW-fájlok

More information about the pkg-kde-commits mailing list