SOURCES (DEVEL): kdebase-fontdir.patch, kdebase-konsole-default-ke...

[adgor]

Author: adgor                        Date: Sun Jun 26 16:58:18 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- Updated for 050625 snap (nsplugins_dirs.patch must be updated anyway)

---- Files affected:
SOURCES:
   kdebase-fontdir.patch (1.3 -> 1.3.6.1) , kdebase-konsole-default-keytab.patch (1.6 -> 1.6.4.1) , kdebase-nsplugins_dirs.patch (1.6 -> 1.6.6.1) 

---- Diffs:

================================================================
Index: SOURCES/kdebase-fontdir.patch
diff -u SOURCES/kdebase-fontdir.patch:1.3 SOURCES/kdebase-fontdir.patch:1.3.6.1
--- SOURCES/kdebase-fontdir.patch:1.3	Tue Aug 10 04:06:57 2004
+++ SOURCES/kdebase-fontdir.patch	Sun Jun 26 18:58:13 2005
@@ -1,17 +1,18 @@
---- kdebase/konsole/fonts/Makefile.am.orig	2004-03-23 14:56:32.000000000 +0100
-+++ kdebase/konsole/fonts/Makefile.am	2004-03-23 15:11:37.198389600 +0100
-@@ -1,12 +1,8 @@
--fontdir = $(datadir)/fonts
--font_DATA =console8x16.pcf.gz console8x8.pcf.gz 9x15.pcf.gz
+--- kdebase-050625/konsole/fonts/Makefile.am.orig	2005-06-24 22:46:36.000000000 +0200
++++ kdebase-050625/konsole/fonts/Makefile.am	2005-06-25 07:14:05.973746664 +0200
+@@ -1,5 +1,5 @@
+-fontdir = $(kde_datadir)/konsole/fonts
+-font_DATA =console8x16.pcf.gz 9x15.pcf.gz
 +fontdir = /usr/share/fonts/misc
-+font_DATA =console8x16.pcf.gz console8x8.pcf.gz
++font_DATA = console8x16.pcf.gz
  
  EXTRA_DIST = $(font_DATA)
  
--# This uses -hook instead of -local so that it is run after fonts are installed
--install-data-hook:
--	-mkfontdir $(DESTDIR)$(fontdir)
--
- # edit with xmbdfed console8x16.bdf
- fonts: $(srcdir)/console8x16.bdf
+@@ -10,7 +10,3 @@
+ console8x16.pcf.gz: $(srcdir)/console8x16.bdf
  	bdftopcf -o console8x16.pcf $(srcdir)/console8x16.bdf
+ 	gzip --best console8x16.pcf
+-
+-9x15.pcf.gz: $(srcdir)/9x15.bdf
+-	bdftopcf -o 9x15.pcf $(srcdir)/9x15.bdf
+-	gzip --best 9x15.pcf

================================================================
Index: SOURCES/kdebase-konsole-default-keytab.patch
diff -u SOURCES/kdebase-konsole-default-keytab.patch:1.6 SOURCES/kdebase-konsole-default-keytab.patch:1.6.4.1
--- SOURCES/kdebase-konsole-default-keytab.patch:1.6	Tue Aug 10 04:08:13 2004
+++ SOURCES/kdebase-konsole-default-keytab.patch	Sun Jun 26 18:58:13 2005
@@ -9,20 +9,3 @@
    "key Up   -Shift-Ansi : \"\\EA\"\n"
    "key Down -Shift-Ansi : \"\\EB\"\n"
    "key Right-Shift-Ansi : \"\\EC\"\n"
-@@ -25,12 +25,12 @@
-   "key Enter-NewLine : \"\\r\"\n"
-   "key Home  -Shift-AppCuKeys : \"\\E[H\"  \n"
-   "key End   -Shift-AppCuKeys : \"\\E[F\"  \n"
--  "key Home  +Shift-AppCuKeys : \"\\E[2H\"  \n"
--  "key End   +Shift-AppCuKeys : \"\\E[2F\"  \n"
-+  "key Home  +Shift-AppCuKeys : \"\\E[1;2H\"  \n"
-+  "key End   +Shift-AppCuKeys : \"\\E[1;2F\"  \n"
-   "key Home  -Shift+AppCuKeys : \"\\EOH\"  \n"
-   "key End   -Shift+AppCuKeys : \"\\EOF\"  \n"
--  "key Home  +Shift+AppCuKeys : \"\\EO2H\"  \n"
--  "key End   +Shift+AppCuKeys : \"\\EO2F\"  \n"
-+  "key Home  +Shift+AppCuKeys : \"\\E[1;2H\"  \n"
-+  "key End   +Shift+AppCuKeys : \"\\E[1;2F\"  \n"
-   "key Insert-Shift : \"\\E[2~\"  \n"
-   "key Delete-Shift : \"\\E[3~\"  \n"
-   "key Prior -Shift : \"\\E[5~\"  \n"

================================================================
Index: SOURCES/kdebase-nsplugins_dirs.patch
diff -u SOURCES/kdebase-nsplugins_dirs.patch:1.6 SOURCES/kdebase-nsplugins_dirs.patch:1.6.6.1
--- SOURCES/kdebase-nsplugins_dirs.patch:1.6	Tue Aug 10 04:08:40 2004
+++ SOURCES/kdebase-nsplugins_dirs.patch	Sun Jun 26 18:58:13 2005
@@ -23,12 +23,13 @@
      }
  
      // fill list
---- kdebase/nsplugins/pluginscan.cpp.orig	2004-03-23 14:57:02.000000000 +0100
-+++ kdebase/nsplugins/pluginscan.cpp	2004-03-23 15:15:28.117284592 +0100
-@@ -441,20 +441,7 @@
+--- kdebase-050604/nsplugins/pluginscan.cpp.orig	2005-06-04 08:04:05.000000000 +0200
++++ kdebase-050604/nsplugins/pluginscan.cpp	2005-06-04 14:43:09.291731712 +0200
+@@ -443,22 +443,7 @@
      // setup default paths
      if ( !config->hasKey("scanPaths") ) {
          QStringList paths;
+-        paths.append("$HOME/.mozilla/plugins");
 -        paths.append("$HOME/.netscape/plugins");
 -        paths.append("/usr/lib64/browser-plugins");
 -        paths.append("/usr/lib/browser-plugins");
@@ -43,7 +44,8 @@
 -        paths.append("/usr/lib/mozilla/plugins");
 -	paths.append("/usr/lib64/netscape/plugins");
 -	paths.append("/usr/lib64/mozilla/plugins");
-+        paths.append("/usr/lib/kde3/plugins/konqueror");
-         paths.append("$MOZILLA_HOME/plugins");
+-        paths.append("$MOZILLA_HOME/plugins");
++	paths.append("/usr/lib/kde3/plugins/konqueror");
          config->writeEntry( "scanPaths", paths );
      }
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdebase-fontdir.patch?r1=1.3&r2=1.3.6.1&f=u
    http://cvs.pld-linux.org/SOURCES/kdebase-konsole-default-keytab.patch?r1=1.6&r2=1.6.4.1&f=u
    http://cvs.pld-linux.org/SOURCES/kdebase-nsplugins_dirs.patch?r1=1.6&r2=1.6.6.1&f=u