SOURCES: kdegraphics-branch.diff - updated

arekm arekm at pld-linux.org
Tue Aug 2 08:10:59 CEST 2005 

Author: arekm                        Date: Tue Aug  2 06:10:58 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdegraphics-branch.diff (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SOURCES/kdegraphics-branch.diff
diff -u SOURCES/kdegraphics-branch.diff:1.6 SOURCES/kdegraphics-branch.diff:1.7
--- SOURCES/kdegraphics-branch.diff:1.6	Sat Apr 16 14:07:00 2005
+++ SOURCES/kdegraphics-branch.diff	Tue Aug  2 08:10:53 2005
@@ -1,4193 +1,301 @@
-diff -urN -x CVS kdegraphics.orig/admin/acinclude.m4.in kdegraphics/admin/acinclude.m4.in
---- kdegraphics.orig/admin/acinclude.m4.in	2005-02-09 23:21:09.000000000 +0100
-+++ kdegraphics/admin/acinclude.m4.in	2005-03-24 20:18:09.000000000 +0100
-@@ -1644,7 +1644,15 @@
- 
- AC_MSG_RESULT([$kde_cv_uic_plugins])
- if test "$kde_cv_uic_plugins" != yes; then
--	AC_MSG_ERROR([you need to install kdelibs first.])
-+	AC_MSG_ERROR([
-+you need to install kdelibs first.
-+
-+If you did install kdelibs, then the Qt version that is picked up by
-+this configure is not the same version you used to compile kdelibs. 
-+The Qt Plugin installed by kdelibs is *ONLY* loadable if its the 
-+same Qt version, compiled with the same compiler and the same Qt
-+configuration settings.
-+])
- fi
- fi
- ])
-@@ -3104,8 +3112,8 @@
-         fi
-         rm -f conftest.h conftest.h.gch
-     fi
--    AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
-   fi
-+  AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test "$kde_gcc_supports_pch" = "yes")
-   if test "$CXX" = "KCC"; then
-     dnl unfortunately we currently cannot disable exception support in KCC
-     dnl because doing so is binary incompatible and Qt by default links with exceptions :-(
-@@ -3194,6 +3202,51 @@
-   ifdef([AM_DEPENDENCIES], AC_REQUIRE([KDE_ADD_DEPENDENCIES]), [])
- ])
- 
-+AC_DEFUN([KDE_CHECK_VISIBILITY_GCC_BUG],
-+  [
-+    AC_CACHE_CHECK([for gcc -fvisibility-inlines-hidden bug], kde_cv_val_gcc_visibility_bug,
-+      [
-+        AC_LANG_SAVE
-+        AC_LANG_CPLUSPLUS
-+
-+        safe_CXXFLAGS=$CXXFLAGS
-+        safe_LDFLAGS=$LDFLAGS
-+        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
-+        LDFLAGS="$LDFLAGS -shared -fPIC"
-+
-+        AC_TRY_LINK(
-+        [
-+          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
-+          template<typename CharT>
-+          struct VisTest
-+          {
-+            inline VisTest ();
-+          };
-+          template<typename CharT>
-+          inline VisTest<CharT>::VisTest()
-+          {}
-+          extern template class VisTest<char>;  // It works if we drop that line
-+          int some_function( int do_something ) __attribute__ ((visibility("default")));
-+          int some_function( int )
-+          {
-+            VisTest<char> a;
-+            return 0;
-+          }
-+        ], [/* elvis is alive */],
-+        kde_cv_val_gcc_visibility_bug=no, kde_cv_val_gcc_visibility_bug=yes)
-+
-+        CXXFLAGS=$safe_CXXFLAGS
-+        LDFLAGS=$safe_LDFLAGS
-+        AC_LANG_RESTORE
-+      ]
-+    )
-+
-+    if test x$kde_cv_val_gcc_visibility_bug = xno; then
-+      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-+    fi
-+  ]
-+)
-+
- AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
- [
-   if test "$GXX" = "yes"; then
-@@ -3202,7 +3255,9 @@
-     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
-     KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
-     [
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
-+        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-+        KDE_CHECK_VISIBILITY_GCC_BUG
-+
-         HAVE_GCC_VISIBILITY=1
-         AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
-     ])
-diff -urN -x CVS kdegraphics.orig/admin/am_edit kdegraphics/admin/am_edit
---- kdegraphics.orig/admin/am_edit	2004-12-17 21:18:28.000000000 +0100
-+++ kdegraphics/admin/am_edit	2005-03-29 11:15:16.000000000 +0200
-@@ -483,6 +483,7 @@
-             $MakefileData =~ s/$lookup/$replacement/;
-             $lookup =~ s/\\\$\\\(CXXFLAGS\\\)/\\\$\\\(KCXXFLAGS\\\)/;
-             $replacement = "$stuff_before\$(KCXXFLAGS) \$(KDE_CXXFLAGS)$stuff_after";
-+            next if ($stuff_before =~ /\$\(KDE_CXXFLAGS\)/ or $stuff_after =~ /\$\(KDE_CXXFLAGS\)/);
-             substituteLine($lookup, $replacement);
-         } else {
-             $found = 0;
-@@ -634,7 +635,7 @@
- 		if ($pre eq '' && exists($varcontent{$variable})) {
- 		    my @addlist = split(/[\034\s]+/, $varcontent{$variable});
- 		    push(@objlist, @addlist);
--                } elsif ($variable !~ 'OBJEXT') {
-+                } elsif ($variable !~ 'OBJEXT' && $variable !~ /am__objects_\d+/ ) {
-                     $ocv = 1;
- 		}
-             }
-@@ -2276,7 +2277,7 @@
-            "\t        echo \"\$\$i\"; \\\n" . 
-            "\t        if ! ";
-     $t .=  $cxxsuffix eq "KKK" ?
--           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(KDE_CXXFLAGS) " :
-+           "\$(CXX) \$(DEFS) -I. -I\$(srcdir) -I\$(top_builddir) \$(INCLUDES) \$(AM_CPPFLAGS) \$(CPPFLAGS) \$(CXXFLAGS) \$(KDE_CXXFLAGS) " :
-            "\$(CXXCOMPILE) ";
-     $t .=  " --dump-class-hierarchy -c \$\$i.bchecktest.cc; then \\\n" .
-            "\t            rm -f \$\$i.bchecktest.cc; exit 1; \\\n" .
-@@ -2352,7 +2353,7 @@
-     $MakefileData =~ s/\034/\\\n/g;    # Restore continuation lines
-     # Append our $progId line, _below_ the "generated by automake" line
-     # because automake-1.6 relies on the first line to be his own.
--    my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
-+    my $progIdLine = "\# $progId - " . '$Revision$ '."\n";
-     if ( !( $MakefileData =~ s/^(.*generated .*by automake.*\n)/$1$progIdLine/ ) ) {
-         warn "automake line not found in $makefile\n";
- 	# Fallback: first line
-diff -urN -x CVS kdegraphics.orig/kamera/kcontrol/kamera.desktop kdegraphics/kamera/kcontrol/kamera.desktop
---- kdegraphics.orig/kamera/kcontrol/kamera.desktop	2005-02-23 06:06:13.000000000 +0100
-+++ kdegraphics/kamera/kcontrol/kamera.desktop	2005-03-12 09:29:35.000000000 +0100
-@@ -56,7 +56,6 @@
- Comment[uz]=КаПорани ĐźĐžŃĐťĐ°Ńˆ
- Comment[ven]=Dzudzanya kamera
- Comment[xh]=Qwalasela Umfoti
--Comment[xx]=xxConfigure Kameraxx
- Comment[zh_CN]=é
ç˝Ž Kamera
- Comment[zh_TW]=設厚ç
§ç›¸ćŠŸ
- Comment[zu]=Hlanganisa ikhamera
-@@ -102,7 +101,6 @@
- Keywords[uk]=gphoto,каПора,цифрОва каПора,каПора Тонот,kamera
- Keywords[ven]=Tshinepe tsha g,Tshaudzhia zwifanyiso,digicam,webcam,Tshaudzhiazwifanyiso
- Keywords[xh]=gphoto,umfoti,digicam,webcam,umfoti
--Keywords[xx]=xxgphoto,camera,digicam,webcam,kameraxx
- Keywords[zh_CN]=gphoto,camera,digicam,webcam,kamera,ç
§ç›¸ćœş,ć•°ç ç›¸ćœş,ć‘„ĺƒĺ¤´
- Keywords[zh_TW]=gphoto,camera,digicam,webcam,kamera,ç
§ç›¸ćŠŸ
- Keywords[zu]=gphoto,ikhamera,digicam,webcam,ikhamera
-@@ -111,6 +109,7 @@
- Name[ar]=ŮƒŘ§Ů
يعا عقŮ
ŮŠŘŠ
- Name[az]=Digital Kamera
- Name[bg]=ФОтОапарат
-+Name[br]=Kamera niverel
- Name[bs]=Digitalna kamera
- Name[ca]=CĂ mera digital
- Name[cs]=DigitĂĄlnĂ­ kamera
-@@ -160,7 +159,6 @@
- Name[uz]=РақаПНи каПора
- Name[ven]=Tshau dzhia zwifanyiso tsha didzhithala
- Name[xh]=Ikhamera Yesuntswana
--Name[xx]=xxDigital Cameraxx
- Name[zh_CN]=ć•°ç ç›¸ćœş
- Name[zh_TW]=ć•¸ä˝ç›¸ćŠŸ
- Name[zu]=Ikhamera ebonisa inani ngalinye
-diff -urN -x CVS kdegraphics.orig/kcoloredit/kcolorchooser.desktop kdegraphics/kcoloredit/kcolorchooser.desktop
---- kdegraphics.orig/kcoloredit/kcolorchooser.desktop	2004-11-07 04:45:58.000000000 +0100
-+++ kdegraphics/kcoloredit/kcolorchooser.desktop	2005-03-12 09:29:35.000000000 +0100
-@@ -10,6 +10,7 @@
- GenericName[af]=Kleur Kieser
- GenericName[ar]=بعناŮ
ŘŹ ا؎تياع Ř§Ů„ŘŁŮ„ŮˆŘ§Ů†
- GenericName[bg]=Đ˜ĐˇĐąĐžŃ€ на Ń†Đ˛ŃŃ‚
-+GenericName[br]=Dibaber livioĂš
- GenericName[bs]=Izbornik boja
- GenericName[ca]=ElecciĂł de colors
- GenericName[cs]=Výběr barev
-@@ -33,6 +34,7 @@
- GenericName[ja]=色ぎ選択
- GenericName[lt]=SpalvĹł parinkiklis
- GenericName[lv]=Krāsu Izvēlētājs
-+GenericName[mk]=Đ˜ĐˇĐąĐ¸Ń€Đ°Ń‡ на йОи
- GenericName[mt]=Agħşel Kulur
- GenericName[nb]=Fargevelger
- GenericName[nl]=Kleurenkiezer
-@@ -58,7 +60,6 @@
- GenericName[ven]=Munangi wa Muvhala
- GenericName[wa]=Tchoezixheu di coleurs
- GenericName[xh]=Mkhethi Wombala
--GenericName[xx]=xxColor Chooserxx
- GenericName[zh_CN]=é˘œč‰˛é€‰ć‹Šç¨‹ĺş
- GenericName[zh_TW]=éĄč‰˛é¸ć“‡ç¨‹ĺź
- GenericName[zu]=Umkhethi Wombala
-@@ -90,7 +91,6 @@
- Name[uz]=Ранг танНОвчи
- Name[ven]=Tshinangi tsha muvhala tsha K
- Name[xh]=Umkhethi Wombala i K
--Name[xx]=xxKColorChooserxx
- Name[zh_TW]=éĄč‰˛é¸ć“‡ç¨‹ĺź
- Name[zu]=Umkhethi Wombala ka K
- 
-diff -urN -x CVS kdegraphics.orig/kcoloredit/kcoloredit.desktop kdegraphics/kcoloredit/kcoloredit.desktop
---- kdegraphics.orig/kcoloredit/kcoloredit.desktop	2005-02-23 06:06:14.000000000 +0100
-+++ kdegraphics/kcoloredit/kcoloredit.desktop	2005-03-12 09:29:35.000000000 +0100
-@@ -10,6 +10,7 @@
- GenericName[af]=Kleur Palet Redigeerder
- GenericName[ar]=Ů
حعع Ů„ŮˆŘ­ŘŠ Ř§Ů„ŘŁŮ„ŮˆŘ§Ů†
- GenericName[bg]=РодактОр на цвотОво
-+GenericName[br]=Aozer livaoueg
- GenericName[bs]=Editor palete boja
- GenericName[ca]=Editor de la paleta de colors
- GenericName[cs]=Editor palety barev
-@@ -57,7 +58,6 @@
- GenericName[uk]=РодактОр паНітри ĐşĐžĐťŃŒĐžŃ€Ń–Đ˛
- GenericName[ven]=Musengulusi wa phalete ya muvhala
- GenericName[wa]=Aspougneu del palete di coleurs
--GenericName[xx]=xxColor Palette Editorxx
- GenericName[zh_CN]=č°ƒč‰˛ćżçź–čž‘ĺ™¨
- GenericName[zh_TW]=čŞżč‰˛ćżçˇ¨čźŻĺ™¨
- GenericName[zu]=Umhleli Wombala we Palette
-@@ -81,7 +81,6 @@
- Name[tr]=K Renk DĂźzenleyici
- Name[ven]=U sengulusa muvhala ha K
- Name[xh]=Umhleli Wombala ye K
--Name[xx]=xxKColorEditxx
- Name[zh_TW]=éĄč‰˛çˇ¨čźŻç¨‹ĺź
- Name[zu]=Umhleli Wombala ka K
- 
-diff -urN -x CVS kdegraphics.orig/kdvi/dviwin.cpp kdegraphics/kdvi/dviwin.cpp
---- kdegraphics.orig/kdvi/dviwin.cpp	2005-01-24 08:08:35.000000000 +0100
-+++ kdegraphics/kdvi/dviwin.cpp	2005-04-16 12:18:51.000000000 +0200
-@@ -534,9 +534,9 @@
- 
- anchor dviRenderer::parseReference(const QString &reference)
- {
--  //#ifdef DEBUG_DVIWIN
--  kdError(4300) << "dviRenderer::parseReference( " << reference << " ) called" << endl;
--  //#endif
-+#ifdef DEBUG_DVIWIN
-+  kdDebug(4300) << "dviRenderer::parseReference( " << reference << " ) called" << endl;
-+#endif
-   
-   if (dviFile == 0)
-     return anchor();
-diff -urN -x CVS kdegraphics.orig/kdvi/dviwin_prescan.cpp kdegraphics/kdvi/dviwin_prescan.cpp
---- kdegraphics.orig/kdvi/dviwin_prescan.cpp	2005-01-29 22:11:39.000000000 +0100
-+++ kdegraphics/kdvi/dviwin_prescan.cpp	2005-04-14 08:37:45.000000000 +0200
-@@ -117,6 +117,7 @@
-   parse_special_argument(include_command, "rhi=", &rhi);
-   parse_special_argument(include_command, "angle=", &angle);
- 
-+  int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
- 
-   // Generate the PostScript commands to be included
-   QString PS = QString("ps: @beginspecial %1 @llx %2 @lly %3 @urx %4 @ury").arg(llx).arg(lly).arg(urx).arg(ury);
-@@ -126,6 +127,8 @@
-     PS.append( QString(" %1 @rhi").arg(rhi) );
-   if (angle != 0)
-     PS.append( QString(" %1 @angle").arg(angle) );
-+  if (clip != -1)
-+    PS.append(" @clip");
-   PS.append( " @setspecial\n" );
-   
-   QFile file( EPSfilename );
-@@ -415,7 +418,7 @@
-   parse_special_argument(include_command, "rwi=", &rwi);
-   parse_special_argument(include_command, "rhi=", &rhi);
-   parse_special_argument(include_command, "angle=", &angle);
--
-+  int clip=include_command.find(" clip"); // -1 if clip keyword is not present, >= 0 otherwise
- 
-   if (QFile::exists(EPSfilename)) {
-     double PS_H = (currinf.data.dvi_h*300.0)/(65536*1200)-300;
-@@ -432,6 +435,8 @@
-       PostScriptOutPutString->append( QString(" %1 @rhi").arg(rhi) );
-     if (angle != 0)
-       PostScriptOutPutString->append( QString(" %1 @angle").arg(angle) );
-+    if (clip != -1)
-+      PostScriptOutPutString->append(" @clip");
-     PostScriptOutPutString->append( " @setspecial \n" );
-     PostScriptOutPutString->append( QString(" (%1) run\n").arg(EPSfilename) );
-     PostScriptOutPutString->append( "@endspecial \n" );
-diff -urN -x CVS kdegraphics.orig/kdvi/fontMap.cpp kdegraphics/kdvi/fontMap.cpp
---- kdegraphics.orig/kdvi/fontMap.cpp	2004-10-05 14:21:37.000000000 +0200
-+++ kdegraphics/kdvi/fontMap.cpp	2005-03-30 08:42:53.000000000 +0200
-@@ -25,8 +25,14 @@
-   // "utmr8a.pfb". We use the map file of "ps2pk" because that progam
-   // has, like kdvi (and unlike dvips), no built-in fonts.
-   
-+  // Finding ps2pk.map is not easy. In teTeX < 3.0, the kpsewhich
-+  // program REQUIRES the option "--format=dvips config". In teTeX =
-+  // 3.0, the option "--format=map" MUST be used. Since there is no
-+  // way to give both options at the same time, there is seemingly no
-+  // other way than to try both options one after another. We use the
-+  // teTeX 3.0 format first.
-   KProcIO proc;
--  proc << "kpsewhich" << "--format=dvips config" << "ps2pk.map";
-+  proc << "kpsewhich" << "--format=map" << "ps2pk.map";
-   if (proc.start(KProcess::Block) == false) {
-     kdError(4700) << "fontMap::fontMap(): kpsewhich could not be started." << endl;
-     return;
-@@ -36,8 +42,21 @@
-   proc.readln(map_fileName);
-   map_fileName = map_fileName.stripWhiteSpace();
-   if (map_fileName.isEmpty()) {
--    kdError(4700) << "fontMap::fontMap(): The file 'ps2pk.map' could not be found by kpsewhich." << endl;
--    return;
-+    // Map file not found? Then we try the teTeX < 3.0 way of finding
-+    // the file.
-+    proc << "kpsewhich" << "--format=dvips config" << "ps2pk.map";
-+    if (proc.start(KProcess::Block) == false) {
-+      kdError(4700) << "fontMap::fontMap(): kpsewhich could not be started." << endl;
-+      return;
-+    }
-+    proc.readln(map_fileName);
-+    map_fileName = map_fileName.stripWhiteSpace();
-+    
-+    // If both versions fail, then there is nothing left to do.
-+    if (map_fileName.isEmpty()) {
-+      kdError(4700) << "fontMap::fontMap(): The file 'ps2pk.map' could not be found by kpsewhich." << endl;
-+      return;
-+    }
-   }
-   
-   QFile file( map_fileName );
-diff -urN -x CVS kdegraphics.orig/kdvi/kdvi.desktop kdegraphics/kdvi/kdvi.desktop
---- kdegraphics.orig/kdvi/kdvi.desktop	2005-01-09 05:03:43.000000000 +0100
-+++ kdegraphics/kdvi/kdvi.desktop	2005-03-07 15:18:05.000000000 +0100
-@@ -57,7 +57,6 @@
- GenericName[ven]=Muvhoni wa DVI
- GenericName[wa]=HĂĽyneu di fitchĂŽs DVI
- GenericName[xh]=Umboniseli we DVI
--GenericName[xx]=xxDVI Viewerxx
- GenericName[zh_CN]=DVI ćŸĽçœ‹ĺ™¨
- GenericName[zh_TW]=DVI 檢茖器
- GenericName[zu]=Umboniseli we DVI
-@@ -66,7 +65,6 @@
- Name[ar]=بعناŮ
ŘŹ KDVI
- Name[eo]=DVI-rigardilo
- Name[hi]=क༇-ŕ¤ĄŕĽ€ŕ¤ľŕĽ€ŕ¤†ŕ¤ˆ
--Name[xx]=xxKDVIxx
- MimeType=application/x-dvi;application/x-gzdvi;application/x-bz2dvi;
- InitialPreference=6
- Exec=kdvi %f -caption "%c" %i %m 
-diff -urN -x CVS kdegraphics.orig/kdvi/kdvi_multipage.cpp kdegraphics/kdvi/kdvi_multipage.cpp
---- kdegraphics.orig/kdvi/kdvi_multipage.cpp	2005-02-12 10:11:33.000000000 +0100
-+++ kdegraphics/kdvi/kdvi_multipage.cpp	2005-04-16 12:18:51.000000000 +0200
-@@ -201,6 +201,9 @@
-   if (!r)
-     emit setStatusBarText(QString::null);
- 
-+  //############
-+  //An dieser Stelle müsste der Zoom-Faktor neu berechnet werden?
-+
-   generateDocumentWidgets();
-   emit numberOfPages(DVIRenderer.totalPages());
-   enableActions(r);
-@@ -522,10 +525,13 @@
- 
- void KDVIMultiPage::enableActions(bool b)
- {
-+  KMultiPage::enableActions(b);
-+
-   docInfoAction->setEnabled(b);
-   exportPSAction->setEnabled(b);
-   exportPDFAction->setEnabled(b);
-   exportTextAction->setEnabled(b);
-+
-   setEmbedPostScriptAction();
- }
+Index: kpdf/xpdf/xpdf/DCTStream.cc
+===================================================================
+--- kpdf/xpdf/xpdf/DCTStream.cc	(.../tags/KDE/3.4.2/kdegraphics)	(revision 442272)
++++ kpdf/xpdf/xpdf/DCTStream.cc	(.../branches/KDE/3.4/kdegraphics)	(revision 442272)
+@@ -15,7 +15,15 @@
+ static boolean str_fill_input_buffer(j_decompress_ptr cinfo)
+ {
+   struct str_src_mgr * src = (struct str_src_mgr *)cinfo->src;
+-  src->buffer = src->str->getChar();
++  if (src->index == 0) {
++    src->buffer = 0xFF;
++    src->index++;
++  }
++  else if (src->index == 1) {
++    src->buffer = 0xD8;
++    src->index++;
++  }
++  else src->buffer = src->str->getChar();
+   src->pub.next_input_byte = &src->buffer;
+   src->pub.bytes_in_buffer = 1;
+   return TRUE;
+@@ -50,6 +58,7 @@
+   src.pub.bytes_in_buffer = 0;
+   src.pub.next_input_byte = NULL;
+   src.str = str;
++  src.index = 0;
+   cinfo.src = (jpeg_source_mgr *)&src;
+   cinfo.err = jpeg_std_error(&jerr);
+   x = 0;
+@@ -64,6 +73,40 @@
+   int row_stride;
  
-diff -urN -x CVS kdegraphics.orig/kdvi/kdvimultipage.desktop kdegraphics/kdvi/kdvimultipage.desktop
---- kdegraphics.orig/kdvi/kdvimultipage.desktop	2005-02-21 19:18:07.000000000 +0100
-+++ kdegraphics/kdvi/kdvimultipage.desktop	2005-04-13 04:15:39.000000000 +0200
-@@ -1,16 +1,15 @@
- [Desktop Entry]
- Type=Service
- Comment=DVI
--Comment[xx]=xxDVIxx
- Name=KDVIMultiPage
- Name[es]=KDVIMultiPĂĄgina
- Name[fr]=Multi-page KDVI
- Name[hu]=KDVITĂśbbOldalas
-+Name[nb]=KDVI Flerside
- Name[nl]=KDVIMultiPagina
- Name[pt]=KDVIMultiPĂĄgina
- Name[ro]=KDVI Pagini Multiple
- Name[sv]=KDVI flera sidor
--Name[xx]=xxKDVIMultiPagexx
- ServiceTypes=KViewShell/MultiPage
- X-KDE-Library=kdvipart
- X-KDE-MimeTypes=application/x-dvi
-diff -urN -x CVS kdegraphics.orig/kdvi/special.cpp kdegraphics/kdvi/special.cpp
---- kdegraphics.orig/kdvi/special.cpp	2005-02-06 15:16:52.000000000 +0100
-+++ kdegraphics/kdvi/special.cpp	2005-03-18 13:01:55.000000000 +0100
-@@ -387,8 +387,10 @@
-     return;
-   }
-   
--  int x = (int)( currinf.data.dvi_h/(shrinkfactor*65536.0) + xKoord*resolutionInDPI/1000.0 + 0.5 );
--  int y = (int)( currinf.data.pxl_v + yKoord*resolutionInDPI/1000.0 + 0.5 );
-+  float mag = dviFile->getMagnification()/1000.0;
+   str->reset();
 +  
-+  int x = (int)( currinf.data.dvi_h/(shrinkfactor*65536.0) + mag*xKoord*resolutionInDPI/1000.0 + 0.5 );
-+  int y = (int)( currinf.data.pxl_v + mag*yKoord*resolutionInDPI/1000.0 + 0.5 );
-   
-   // Initialize the point array used to store the path
-   if (TPIC_path.size() == 0) 
-diff -urN -x CVS kdegraphics.orig/kfax/kfax.desktop kdegraphics/kfax/kfax.desktop
---- kdegraphics.orig/kfax/kfax.desktop	2005-01-09 05:03:44.000000000 +0100
-+++ kdegraphics/kfax/kfax.desktop	2005-03-19 05:56:26.000000000 +0100
-@@ -16,6 +16,7 @@
- GenericName[eo]=Faksrigardilo
- GenericName[es]=Visor de faxes
- GenericName[et]=Fakside vaataja
-+GenericName[eu]=Fax ikustailua
- GenericName[fi]=Faksinäytin
- GenericName[fr]=Afficheur de fax
- GenericName[gl]=Visor de fax
-@@ -52,7 +53,6 @@
- GenericName[ven]=Muvhoni wa Fekisi
- GenericName[wa]=HĂĽyneu di facs
- GenericName[xh]=Umboniseli Wefax
--GenericName[xx]=xxFax Viewerxx
- GenericName[zh_CN]=äź çœŸćŸĽçœ‹ĺ™¨
- GenericName[zh_TW]=ĺ‚łçœŸćŞ˘čŚ–ĺ™¨
- GenericName[zu]=Umbonisi wefax
-@@ -68,7 +68,6 @@
- Name[th]=ŕš‚ŕ¸—ŕ¸Łŕ¸Şŕ¸˛ŕ¸Ł - K
- Name[ven]=Fekisi ya K
- Name[wa]=KFacs
--Name[xx]=xxKFaxxx
- Name[zh_TW]=KFax ĺ‚łçœŸ
- Exec=kfax %f   -caption "%c" %i %m
- Icon=kfax
-@@ -77,4 +76,4 @@
- Terminal=false
- X-KDE-StartupNotify=true
- X-DCOP-ServiceType=Multi
--Categories=Qt;KDE;Graphics;
-+Categories=Qt;KDE;Graphics;X-KDE-More;
-diff -urN -x CVS kdegraphics.orig/kfile-plugins/bmp/kfile_bmp.desktop kdegraphics/kfile-plugins/bmp/kfile_bmp.desktop
---- kdegraphics.orig/kfile-plugins/bmp/kfile_bmp.desktop	2005-01-09 05:03:44.000000000 +0100
-+++ kdegraphics/kfile-plugins/bmp/kfile_bmp.desktop	2005-03-07 15:18:06.000000000 +0100
-@@ -47,7 +47,6 @@
- Name[ven]=Mafhungo BMP
- Name[wa]=InformĂĽcion sol imĂĽdje BMP
- Name[xh]=Ulwazi lwe BMP
--Name[xx]=xxBMP Infoxx
- Name[zh_CN]=BMP 俥息
- Name[zh_TW]=BMP 資訊
- Name[zu]=Ulwazi lwe-BMP
-diff -urN -x CVS kdegraphics.orig/kfile-plugins/dds/kfile_dds.desktop kdegraphics/kfile-plugins/dds/kfile_dds.desktop
---- kdegraphics.orig/kfile-plugins/dds/kfile_dds.desktop	2005-02-21 19:18:08.000000000 +0100
-+++ kdegraphics/kfile-plugins/dds/kfile_dds.desktop	2005-04-13 04:15:40.000000000 +0200
-@@ -9,22 +9,26 @@
- Name[es]=InformaciĂłn de la primera vista de DirectDraw
- Name[et]=DirectDraw Surface'i info
- Name[fr]=Informations de surface DirectDraw
-+Name[he]=מיגע אודות מ׊טח DirectDraw
-+Name[hi]=ŕ¤Ąŕ¤žŕ¤Żŕ¤°ŕĽ‡ŕ¤•ŕĽŕ¤Ÿ-ड्रा सरऍ༇स ŕ¤œŕ¤žŕ¤¨ŕ¤•ŕ¤žŕ¤°ŕĽ€
- Name[hu]=DirectDraw felĂźletinformĂĄciĂł
- Name[is]=DirectDraw yfirborðs upplýsingar
- Name[it]=Informazioni superficie DirectDraw
-+Name[nb]=DirectDraw Overflate info
- Name[nl]=DirectDraw Surface-info
- Name[pl]=Informacja o powierzchni DirectDraw
- Name[pt]=Informação de Superfície DirectDraw
- Name[pt_BR]=Informaçþes Sobre Superfícies Direct Draw
- Name[ro]=InformaĹŁii SuprafaĹŁÄƒ DirectDraw
- Name[ru]=Сведения Đž пОворŃ
нОсти DirectDraw
-+Name[sk]=InformĂĄcie o povrchu DirectDraw
-+Name[sl]=Informacije o povrĹĄini DirectDraw
- Name[sr]=Đ˜Đ˝Ń„ĐžŃ€ĐźĐ°Ń†Đ¸Ń˜Đľ Đž DirectDraw ĐżĐžĐ˛Ń€ŃˆĐ¸Đ˝Đ¸
--Name[sr at Latn]=Đ˜Đ˝Ń„ĐžŃ€ĐźĐ°Ń†Đ¸Ń˜Đľ Đž DirectDraw ĐżĐžĐ˛Ń€ŃˆĐ¸Đ˝Đ¸
-+Name[sr at Latn]=Informacije o DirectDraw povrĹĄini
- Name[sv]=Directdraw ytinformation
- Name[ta]=ŕŽ¨ŕŻ‡ŕŽ°ŕŽŸŕŽż ŕŽŽŕŻ‡ŕŽąŕŻŕŽŞŕŽ°ŕŽŞŕŻŕŽŞŕŻ ŕŽ¤ŕŽ•ŕŽľŕŽ˛ŕŻ
- Name[tr]=DirectDraw YĂźzey Bilgisi
- Name[uk]=Đ†Đ˝Ń„ĐžŃ€ĐźĐ°Ń†Ń–Ń прО пОворŃ
ню DirectDraw
--Name[xx]=xxDirectDraw Surface Infoxx
- Name[zh_CN]=DirectDraw 表面信息
- ServiceTypes=KFilePlugin
- X-KDE-Library=kfile_dds
-diff -urN -x CVS kdegraphics.orig/kfile-plugins/dvi/kfile_dvi.desktop kdegraphics/kfile-plugins/dvi/kfile_dvi.desktop
---- kdegraphics.orig/kfile-plugins/dvi/kfile_dvi.desktop	2005-01-17 05:32:48.000000000 +0100
-+++ kdegraphics/kfile-plugins/dvi/kfile_dvi.desktop	2005-03-12 09:29:36.000000000 +0100
-@@ -4,6 +4,7 @@
- MimeType=application/x-dvi
- Name=DVI Info
- Name[ar]=Ů
ŘšŮ„ŮˆŮ
ات DVI
-+Name[br]=TitouroĂš DVI
- Name[ca]=InformaciĂł de DVI
- Name[cs]=DVI info
- Name[cy]=Gwybodaeth DVI
-@@ -40,7 +41,6 @@
- Name[uk]=Đ†Đ˝Ń„ĐžŃ€ĐźĐ°Ń†Ń–Ń пО DVI
- Name[uz]=DVI ҳақида ĐźĐ°ŃŠĐťŃƒĐźĐžŃ‚
- Name[wa]=InformĂĽcion sol documint DVI
--Name[xx]=xxDVI Infoxx
- Name[zh_CN]=DVI 俥息
- ServiceTypes=KFilePlugin
- Type=Service
-diff -urN -x CVS kdegraphics.orig/kfile-plugins/exr/kfile_exr.desktop kdegraphics/kfile-plugins/exr/kfile_exr.desktop
---- kdegraphics.orig/kfile-plugins/exr/kfile_exr.desktop	2005-01-10 06:15:12.000000000 +0100
-+++ kdegraphics/kfile-plugins/exr/kfile_exr.desktop	2005-03-11 09:25:44.000000000 +0100
-@@ -15,6 +15,7 @@
- Name[fr]=Informations EXR
- Name[gl]=Inf. EXR
- Name[he]=מידע EXR
-+Name[hi]=ŕ¤ˆŕ¤ŕ¤•ŕĽŕ¤¸ŕ¤†ŕ¤° ŕ¤œŕ¤žŕ¤¨ŕ¤•ŕ¤žŕ¤°ŕĽ€
- Name[hu]=EXR-jellemzők
- Name[is]=EXR upplýsingar
- Name[it]=Informazioni EXR
-@@ -30,14 +31,13 @@
- Name[se]=EXR-dieđut
- Name[sl]=Informacije o EXR
- Name[sr]=EXR Đ¸Đ˝Ń„ĐžŃ€ĐźĐ°Ń†Đ¸Ń˜Đľ
--Name[sr at Latn]=EXR Đ¸Đ˝Ń„ĐžŃ€ĐźĐ°Ń†Đ¸Ń˜Đľ
-+Name[sr at Latn]=EXR informacije
- Name[sv]=EXR-information
- Name[ta]=EXR ŕŽ¤ŕŽ•ŕŽľŕŽ˛ŕŻ
- Name[tg]=Đ˜Ń‚Ń‚Đ¸ĐťĐžĐžŃ‚ Оиди EXR
- Name[tr]=EXR Bilgisi
- Name[uk]=Đ†Đ˝Ń„ĐžŃ€ĐźĐ°Ń†Ń–Ń пО EXR
- Name[uz]=EXR ҳақида ĐźĐ°ŃŠĐťŃƒĐźĐžŃ‚
--Name[xx]=xxEXR Infoxx
- Name[zh_CN]=EXR 俥息
- ServiceTypes=KFilePlugin
- X-KDE-Library=kfile_exr
-diff -urN -x CVS kdegraphics.orig/kfile-plugins/gif/kfile_gif.desktop kdegraphics/kfile-plugins/gif/kfile_gif.desktop
---- kdegraphics.orig/kfile-plugins/gif/kfile_gif.desktop	2005-01-09 05:03:45.000000000 +0100
-+++ kdegraphics/kfile-plugins/gif/kfile_gif.desktop	2005-03-12 09:29:36.000000000 +0100
-@@ -4,6 +4,7 @@
- Name=GIF Info
- Name[af]=Gif Inligting
- Name[ar]=Ů
ŘšŮ„ŮˆŮ
ات GIF
-+Name[br]=TitouroĂš GIF
- Name[ca]=InformaciĂł de GIF
- Name[cs]=GIF info
- Name[cy]=Gwybodaeth GIF
-@@ -46,7 +47,6 @@
- Name[ven]=Mafhungo a GIF
- Name[wa]=InformĂĽcion sol imĂĽdje GIF
- Name[xh]=Ulwazi lwe GIF
--Name[xx]=xxGIF Infoxx
- Name[zh_CN]=GIF 俥息
- Name[zh_TW]=GIF 資訊
- Name[zu]=Ulwazi lwe-GIF
-diff -urN -x CVS kdegraphics.orig/kfile-plugins/ico/kfile_ico.desktop kdegraphics/kfile-plugins/ico/kfile_ico.desktop
---- kdegraphics.orig/kfile-plugins/ico/kfile_ico.desktop	2005-01-09 05:03:45.000000000 +0100
-+++ kdegraphics/kfile-plugins/ico/kfile_ico.desktop	2005-03-12 09:29:36.000000000 +0100
-@@ -4,6 +4,7 @@
- Name=ICO Info
- Name[af]=Ico Inligting
- Name[ar]=Ů
ŘšŮ„ŮˆŮ
ات ICO
-+Name[br]=TitouroĂš ICO
- Name[ca]=InformaciĂł d'ICO
- Name[cs]=ICO info
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdegraphics-branch.diff?r1=1.6&r2=1.7&f=u

More information about the pld-cvs-commit mailing list