[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

gnome-apt and #44427, #45928



Hi,

I have a fix for gnome-apt's RC bug. I'm not sure if the maintainer is
still "alive", otherwise I need a sponsor for the NMU. It's a workaround
for a g++ bug and should be checked in particular on the non-i386 ports.
It's a dirty hack that cannot be included in the official sources.

Torsten


diff -urN gnome-apt-0.3.4/debian/changelog gnome-apt-0.3.4.1/debian/changelog
--- gnome-apt-0.3.4/debian/changelog	Mon Jul  5 10:25:21 1999
+++ gnome-apt-0.3.4.1/debian/changelog	Fri Nov  5 23:14:45 1999
@@ -1,3 +1,9 @@
+gnome-apt (0.3.4.1) unstable; urgency=low
+
+  * NMU, hack to fix RC bug
+
+ -- Torsten Werner <twerner@intercomm.de>  Fri,  5 Nov 1999 23:13:01 +0100
+
 gnome-apt (0.3.4) unstable; urgency=low
 
   * Fixed version reporting bug
diff -urN gnome-apt-0.3.4/debian/patch gnome-apt-0.3.4.1/debian/patch
--- gnome-apt-0.3.4/debian/patch	Thu Jan  1 01:00:00 1970
+++ gnome-apt-0.3.4.1/debian/patch	Fri Nov  5 22:53:53 1999
@@ -0,0 +1,18 @@
+--- config.h	Fri Nov  5 22:51:14 1999
++++ debian/config.h	Fri Nov  5 22:52:05 1999
+@@ -5,7 +5,6 @@
+ /* #undef C_ALLOCA */
+ 
+ /* Define to empty if the keyword does not work.  */
+-#define const 
+ 
+ /* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
+    This function is required for alloca.c support on those systems.  */
+@@ -21,7 +20,6 @@
+ /* #undef HAVE_MMAP */
+ 
+ /* Define as __inline if that's what the C compiler calls it.  */
+-#define inline 
+ 
+ /* Define to `long' if <sys/types.h> doesn't define.  */
+ /* #undef off_t */
diff -urN gnome-apt-0.3.4/debian/rules gnome-apt-0.3.4.1/debian/rules
--- gnome-apt-0.3.4/debian/rules	Fri Jan 29 02:34:44 1999
+++ gnome-apt-0.3.4.1/debian/rules	Fri Nov  5 23:22:19 1999
@@ -13,6 +13,7 @@
 	
 	# Add here commands to compile the package.
 	./autogen.sh --prefix=/usr/X11R6 --datadir=/usr/share --mandir=/usr/X11R6/man
+	patch < debian/patch
 	$(MAKE) 
 
 	touch build-stamp
diff -urN gnome-apt-0.3.4/src/cache.cc gnome-apt-0.3.4.1/src/cache.cc
--- gnome-apt-0.3.4/src/cache.cc	Mon Jun 21 16:46:30 1999
+++ gnome-apt-0.3.4.1/src/cache.cc	Fri Nov  5 21:32:46 1999
@@ -780,7 +780,7 @@
           bool retval = cd.run();
           
           // get lock back
-          if (Lock.GetLock() == false)
+          if (Lock.GetLock(true) == false)
             gnome_apt_fatal_dialog(_("Failed to get the lock back from dpkg"));
 
    
diff -urN gnome-apt-0.3.4/src/menus.cc gnome-apt-0.3.4.1/src/menus.cc
--- gnome-apt-0.3.4/src/menus.cc	Sat Feb 20 19:58:55 1999
+++ gnome-apt-0.3.4.1/src/menus.cc	Fri Nov  5 22:06:08 1999
@@ -347,7 +347,7 @@
 };
 
 static GnomeUIInfo help_menu[] = {
-  GNOMEUIINFO_HELP(APPNAME),
+  GNOMEUIINFO_HELP((void *) APPNAME),
   {GNOME_APP_UI_ITEM, N_("_About..."), 
    N_("Tell about this application"), 
    about_cb, NULL, NULL,
@@ -1390,7 +1390,7 @@
 
   hbox = gtk_hbox_new(FALSE, GNOME_PAD*12);
 
-  pix = gnome_pixmap_new_from_xpm_d(GAptPkgTree::pixmap_data(p));
+  pix = gnome_pixmap_new_from_xpm_d((char **) GAptPkgTree::pixmap_data(p));
 
   gtk_box_pack_start(GTK_BOX(hbox), pix, TRUE, TRUE, 0);
 
diff -urN gnome-apt-0.3.4/src/pkgtree.cc gnome-apt-0.3.4.1/src/pkgtree.cc
--- gnome-apt-0.3.4/src/pkgtree.cc	Mon Jun 21 16:46:30 1999
+++ gnome-apt-0.3.4.1/src/pkgtree.cc	Fri Nov  5 22:12:07 1999
@@ -49,7 +49,7 @@
 #include "pixmaps/upgrade.xpm"
 #include "pixmaps/replaces.xpm"
 
-const char**
+char**
 GAptPkgTree::pixmap_data(PixmapType p) 
 {
   switch (p) {
@@ -1120,7 +1120,7 @@
     if (tree_ == 0) return;
     if (!GTK_WIDGET_REALIZED(GTK_WIDGET(tree_->widget()))) return;
  
-    char** data = pixmap_data(static_cast<PixmapType>(p));
+    char** data = (char**) pixmap_data(static_cast<PixmapType>(p));
     
     if (data) {
       GdkPixmap * pix = 0;
diff -urN gnome-apt-0.3.4/src/pkgtree.h gnome-apt-0.3.4.1/src/pkgtree.h
--- gnome-apt-0.3.4/src/pkgtree.h	Sun Jan 31 14:16:07 1999
+++ gnome-apt-0.3.4.1/src/pkgtree.h	Fri Nov  5 22:14:43 1999
@@ -147,7 +147,7 @@
     PixmapTypeEnd
   } PixmapType;
 
-  static const char** pixmap_data(PixmapType p);
+  static char** pixmap_data(PixmapType p);
   
   void pixmap(PixmapType p, GdkPixmap** pixmap, GdkPixmap ** mask);
 

-- 
Torsten Werner                          Dresden University of Technology
email: twerner@intercomm.de                phone/fax: +49 3501 530061/11
Vote against SPAM!                   http://www.politik-digital.de/spam/

Attachment: pgpo37oTmh4uf.pgp
Description: PGP signature


Reply to: