r140 - in trunk/vim/debian: . patches

Norbert Tretkowski nobse@costa.debian.org
Tue, 29 Mar 2005 10:24:39 +0000


Author: nobse
Date: 2005-03-29 10:24:38 +0000 (Tue, 29 Mar 2005)
New Revision: 140

Removed:
   trunk/vim/debian/patches/401_gcc4.diff
Modified:
   trunk/vim/debian/changelog
Log:
removed 401_gcc4.diff


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-03-29 09:40:07 UTC (rev 139)
+++ trunk/vim/debian/changelog	2005-03-29 10:24:38 UTC (rev 140)
@@ -4,8 +4,10 @@
     + Removed all kvim related packages, the code is no longer maintained.
       Sorry. (closes: #234455, #237385, #283765, #293110, #194449, #205586,
       #266431, #272621, #294848, #245006, #194964)
+    + Removed patch 401_gcc4.diff, it modified kvim code which is no longer
+      available.
 
- -- Norbert Tretkowski <nobse@debian.org>  Tue, 29 Mar 2005 11:28:15 +0200
+ -- Norbert Tretkowski <nobse@debian.org>  Tue, 29 Mar 2005 12:24:24 +0200
 
 vim (1:6.3-068+3) unstable; urgency=medium
 

Deleted: trunk/vim/debian/patches/401_gcc4.diff
===================================================================
--- trunk/vim/debian/patches/401_gcc4.diff	2005-03-29 09:40:07 UTC (rev 139)
+++ trunk/vim/debian/patches/401_gcc4.diff	2005-03-29 10:24:38 UTC (rev 140)
@@ -1,73 +0,0 @@
-diff -urN tmp/src/gui_kde.cc vim63/src/gui_kde.cc
---- tmp/src/gui_kde.cc	2005-01-04 22:49:29.000000000 +0100
-+++ vim63/src/gui_kde.cc	2005-01-05 09:58:16.000000000 +0100
-@@ -236,10 +236,10 @@
- 	if (parent) {
- 		idx++; // for tearoffs to be first in menus
- 		me = new QPopupMenu(parent->widget, (const char *) menu->name);
--		parent->widget->insertItem( QString((const char *)menu->name), me, (int)me, idx);
-+		parent->widget->insertItem( QString((const char *)menu->name), me, (long)me, idx);
- 	} else {
- 		me = new QPopupMenu(vmw->menuBar() , (const char *) menu->name);
--		vmw->menuBar()->insertItem( QString((const char *)menu->name), me , (int) me, idx);
-+		vmw->menuBar()->insertItem( QString((const char *)menu->name), me , (long) me, idx);
- 	}
- 
- 	me->setCaption((const char*)( menu->dname  ));
-@@ -280,7 +280,7 @@
- 		if (pix.isNull()) return; // failed
- 		vmw->toolBar()->insertButton (
- 				pix,
--				(int) menu , // id
-+				(long) menu , // id
- 				true,
- 				(char *) (menu->strings[MENU_INDEX_TIP]) , // tooltip or text
- 				idx
-@@ -295,7 +295,7 @@
- 		parent->widget->insertSeparator();
- 		return;
- 	}
--	parent->widget->insertItem(QString((const char *)menu->name), (int)menu, idx );
-+	parent->widget->insertItem(QString((const char *)menu->name), (long)menu, idx );
- #endif
- }//}}}
- 
-@@ -367,12 +367,12 @@
- {
- #ifdef FEAT_TOOLBAR
- 	if (menu->parent && menu_is_toolbar(menu->parent->name)) {
--		vmw->toolBar()->removeItem( (int) menu );
-+		vmw->toolBar()->removeItem( (long) menu );
- 		return;
- 	}
- #endif
- 	if(menu->parent){
--		menu->parent->widget->removeItem((int)menu );
-+		menu->parent->widget->removeItem((long)menu );
- 	}
- 	if (menu->widget){
- 		delete menu->widget;
-diff -urN tmp/src/gui_kde_widget.cc vim63/src/gui_kde_widget.cc
---- tmp/src/gui_kde_widget.cc	2005-01-04 22:49:29.000000000 +0100
-+++ vim63/src/gui_kde_widget.cc	2005-01-05 10:25:57.000000000 +0100
-@@ -1302,7 +1302,7 @@
-     }
- 
-     connect(sb->w, SIGNAL(valueChanged(int)), &mapper, SLOT(map()));    
--    mapper.setMapping(sb->w, (int)sb);
-+    mapper.setMapping(sb->w, (long)sb);
- }//}}}
- 
- 
-diff -urN tmp/src/gui_kde_x11.cc vim63/src/gui_kde_x11.cc
---- tmp/src/gui_kde_x11.cc	2005-01-04 22:49:29.000000000 +0100
-+++ vim63/src/gui_kde_x11.cc	2005-01-05 10:19:15.000000000 +0100
-@@ -1104,7 +1104,7 @@
- gui_mch_menu_grey(vimmenu_T * menu, int grey)//{{{
- {
- 	if ( !menu || !menu->parent || !menu->parent->widget ) return;
--	menu->parent->widget->setItemEnabled((int)menu, !grey);
-+	menu->parent->widget->setItemEnabled((long)menu, !grey);
- 	gui_mch_update();
- }//}}}
-