Hmm - that's strange. Are you using 1.8.3+debian-11? (that's what it was diffed against). It applies cleanly for me, and when added to debian/patches/00list it patches and builds fine with dpkg-buildpackage.
--- cat debian/patches/24_enhanced_mem.dpatch | patch -p1 patching file linux/memmeter.cc patching file Xdefaults patching file Xdefaults.in patching file Xdefaults.stipple --- I'll attach the full patch I use for my own builds (has my changelog entry, addition to 00list and the patch itself). Kartik Mistry wrote: > I am not able to apply your patch cleanly. Can you look at it and > patch against latest version in Debian? > > Thanks. >
diff -urN xosview-1.8.3+debian.old/debian/changelog xosview-1.8.3+debian/debian/changelog --- xosview-1.8.3+debian.old/debian/changelog 2008-11-26 13:14:53.000000000 -0600 +++ xosview-1.8.3+debian/debian/changelog 2008-11-26 13:13:30.052495000 -0600 @@ -1,3 +1,10 @@ +xosview (1.8.3+debian-11-tli1) unstable; urgency=low + + * debian/patches/24_enhanced_mem.dpatch + + added mem values for slab, mapped, and page tables + + -- Ryan Thoryk <[email protected]> Wed, 26 Nov 2008 12:56:45 -0600 + xosview (1.8.3+debian-11) unstable; urgency=low * debian/patches/23_cpumeter_guest_time.dpatch: diff -urN xosview-1.8.3+debian.old/debian/patches/00list xosview-1.8.3+debian/debian/patches/00list --- xosview-1.8.3+debian.old/debian/patches/00list 2008-11-26 13:14:53.000000000 -0600 +++ xosview-1.8.3+debian/debian/patches/00list 2008-11-26 13:15:50.044496544 -0600 @@ -20,3 +20,4 @@ 21_fix_unclutter.dpatch 22_fix_valgrind_reports.dpatch 23_cpumeter_guest_time.dpatch +24_enhanced_mem.dpatch diff -urN xosview-1.8.3+debian.old/debian/patches/24_enhanced_mem.dpatch xosview-1.8.3+debian/debian/patches/24_enhanced_mem.dpatch --- xosview-1.8.3+debian.old/debian/patches/24_enhanced_mem.dpatch 1969-12-31 18:00:00.000000000 -0600 +++ xosview-1.8.3+debian/debian/patches/24_enhanced_mem.dpatch 2008-11-26 13:12:19.009182000 -0600 @@ -0,0 +1,126 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 24_enhanced_mem.dpatch +## Dpatch by Ryan Thoryk <[email protected]> +## DP: Additional mem values for Linux + +...@dpatch@ + +diff -urN xosview-1.8.3-orig/linux/memmeter.cc xosview-1.8.3-new/linux/memmeter.cc +--- xosview-1.8.3-orig/linux/memmeter.cc 2006-02-17 22:33:06.000000000 -0600 ++++ xosview-1.8.3-new/linux/memmeter.cc 2008-11-26 12:34:17.558494000 -0600 +@@ -15,7 +15,7 @@ + static const char MEMSTATFNAME[] = "/proc/memstat"; + + MemMeter::MemMeter( XOSView *parent ) +-: FieldMeterGraph( parent, 4, "MEM", "USED+SHAR/BUFF/CACHE/FREE" ){ ++: FieldMeterGraph( parent, 7, "MEM", "USED/BUFF/SLAB/MAP/PT/CACHE/FREE" ){ + _shAdj = -1; + + // Check and see if the memstat module has been loaded +@@ -43,8 +43,11 @@ + if (_shAdj == 0) + setfieldcolor( 1, parent_->getResource( "memSharedColor" ) ); + setfieldcolor( 2 + _shAdj, parent_->getResource( "memBufferColor" ) ); +- setfieldcolor( 3 + _shAdj, parent_->getResource( "memCacheColor" ) ); +- setfieldcolor( 4 + _shAdj, parent_->getResource( "memFreeColor" ) ); ++ setfieldcolor( 3 + _shAdj, parent_->getResource( "memSlabColor" ) ); ++ setfieldcolor( 4 + _shAdj, parent_->getResource( "memMapColor" ) ); ++ setfieldcolor( 5 + _shAdj, parent_->getResource( "memPTColor" ) ); ++ setfieldcolor( 6 + _shAdj, parent_->getResource( "memCacheColor" ) ); ++ setfieldcolor( 7 + _shAdj, parent_->getResource( "memFreeColor" ) ); + priority_ = atoi (parent_->getResource( "memPriority" ) ); + dodecay_ = parent_->isResourceTrue( "memDecay" ); + useGraph_ = parent_->isResourceTrue( "memGraph" ); +@@ -54,11 +57,12 @@ + void MemMeter::checkevent( void ){ + getmeminfo(); + /* for debugging (see below) +- printf("t %4.1f used %4.1f share %4.1f buffer %4.1f cache %4.1f free %4.1f\n", ++ printf("t %4.1f used %4.1f buffer %4.1f slab %4.1f map %4.1f pt %4.1f cache %4.1f free %4.1f\n", + total_/1024.0/1024.0, + fields_[0]/1024.0/1024.0, fields_[1]/1024.0/1024.0, + fields_[2]/1024.0/1024.0, fields_[3]/1024.0/1024.0, +- fields_[4]/1024.0/1024.0); ++ fields_[4]/1024.0/1024.0, fields_[5]/1024.0/1024.0, ++ fields_[6]/1024.0/1024.0); + */ + drawfields(); + } +@@ -76,11 +80,11 @@ + // without this fix "used" sometimes gets < 0 ! + fields_[0] = total_ - fields_[4] - fields_[3] - fields_[2] - fields_[1]; + }else{ +- fields_[0] = total_ - fields_[3] - fields_[2] - fields_[1]; ++ fields_[0] = total_ - fields_[6] - fields_[5] - fields_[4] - fields_[3] - fields_[2] - fields_[1]; + } + + if (total_) +- FieldMeterDecay::setUsed (total_ - fields_[4 + _shAdj], total_); ++ FieldMeterDecay::setUsed (total_ - fields_[7 + _shAdj], total_); + } + + MemMeter::LineInfo *MemMeter::findLines(LineInfo *tmplate, int len, +@@ -116,9 +120,12 @@ + void MemMeter::initLineInfo(void){ + static LineInfo infos[] = { + LineInfo("MemTotal", &total_), +- LineInfo("MemFree", &fields_[4 + _shAdj]), ++ LineInfo("MemFree", &fields_[7 + _shAdj]), + LineInfo("Buffers", &fields_[2 + _shAdj]), +- LineInfo("Cached", &fields_[3 + _shAdj]) ++ LineInfo("Slab", &fields_[3 + _shAdj]), ++ LineInfo("Mapped", &fields_[4 + _shAdj]), ++ LineInfo("PageTables", &fields_[5 + _shAdj]), ++ LineInfo("Cached", &fields_[6 + _shAdj]) + }; + _numMIlineInfos = sizeof(infos) / sizeof(LineInfo); + +diff -urN xosview-1.8.3-orig/Xdefaults xosview-1.8.3-new/Xdefaults +--- xosview-1.8.3-orig/Xdefaults 2006-02-18 19:36:08.000000000 -0600 ++++ xosview-1.8.3-new/Xdefaults 2008-11-26 12:53:01.477496000 -0600 +@@ -87,6 +87,9 @@ + xosview*memUsedColor: seagreen + xosview*memSharedColor: SkyBlue + xosview*memBufferColor: orange ++xosview*memSlabColor: slateblue1 ++xosview*memMapColor: lightgoldenrod ++xosview*memPTColor: lightgreen + xosview*memCacheColor: red + xosview*memFreeColor: aquamarine + xosview*memTextColor: blue +diff -urN xosview-1.8.3-orig/Xdefaults.in xosview-1.8.3-new/Xdefaults.in +--- xosview-1.8.3-orig/Xdefaults.in 2006-02-17 23:45:00.000000000 -0600 ++++ xosview-1.8.3-new/Xdefaults.in 2008-11-26 12:37:19.204494000 -0600 +@@ -87,6 +87,9 @@ + xosview*memUsedColor: seagreen + xosview*memSharedColor: SkyBlue + xosview*memBufferColor: orange ++xosview*memSlabColor: blue ++xosview*memMapColor: SlateBlue1 ++xosview*memPTColor: lightgreen + xosview*memCacheColor: red + xosview*memFreeColor: aquamarine + xosview*memTextColor: blue +diff -urN xosview-1.8.3-orig/Xdefaults.stipple xosview-1.8.3-new/Xdefaults.stipple +--- xosview-1.8.3-orig/Xdefaults.stipple 1999-11-06 16:48:16.000000000 -0600 ++++ xosview-1.8.3-new/Xdefaults.stipple 2008-11-26 12:25:50.067494000 -0600 +@@ -14,6 +14,9 @@ + xosvstipple*memUsedColor: orange + xosvstipple*memSharedColor: orange + xosvstipple*memBufferColor: orange ++xosvstipple*memSlabColor: orange ++xosvstipple*memMapColor: orange ++xosvstipple*memPTColor: orange + xosvstipple*memCacheColor: orange + xosvstipple*memFreeColor: orange + xosvstipple*memTextColor: orange +@@ -51,6 +54,9 @@ + xosvstipplebw*memUsedColor: black + xosvstipplebw*memSharedColor: black + xosvstipplebw*memBufferColor: black ++xosvstipplebw*memSlabColor: black ++xosvstipplebw*memMapColor: black ++xosvstipplebw*memPTColor: black + xosvstipplebw*memCacheColor: black + xosvstipplebw*memFreeColor: black + xosvstipplebw*memTextColor: black
