media-gfx/xaralx: Move patch to external place, such size should not be in filesdir

svn path=/sunrise/; revision=12277

4 files changed, 10 insertions, 627 deletions

diff --git a/media-gfx/xaralx/ChangeLog b/media-gfx/xaralx/ChangeLog
index f04f1b5a1..8cbfbf63a 100644
--- a/media-gfx/xaralx/ChangeLog
+++ b/media-gfx/xaralx/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jul 2011; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  xaralx-0.7_p1785.ebuild, -files/xaralx-0.7_p1785-pragma.patch:
+  Move patch to external place, such size should not be in filesdir
+
   30 Apr 2011; Justin Lecher <jlec@gentoo.org>
   -files/60_launchpad_translations, xaralx-0.7_p1785.ebuild,
   files/xaralx-0.7_p1785-pragma.patch, -files/xaralx-pragma.patch:
diff --git a/media-gfx/xaralx/Manifest b/media-gfx/xaralx/Manifest
index 4347ff97f..fd0bb4fa8 100644
--- a/media-gfx/xaralx/Manifest
+++ b/media-gfx/xaralx/Manifest
@@ -1,9 +1,9 @@
 AUX 30_gtk_wxwidgets_symbol_clash.dpatch 754 RMD160 1564372cb4c2f7c7b188d7955f1fa58e3dbbbe27 SHA1 c80dc2ed90e73f11fc694fb9ac9dda25bc26666b SHA256 3f7ef5304c47fe87ab48ba3cc00d3c9c41e85b3c7736939aaa235d5b136c89e5
 AUX 40_algorithm_include 766 RMD160 e5b4563a46681bb9b29a075b2db5e7b577a55c79 SHA1 66fef459c68daec5e6ab09b55686bdf48d113f1b SHA256 8079bfbf2d23e74ac0ed52dcd00ffaae5145840fdb38aa2aa2f6c86e71a0500e
 AUX 50_update_imagemagick_version_parser 1206 RMD160 42063c3d01ad5fe1abf0fe04089f43d8464f093a SHA1 36c7682de6cabf852498f4f2918b8b230777de88 SHA256 279123b48c5c9e106f630cbf907036c69ddee0c42a5812984ec4640a1fd634da
-AUX xaralx-0.7_p1785-pragma.patch 23744 RMD160 4c66d58067ae9cc136c46e7ec782752618a60bc5 SHA1 948b1c6c0af8d1e5674e630920343cdd02bc6b13 SHA256 281450a2f81d45807e01d5cec98eebfcb8795d8a43ad8e1412ebac5f0a425a2e
 DIST 60_launchpad_translations.xz 180472 RMD160 9db9ad69471decffb05bf5f740ff0454e45ae2c3 SHA1 65e7aeb3a62916ddada2f4ae13962fb925208b1e SHA256 07808bde13ec23b2881c60a0f644d25668dcc54ae55fb3c2d7f70fe8a2190f64
 DIST XaraLX-0.7r1785.tar.bz2 27547620 RMD160 f3a200fb47753d5a509fb95e7a2e04a604477786 SHA1 b67435ed51db0fb184997b4de04c0098c5af58b5 SHA256 d053e44debe30ca80d7e40cf591e90e18dedfa7558feb375ab82ef1003feab17
