From dd477f99ba393814bcbb75326c8abe15c4fe2a21 Mon Sep 17 00:00:00 2001
From: Dan Horák <dan@danny.cz>
Date: Mar 30 2020 19:44:19 +0000
Subject: switch to upstream patch


---

diff --git a/codeblocks-20.03-multi-arch.patch b/codeblocks-20.03-multi-arch.patch
index adcffc7..be4cc7f 100644
--- a/codeblocks-20.03-multi-arch.patch
+++ b/codeblocks-20.03-multi-arch.patch
@@ -1,12 +1,23 @@
-diff -up codeblocks-20.03/src/plugins/contrib/dragscroll/dragscrollcfg.h.orig codeblocks-20.03/src/plugins/contrib/dragscroll/dragscrollcfg.h
---- codeblocks-20.03/src/plugins/contrib/dragscroll/dragscrollcfg.h.orig	2020-03-30 12:38:48.853220797 +0200
-+++ codeblocks-20.03/src/plugins/contrib/dragscroll/dragscrollcfg.h	2020-03-30 12:39:03.581385974 +0200
-@@ -35,7 +35,7 @@ class cbDragScrollCfg: public cbConfigur
+commit 137d189053c83ab4d838f773220da5e355bf421d
+Author: fuscated <fuscated@2a5c6006-c6dd-42ca-98ab-0921f2732cef>
+Date:   Mon Mar 30 17:14:41 2020 +0000
+
+    - DragScroll: Remove int3, so it might build on non-x86 machines (ticket #935)
+    
+    > I guess this is useful only for debugging.
+    
+    git-svn-id: https://svn.code.sf.net/p/codeblocks/code/trunk@12008 2a5c6006-c6dd-42ca-98ab-0921f2732cef
+
+diff --git a/src/plugins/contrib/dragscroll/dragscrollcfg.h b/src/plugins/contrib/dragscroll/dragscrollcfg.h
+index 7fc28be8e..fb61221c6 100644
+--- a/src/plugins/contrib/dragscroll/dragscrollcfg.h
++++ b/src/plugins/contrib/dragscroll/dragscrollcfg.h
+@@ -35,7 +35,7 @@ class cbDragScrollCfg: public cbConfigurationPanel
          wxString GetBitmapBaseName() const;
          void OnApply();
          void OnCancel(){}
 -        virtual void InitDialog(){ asm("int3");} /*trap*/
-+        virtual void InitDialog(){ __builtin_trap();} /*trap*/
++        virtual void InitDialog() { } /*trap*/
  
          // pointer to owner of the configuration diaglog needed to
          // complete the OnApply/OnCancel EndModal() logic
diff --git a/codeblocks.spec b/codeblocks.spec
index 8568737..94a0aa1 100644
--- a/codeblocks.spec
+++ b/codeblocks.spec
@@ -19,6 +19,7 @@ Source0:	https://sourceforge.net/projects/%{name}/files/Sources/%{version}/%{nam
 %endif
 Patch0:		codeblocks-autorev.patch
 # https://sourceforge.net/p/codeblocks/tickets/935/
+# https://sourceforge.net/p/codeblocks/code/12008/
 Patch1:		codeblocks-20.03-multi-arch.patch
 
 BuildRequires:	gcc