-EBUILD xaralx-0.7_p1785.ebuild 1873 RMD160 8e2e4f32b5a5d4f01ab595a01ff2b0f409fd3331 SHA1 d2689613b4c500d32fd53ff90181dc6536955324 SHA256 78d61c084b86f2949033fdd3fdfbc35918e8743376bb1cde08ee7fa0cc6e49f4
-MISC ChangeLog 2372 RMD160 7538531098a13c7c9fec049b64ed6b079dfd7f88 SHA1 fd63c789077596e4344a98203eca233aebeb99cf SHA256 8f91556fab8a514780678cd0af2d72062a906493b27169c034b5220d73b0b3db
+DIST xaralx-0.7_p1785-pragma.patch 23744 RMD160 4c66d58067ae9cc136c46e7ec782752618a60bc5 SHA1 948b1c6c0af8d1e5674e630920343cdd02bc6b13 SHA256 281450a2f81d45807e01d5cec98eebfcb8795d8a43ad8e1412ebac5f0a425a2e
+EBUILD xaralx-0.7_p1785.ebuild 1917 RMD160 c5e7db624cb3472a8f2efb0278c6c45b9b1b3298 SHA1 469d110c3f665ac93ef63fb93512d8550e80657a SHA256 4280c5657098f2a9be02d20eb60a7412c3e10d7b85868ded890431c4b97707dc
+MISC ChangeLog 2565 RMD160 c54634350baf924cb474f345f14976c1cdedb098 SHA1 9bcadf9a802e339c157bce9c4b99ee1e25f01a39 SHA256 8320c5f37f55af5b3d012e852ab6023d607cc6f5a60b3b45e25d9c196ae2916a
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/media-gfx/xaralx/files/xaralx-0.7_p1785-pragma.patch b/media-gfx/xaralx/files/xaralx-0.7_p1785-pragma.patch
deleted file mode 100644
index ce4ad6e69..000000000
--- a/media-gfx/xaralx/files/xaralx-0.7_p1785-pragma.patch
+++ /dev/null
@@ -1,622 +0,0 @@
-diff -Nuar xaralx-svn.orig//Kernel/cnamecol.cpp xaralx-svn/Kernel/cnamecol.cpp
---- xaralx-svn.orig//Kernel/cnamecol.cpp	2010-08-07 14:11:33.000000000 -0400
-+++ xaralx-svn/Kernel/cnamecol.cpp	2010-08-07 15:38:22.459771453 -0400
-@@ -145,7 +145,7 @@
- CNamedColourReplacer::CNamedColourReplacer(ColourFillAttribute* pFillAttr, DocColour* pColour)
- {
- 	// call the default constructor that NULLs all the member pointers
--	CNamedColourReplacer::CNamedColourReplacer();
-+	CNamedColourReplacer();
- 	Initialise(pFillAttr, pColour);
- }
- 
-diff -Nuar xaralx-svn.orig//wxOil/basebar2.cpp xaralx-svn/wxOil/basebar2.cpp
---- xaralx-svn.orig//wxOil/basebar2.cpp	2010-08-07 14:12:21.000000000 -0400
-+++ xaralx-svn/wxOil/basebar2.cpp	2010-08-07 15:37:46.297894794 -0400
-@@ -361,7 +361,7 @@
- 	LastSmallBarPos.x = LastSmallBarPos.y = -1;
- 	
- 	// create a bitmap for the drag rendering
--#pragma message( __LOCMSG__ "Not using dither pattern" )
-+//#pragma message( __LOCMSG__ "Not using dither pattern" )
- //  WORD WindowsGray [] = { 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA, 0x55, 0xAA } ;
- //	BrushBitmap.CreateBitmap (8, 8, 1, 1, (LPSTR) WindowsGray) ;
- 	BrushBitmap.Create( 8, 8, 1 );
-@@ -496,7 +496,7 @@
- 
- void BaseBar::SetFormatVariables()
- {
--#pragma message( __LOCMSG__ "BaseBar::SetFormatVariables - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::SetFormatVariables - do nothing" )
- 	TRACE( _T("Warning - BaseBar::SetFormatVariables called") );
- /*	if (GetMainFrame()->GetDockBar(ParentDockBarType)->IsBigControls())
- 		SeparatorWidth = LARGE_SEPARATOR;
-@@ -524,7 +524,7 @@
- 			 
- void BaseBar::CloseCombos()
- {															 
--#pragma message( __LOCMSG__ "BaseBar::CloseCombos - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::CloseCombos - do nothing" )
- 	TRACE( _T("Warning - BaseBar::CloseCombos called") );
- /*	String_256 ClassNameStr;
- 	HWND CurrentChild;
-@@ -699,7 +699,7 @@
- 
- wxRect  BaseBar::GetFormatRect(DockBarType BarType)
- {
--#pragma message( __LOCMSG__ "BaseBar::GetFormatRect - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::GetFormatRect - do nothing" )
- 	TRACE( _T("Warning - BaseBar::GetFormatRect called") );
- /*	OILDockingBar* DockBar = GetMainFrame()->GetDockBar(BarType);
-  	switch(BarType)
-@@ -773,7 +773,7 @@
- 
- DockBarType BaseBar::IsPointerOverDock(wxPoint point)
- {
--#pragma message( __LOCMSG__ "BaseBar::IsPointerOverDock - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::IsPointerOverDock - do nothing" )
- 	TRACE( _T("Warning - BaseBar::IsPointerOverDock called") );
- /*	wxRect temp ;
- 	OILFixedDockingBar * ParentDockBar;
-@@ -822,7 +822,7 @@
- {
- 	wxRect temp;
- 
--#pragma message( __LOCMSG__ "BaseBar::SetBarSize - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::SetBarSize - do nothing" )
- 	TRACE( _T("Warning - BaseBar::SetBarSize called") );
- /*	switch(BarType)
- 	{
-@@ -920,7 +920,7 @@
- 
- BOOL BaseBar::Show(DialogBarOp* Op)
- {
--#pragma message( __LOCMSG__ "BaseBar::Show - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::Show - do nothing" )
- 	TRACE( _T("Warning - BaseBar::Show called") );
- /*	if (Op->IS_KIND_OF(InformationBarOp))
- 		((InformationBarOp*)Op)->SetInfo();
-@@ -1000,7 +1000,7 @@
- ********************************************************************************************/
- BOOL BaseBar::Hide(DialogBarOp* Op)
- {
--#pragma message( __LOCMSG__ "BaseBar::Hide - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::Hide - do nothing" )
- 	TRACE( _T("Warning - BaseBar::Hide called") );
- /*	BOOL DoTidy = DO_TIDY;
- 
-@@ -1038,7 +1038,7 @@
- 
- BOOL BaseBar::Create(DialogBarOp* Op)
- {
--#pragma message( __LOCMSG__ "BaseBar::Create - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::Create - do nothing" )
- 	TRACE( _T("Warning - BaseBar::Create called") );
- /*	InRecreate = TRUE;
- 	pOp = Op; 
-@@ -1223,7 +1223,7 @@
- BOOL BaseBar::RecreateAt(KernelBarPos Pos,DockBarType DockBarTyp,
- 					  BaseBar* BaseBar, DialogBarOp* Op, wxWindow* OldHwnd) 
- {
--#pragma message( __LOCMSG__ "BaseBar::RecreateAt - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::RecreateAt - do nothing" )
- 	TRACE( _T("Warning - BaseBar::RecreateAt called") );
- /*	LastSmallBarPos = Pos;
- 	pOp = Op; 
-@@ -1343,7 +1343,7 @@
- 
- BOOL BaseBar::Recreate(DockBarType DockBarTyp, BaseBar* BaseBar, DialogBarOp* Op,BOOL CanCopy ) 
- {
--#pragma message( __LOCMSG__ "BaseBar::Recreate - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::Recreate - do nothing" )
- 	TRACE( _T("Warning - BaseBar::Recreate called") );
- /*	pOp = Op; 
- 	ParentDockBarType = DockBarTyp; // Record the current dock ba
-@@ -1668,7 +1668,7 @@
- 
- KernelBarPos  * BaseBar::GetBarPosition()
- {
--#pragma message( __LOCMSG__ "BaseBar::GetBarPosition - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::GetBarPosition - do nothing" )
- 	TRACE( _T("Warning - BaseBar::GetBarPosition called") );
- //	return GetMainFrame()->GetDockBar(ParentDockBarType)->GetBarPos(GetSafeHwnd());
- 
-@@ -2029,7 +2029,7 @@
- 
- BOOL BaseBar::FormatLineFeeds(INT32 Targetx,wxSize * pBarSize, INT32 * pNoLFs)
- {
--#pragma message( __LOCMSG__ "BaseBar::FormatLineFeeds - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::FormatLineFeeds - do nothing" )
- 	TRACE( _T("Warning - BaseBar::FormatLineFeeds called") );
- /*	//List is empty	just return 
- 		if (pOp->IsListEmpty())
-@@ -2246,7 +2246,7 @@
- 
- UINT32 BaseBar::GetNearestControl(wxPoint DropPoint)
- {
--#pragma message( __LOCMSG__ "BaseBar::GetNearestControl - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::GetNearestControl - do nothing" )
- 	TRACE( _T("Warning - BaseBar::GetNearestControl called") );
- /*	HWND hcontrol;			 						// handle of current control
- 	INT32 ControlIndex = 0;	 						// index in bar item list
-@@ -2461,7 +2461,7 @@
- {
- //	TRACEUSER( "Gerry", _T("FormatFloatingBar\n"));
- 
--#pragma message( __LOCMSG__ "BaseBar::FormatFloatingBar - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::FormatFloatingBar - do nothing" )
- 	TRACE( _T("Warning - BaseBar::FormatFloatingBar called") );
- /*	HWND hcontrol;
-  	wxSize BarSize(0,0);
-@@ -2769,7 +2769,7 @@
- {
- //	TRACEUSER( "Gerry", _T("FormatHorizontalBar\n"));
- 
--#pragma message( __LOCMSG__ "BaseBar::FormatHorizontalBar - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::FormatHorizontalBar - do nothing" )
- 	TRACE( _T("Warning - BaseBar::FormatHorizontalBar called") );
- /*	BOOL AtFront = TRUE; 	
- 	HWND hcontrol;
-@@ -3018,7 +3018,7 @@
- BOOL BaseBar::FormatVerticalBar(BOOL MoveControls,ForceControlSize ForceSize)
- {
- //	TRACEUSER( "Gerry", _T("FormatVerticalBar\n"));
--#pragma message( __LOCMSG__ "BaseBar::FormatVerticalBar - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::FormatVerticalBar - do nothing" )
- 	TRACE( _T("Warning - BaseBar::FormatVerticalBar called") );
- /*	BOOL AtFront = TRUE; 	
- 	HWND hcontrol;
-@@ -3254,7 +3254,7 @@
- 
- HINSTANCE BaseBar::GetModuleInst(const BarControlInfo*pBarCtlInfo,UINT32 * ToolModuleID )
- {
--#pragma message( __LOCMSG__ "BaseBar::GetModuleInst - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::GetModuleInst - do nothing" )
- 	TRACE( _T("Warning - BaseBar::GetModuleInst called") );
- /*	*ToolModuleID = Tool::GetModuleID(pBarCtlInfo->ToolID); 
- 
-@@ -3611,7 +3611,7 @@
-  									HINSTANCE ModuleInst,
-  									UINT32 ToolModuleID)
- {
--#pragma message( __LOCMSG__ "BaseBar::GetModuleInst - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::GetModuleInst - do nothing" )
- 	TRACE( _T("Warning - BaseBar::GetModuleInst called") );
- /*	BarItemType	 ThisControlType = OTHERCONTROL;
- 
-@@ -4310,7 +4310,7 @@
- 
- void BaseBar::InformControlsDead()
- {														 
--#pragma message( __LOCMSG__ "BaseBar::InformControlsDead - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::InformControlsDead - do nothing" )
- 	TRACE( _T("Warning - BaseBar::InformControlsDead called") );
- /* 	HWND CurrentChild;
- 	HWND NextChild; 
-@@ -4462,7 +4462,7 @@
- 
- void BaseBar::StartDrag(wxPoint point, DlgDragType TypeOfDrag)
- {
--#pragma message( __LOCMSG__ "BaseBar::StartDrag - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::StartDrag - do nothing" )
- 	TRACE( _T("Warning - BaseBar::StartDrag called") );
- /*#ifdef STANDALONE
- #ifndef EXCLUDE_GALS
-@@ -4565,7 +4565,7 @@
- // Message map - maintained by Class Wizard.
- 
- BEGIN_EVENT_TABLE( BaseBar, wxWindow )
--#pragma message( __LOCMSG__ "Removed BaseBar message map" )
-+//#pragma message( __LOCMSG__ "Removed BaseBar message map" )
- /*	ON_WM_NCCALCSIZE()
- 	ON_WM_NCPAINT()
- 	ON_WM_NCACTIVATE()
-@@ -4618,7 +4618,7 @@
- 
- static void PatB( wxDC &DC, INT32 x, INT32 y, INT32 dx, INT32 dy, wxColour &rgb )
- {
--#pragma message( __LOCMSG__ "PatB - do nothing" )
-+//#pragma message( __LOCMSG__ "PatB - do nothing" )
- 	TRACE( _T("Warning - PatB called") );
- /*	RECT rect;
- 
-@@ -4650,7 +4650,7 @@
- 
- void BaseBar::Paint3dPlinth(wxDC* pDC, wxRect *rect, BOOL PlinthOut)
- {
--#pragma message( __LOCMSG__ "BaseBar::Paint3dPlinth - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::Paint3dPlinth - do nothing" )
- 	TRACE( _T("Warning - BaseBar::Paint3dPlinth called") );
- /*	if((LOBYTE(LOWORD(GetVersion()))) > 3 )
- 	{
-@@ -4767,7 +4767,7 @@
- ********************************************************************************************/
- 
- 
--#pragma message( __LOCMSG__ "BaseBar::OnDrawItem removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnDrawItem removed" )
- /*void BaseBar::OnDrawItem( INT32 nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct )
- {
- 	// owner drawn text button
-@@ -4844,7 +4844,7 @@
- 
- ********************************************************************************************/
- 						
--#pragma message( __LOCMSG__ "BaseBar::OnParentNotify removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnParentNotify removed" )
- /*void BaseBar::OnParentNotify( UINT32 message, LPARAM lParam )
- {
- 	if(message == WM_LBUTTONDOWN)
-@@ -4885,7 +4885,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnKillFocus removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnKillFocus removed" )
- /*void BaseBar::OnKillFocus( wxWindow*Wnd )
- {
- 	wxWindow::OnKillFocus(Wnd);
-@@ -4908,7 +4908,7 @@
- ********************************************************************************************/
- 
- 
--#pragma message( __LOCMSG__ "BaseBar::OnSetFocus removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnSetFocus removed" )
- /*void BaseBar::OnSetFocus( wxWindow * Wnd )
- {
- 	wxWindow::OnSetFocus(Wnd);
-@@ -4930,7 +4930,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnActivateApp removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnActivateApp removed" )
- /*void BaseBar::OnActivateApp( BOOL  bActive, HTASK  hTask )
- {
- 	
-@@ -4965,7 +4965,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnActivate removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnActivate removed" )
- /*void BaseBar::OnActivate( UINT32 State, wxWindow* pWndOther, BOOL bMinimized ) 
- {
- 	
-@@ -5003,7 +5003,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnMouseActivate removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnMouseActivate removed" )
- /*INT32 BaseBar::OnMouseActivate( wxWindow* pDesktopWnd, UINT32 nHitTest, UINT32 message ) 
- {
- 	
-@@ -5052,7 +5052,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnDestroy removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnDestroy removed" )
- /*void BaseBar ::OnDestroy( )
- {
-  
-@@ -5104,7 +5104,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::ListLostFocus removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::ListLostFocus removed" )
- /*void  BaseBar::ListLostFocus(void)
- {
-  
-@@ -5126,7 +5126,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::ListSelChanged removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::ListSelChanged removed" )
- /*void  BaseBar::ListSelChanged(void)
- {
- //	if( pOp->IsKindOf(CC_RUNTIME_CLASS(SuperGallery)) )
-@@ -5150,7 +5150,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::DoResize removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::DoResize removed" )
- /*LRESULT  BaseBar::DoResize(WPARAM , LPARAM)
- {
- 	// ZZZZ
-@@ -5226,7 +5226,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
- /*LRESULT  BaseBar::GetBarSize(WPARAM DockType , LPARAM ControlS)
- {
- 	DockBarType ThisDock = (DockBarType) DockType;	
-@@ -5275,7 +5275,7 @@
- {
- 	wxRect ReturnRect(0,0,0,0);
- 
--#pragma message( __LOCMSG__ "BaseBar::GetBarsDims - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::GetBarsDims - do nothing" )
- 	TRACE( _T("Warning - BaseBar::GetBarsDims called") );
- /*	OILDockingBar* FloatBars = GetMainFrame ()->GetDockBar (DockBarType);//DOCKBAR_FLOAT);
- 	BOOL BigControls = FloatBars->IsBigControls ();
-@@ -5323,7 +5323,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
- /*LRESULT BaseBar::SetControlFocus(WPARAM State, LPARAM Hwnd)
- {
- 	if (State == TRUE)
-@@ -5375,7 +5375,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
- /*LRESULT  BaseBar::StartControlDrag(WPARAM State, LPARAM Hwnd)
- {
- #ifdef STANDALONE
-@@ -5446,7 +5446,7 @@
- #endif
- } */											 	
- 
--#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::GetBarSize removed" )
- /*LRESULT  BaseBar::EndControlDrag(WPARAM State, LPARAM Hwnd)
- {
- 	return 0;
-@@ -5515,7 +5515,7 @@
- 
- LRESULT BaseBar::WindowProc( UINT32 Message, WPARAM wParam, LPARAM lParam )
- {
--#pragma message( __LOCMSG__ "BaseBar::WindowProc - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::WindowProc - do nothing" )
- 	TRACE( _T("Warning - BaseBar::WindowProc called") );
- /*	// First send the message to the dialog manager 
- 	DialogManager::SendDialogMessage(this,
-@@ -5580,7 +5580,7 @@
- 	Scope:		Protected
- 
- ********************************************************************************************/
--#pragma message( __LOCMSG__ "BaseBar::OnNcCalcSize removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnNcCalcSize removed" )
- /*void BaseBar::OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp)
- {
- 	// So that we are compatible with different screen modes we will paint the non-client area
-@@ -5619,7 +5619,7 @@
- 	Scope:		Protected
- 
- ********************************************************************************************/
--#pragma message( __LOCMSG__ "BaseBar::OnNcPaint removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnNcPaint removed" )
- /*void BaseBar::OnNcPaint()
- {
- 	
-@@ -5667,7 +5667,7 @@
- #define ROP_PSDPxax  0x00B8074AL
- 
- 
--#pragma message( __LOCMSG__ "BaseBar::PlotStretchedMaskedBitmap removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::PlotStretchedMaskedBitmap removed" )
- /*BOOL BaseBar::PlotStretchedMaskedBitmap(wxDC* destDC, CBitmap* srcBitmap,wxRect Pos)
- {
- 	
-@@ -5958,7 +5958,7 @@
- 	// make sure that DrawCaption shows the correct title
- 	SetLabel( pOp->GetName() );
- 	
--#pragma message( __LOCMSG__ "Remove MSW frame redrawing stuff" )
-+//#pragma message( __LOCMSG__ "Remove MSW frame redrawing stuff" )
- /*	UINT32 DrawFlags = DC_TEXT|DC_SMALLCAP;
- 	
- 	if(IsActive)
-@@ -5991,7 +5991,7 @@
- 
- void BaseBar::PaintDialogNonClient(BOOL IsActive)
- {
--#pragma message( __LOCMSG__ "BaseBar::PaintDialogNonClient - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::PaintDialogNonClient - do nothing" )
- 	TRACE( _T("Warning - BaseBar::PaintDialogNonClient called") );
- /*	// Get the System Frame Size
- 	BorderWidth=wxSystemSettings::GetMetric(SM_CXFRAME);
-@@ -6222,7 +6222,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnNcPaint removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnNcPaint removed" )
- /*BOOL BaseBar::OnNcActivate(BOOL IsActive)
- {
- 	
-@@ -6243,7 +6243,7 @@
- 
- ********************************************************************************************/
- 										 
--#pragma message( __LOCMSG__ "BaseBar::OnPaint removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnPaint removed" )
- /*void BaseBar::OnPaint()
- {
- 	wxPaintDC  PaintDC(this); // device context for painting
-@@ -6282,7 +6282,7 @@
- 
- void BaseBar::PaintChicagoBorder()
- {
--#pragma message( __LOCMSG__ "BaseBar::PaintChicagoBorder - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::PaintChicagoBorder - do nothing" )
- 	TRACE( _T("Warning - BaseBar::PaintChicagoBorder called") );
- /*	wxRect WinRect( GetClientRect() );
- 	wxRect ParWin( GetParent()->GetRect() );
-@@ -6343,7 +6343,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnNcHitTest removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnNcHitTest removed" )
- /*UINT32 BaseBar::OnNcHitTest(wxPoint point)
- {
- 
-@@ -6434,7 +6434,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnNcRButtonDown removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnNcRButtonDown removed" )
- /*void BaseBar::OnNcRButtonDown(UINT32 nHitTest, wxPoint point)
- {
- } */
-@@ -6454,7 +6454,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnNcHitTest removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnNcHitTest removed" )
- /*void BaseBar::OnNcHitTest(UINT32 nHitTest, wxPoint point)
- {
- 
-@@ -6477,7 +6477,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnLButtonDown removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnLButtonDown removed" )
- /*void BaseBar::OnLButtonDown(UINT32 nFlags, wxPoint point)
- {
- 	// make sure we're not clicking on a disabled button
-@@ -6526,7 +6526,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnMouseWheel removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnMouseWheel removed" )
- /*BOOL BaseBar::OnMouseWheel(UINT32 nFlags, short zDelta, wxPoint pt)
- {
- 	TRACEUSER( "Matt", _T("MouseWheel Scroll In BaseBar!\n"));
-@@ -6548,7 +6548,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::OnLButtonDblClk removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnLButtonDblClk removed" )
- /*void BaseBar::OnLButtonDblClk( UINT32 nFlags, wxPoint point )
- {
- 	//MessageBeep(MB_OK);
-@@ -6825,7 +6825,7 @@
- ********************************************************************************************/
- BOOL BaseBar::TidyUpControlDrag()
- {
--#pragma message( __LOCMSG__ "BaseBar::TidyUpControlDrag - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::TidyUpControlDrag - do nothing" )
- 	TRACE( _T("Warning - BaseBar::TidyUpControlDrag called") );
- /*	CtlDragState = NO_DRAG;
- 	DragManagerOp::SetDragActive(FALSE);
-@@ -6880,7 +6880,7 @@
- 	InRecreate = FALSE;
- 	CurrentBar = NULL;
- 
--#pragma message( __LOCMSG__ "Remove DragManagerOp::SetDragActive usage" )
-+//#pragma message( __LOCMSG__ "Remove DragManagerOp::SetDragActive usage" )
- //	DragManagerOp::SetDragActive(FALSE); 
- 	return TRUE;
- }
-@@ -6903,7 +6903,7 @@
- ********************************************************************************************/
- BOOL BaseBar::DropControl(wxPoint point, wxWindow* OverBar,BOOL InsertSeparator)
- {
--#pragma message( __LOCMSG__ "BaseBar::DropControl - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::DropControl - do nothing" )
- 	TRACE( _T("Warning - BaseBar::DropControl called") );
- /*	BOOL DeleteSeparator = FALSE;
- 
-@@ -7096,7 +7096,7 @@
- ********************************************************************************************/
- BOOL BaseBar::EndControlDrag(wxPoint point)
- {
--#pragma message( __LOCMSG__ "BaseBar::EndControlDrag - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::EndControlDrag - do nothing" )
- 	TRACE( _T("Warning - BaseBar::EndControlDrag called") );
- /*	// go to screen co-ords	- we may be dropping on a different bar
- 	wxPoint sPnt= point;
-@@ -7249,7 +7249,7 @@
- 	SeeAlso:	-
- 
- ********************************************************************************************/
--#pragma message( __LOCMSG__ "BaseBar::OnLButtonUp removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnLButtonUp removed" )
- /*void BaseBar::OnLButtonUp(UINT32 nFlags, wxPoint point)
- {
- 	if(CtlDragState == DRAGGING)
-@@ -7364,7 +7364,7 @@
- 
- void BaseBar::ConvertToolbarOnStartup ()
- {
--#pragma message( __LOCMSG__ "BaseBar::ConvertToolbarOnStartup - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::ConvertToolbarOnStartup - do nothing" )
- 	TRACE( _T("Warning - BaseBar::ConvertToolbarOnStartup called") );
- /*	ERROR3IF (pOp->GetName () != String_32 (TEXT ("Toolbar")), "BaseBar::ConvertToolbarOnStartup () - Call that a toolbar!");
- 	
-@@ -7411,7 +7411,7 @@
- 
- ********************************************************************************************/
- 
--#pragma message( __LOCMSG__ "BaseBar::MoveBar removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::MoveBar removed" )
- /*LRESULT BaseBar::MoveBar(WPARAM Dock, LPARAM Pos)
- {	
- 	DockBarType NewDockType = (DockBarType)Dock;
-@@ -7476,7 +7476,7 @@
- 	SeeAlso:	-
- 
- ********************************************************************************************/
--#pragma message( __LOCMSG__ "BaseBar::OnMouseMove removed" )
-+//#pragma message( __LOCMSG__ "BaseBar::OnMouseMove removed" )
- /*void BaseBar::OnMouseMove(UINT32 Flags, wxPoint Point)
- {
- 	if(CtlDragState == DRAGGING)
-@@ -7532,7 +7532,7 @@
- 
- void BaseBar::CacheAllDockRects()
- {
--#pragma message( __LOCMSG__ "BaseBar::CacheAllDockRects - do nothing" )
-+//#pragma message( __LOCMSG__ "BaseBar::CacheAllDockRects - do nothing" )
- 	TRACE( _T("Warning - BaseBar::CacheAllDockRects called") );
- /*	OILFixedDockingBar* DockBar;
- 
-@@ -7789,7 +7789,7 @@
- 	}
- 
- 	// MFC DrawDragRect function
--#pragma message( __LOCMSG__ "Remove DrawDragRect usage" )
-+//#pragma message( __LOCMSG__ "Remove DrawDragRect usage" )
- //	pDisplayDC->DrawDragRect( &Rect, NewSize, &OldRect, OldSize );
- 	
- 	/*
-@@ -7847,7 +7847,7 @@
- 
- void BaseBar::PaintXORDragRect(wxRect Rect,DockBarType DockBar)
- {
--#pragma message( __LOCMSG__ "Remove DC::PatBlt usage" )
-+//#pragma message( __LOCMSG__ "Remove DC::PatBlt usage" )
- /*	DWORD dwRop = PATINVERT;
- 
- 	wxScreenDC	DisplayDC;
-diff -Nuar xaralx-svn.orig//wxOil/bitmapgriddropdown.cpp xaralx-svn/wxOil/bitmapgriddropdown.cpp
---- xaralx-svn.orig//wxOil/bitmapgriddropdown.cpp	2010-08-07 14:12:21.000000000 -0400
-+++ xaralx-svn/wxOil/bitmapgriddropdown.cpp	2010-08-07 15:37:37.123901499 -0400
-@@ -122,7 +122,7 @@
- #include "grnddib.h"
- #include "ppbrush.h"
- #include "qualattr.h"
--
-+#include <algorithm>
- 
- 
- 
- 
diff --git a/media-gfx/xaralx/xaralx-0.7_p1785.ebuild b/media-gfx/xaralx/xaralx-0.7_p1785.ebuild
index 1bb3a5952..d4aae956c 100644
--- a/media-gfx/xaralx/xaralx-0.7_p1785.ebuild
+++ b/media-gfx/xaralx/xaralx-0.7_p1785.ebuild
@@ -14,7 +14,8 @@ DESCRIPTION="General purpose vector graphics program"
 HOMEPAGE="http://www.xaraxtreme.org/"
 SRC_URI="
 	http://downloads.xara.com/opensource/${MY_P}.tar.bz2
-	http://dev.gentoo.org/~jlec/distfiles/60_launchpad_translations.xz"
+	http://dev.gentoo.org/~jlec/distfiles/60_launchpad_translations.xz
+	http://ompldr.org/vOWptaQ/${P}-pragma.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -39,7 +40,7 @@ S=${WORKDIR}/${MY_P/Src/}
 src_prepare() {
 	epatch \
 		"${WORKDIR}"/60_launchpad_translations \
-		"${FILESDIR}"/${P}-pragma.patch \
+		"${DISTDIR}"/${P}-pragma.patch \
 		"${FILESDIR}"/{3,4,5}0*
 	sed -i -e "s/CXFTreeDlg:://" Kernel/cxftree.h
 	sed -i -e "s:XaraLX:xaralx:g" Makefile.am