Author: pebender
Date: Sun Apr 19 20:39:38 2009
New Revision: 4638
Removed:
trunk/gar-minimyth/script/X11/xmacro/files/xmacro-pre0.3-20000911-gcc_4.3.patch
Modified:
trunk/gar-minimyth/script/X11/xmacro/Makefile
trunk/gar-minimyth/script/X11/xmacro/checksums
trunk/gar-minimyth/script/X11/xmacro/files/xmacro-pre0.3-20000911-c++.patch
Log:
- Merged all X11/xmacro related c++ patches into one patch.
Modified: trunk/gar-minimyth/script/X11/xmacro/Makefile
==============================================================================
--- trunk/gar-minimyth/script/X11/xmacro/Makefile (original)
+++ trunk/gar-minimyth/script/X11/xmacro/Makefile Sun Apr 19 20:39:38 2009
@@ -3,7 +3,7 @@
CATEGORIES = lib
MASTER_SITES = http://easynews.dl.sourceforge.net/sourceforge/$(GARNAME)/
DISTFILES = $(DISTNAME).tar.gz
-PATCHFILES = $(DISTNAME)-c++.patch $(DISTNAME)-gcc_4.3.patch
$(DISTNAME)-makefile.patch
+PATCHFILES = $(DISTNAME)-c++.patch $(DISTNAME)-makefile.patch
LICENSE = LGPL2
DESCRIPTION =
Modified: trunk/gar-minimyth/script/X11/xmacro/checksums
==============================================================================
--- trunk/gar-minimyth/script/X11/xmacro/checksums (original)
+++ trunk/gar-minimyth/script/X11/xmacro/checksums Sun Apr 19 20:39:38 2009
@@ -1,4 +1,3 @@
d2956b82f3d5380e58a75ccc721fb746 download/xmacro-pre0.3-20000911.tar.gz
-578166dff2890dcc1f4f81525dc2d349 download/xmacro-pre0.3-20000911-c++.patch
-914457b205da1bea931a8739663dbd32
download/xmacro-pre0.3-20000911-gcc_4.3.patch
+8250be4087a3890a4871371985d86263 download/xmacro-pre0.3-20000911-c++.patch
4a7068cc5aaf7d333facaa1134749b38
download/xmacro-pre0.3-20000911-makefile.patch
Modified:
trunk/gar-minimyth/script/X11/xmacro/files/xmacro-pre0.3-20000911-c++.patch
==============================================================================
---
trunk/gar-minimyth/script/X11/xmacro/files/xmacro-pre0.3-20000911-c++.patch
(original)
+++
trunk/gar-minimyth/script/X11/xmacro/files/xmacro-pre0.3-20000911-c++.patch
Sun Apr 19 20:39:38 2009
@@ -1,6 +1,6 @@
diff -Naur xmacro-pre0.3-20000911-old/chartbl.h
xmacro-pre0.3-20000911-new/chartbl.h
--- xmacro-pre0.3-20000911-old/chartbl.h 2000-09-05 13:21:23.000000000
-0700
-+++ xmacro-pre0.3-20000911-new/chartbl.h 2009-04-19 17:51:26.000000000
-0700
++++ xmacro-pre0.3-20000911-new/chartbl.h 2009-04-19 20:30:01.000000000
-0700
@@ -22,7 +22,7 @@
/* Version 0.1 (20000817) probably still incomplete... */
@@ -27,14 +27,15 @@
+const char **chartbl[]={ chartbl_lat1, chartbl_lat2 };
diff -Naur xmacro-pre0.3-20000911-old/xmacroplay.cpp
xmacro-pre0.3-20000911-new/xmacroplay.cpp
--- xmacro-pre0.3-20000911-old/xmacroplay.cpp 2000-09-11
11:25:11.000000000 -0700
-+++ xmacro-pre0.3-20000911-new/xmacroplay.cpp 2009-04-19
17:54:34.000000000 -0700
-@@ -34,11 +34,12 @@
++++ xmacro-pre0.3-20000911-new/xmacroplay.cpp 2009-04-19
20:32:59.000000000 -0700
+@@ -34,11 +34,13 @@
/*****************************************************************************
* Includes
****************************************************************************/
-#include <stdio.h>
+#include <iostream>
+#include <cstdio>
++#include <cstring>
+using namespace std;
+
#include <stdlib.h>
@@ -45,7 +46,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
-@@ -47,19 +48,10 @@
+@@ -47,19 +49,10 @@
#include <X11/extensions/XTest.h>
#include "chartbl.h"
@@ -68,14 +69,15 @@
****************************************************************************/
diff -Naur xmacro-pre0.3-20000911-old/xmacrorec2.cpp
xmacro-pre0.3-20000911-new/xmacrorec2.cpp
--- xmacro-pre0.3-20000911-old/xmacrorec2.cpp 2000-09-05
16:46:15.000000000 -0700
-+++ xmacro-pre0.3-20000911-new/xmacrorec2.cpp 2009-04-19
17:53:14.000000000 -0700
-@@ -38,9 +38,12 @@
++++ xmacro-pre0.3-20000911-new/xmacrorec2.cpp 2009-04-19
20:34:00.000000000 -0700
+@@ -38,9 +38,13 @@
/*****************************************************************************
* Includes
****************************************************************************/
-#include <stdio.h>
+#include <iostream>
+#include <cstdio>
++#include <cstring>
+using namespace std;
+
#include <stdlib.h>
@@ -84,7 +86,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
-@@ -48,17 +51,6 @@
+@@ -48,17 +52,6 @@
#include <X11/keysym.h>
#include <X11/extensions/record.h>
@@ -104,14 +106,15 @@
/*****************************************************************************
diff -Naur xmacro-pre0.3-20000911-old/xmacrorec.cpp
xmacro-pre0.3-20000911-new/xmacrorec.cpp
--- xmacro-pre0.3-20000911-old/xmacrorec.cpp 2000-09-05 13:21:23.000000000
-0700
-+++ xmacro-pre0.3-20000911-new/xmacrorec.cpp 2009-04-19 17:54:25.000000000
-0700
-@@ -36,9 +36,12 @@
++++ xmacro-pre0.3-20000911-new/xmacrorec.cpp 2009-04-19 20:33:32.000000000
-0700
+@@ -36,9 +36,13 @@
/*****************************************************************************
* Includes
****************************************************************************/
-#include <stdio.h>
+#include <iostream>
+#include <cstdio>
++#include <cstring>
+using namespace std;
+
#include <stdlib.h>
@@ -120,7 +123,7 @@
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
-@@ -46,17 +49,6 @@
+@@ -46,17 +50,6 @@
#include <X11/keysym.h>
#include <X11/extensions/XTest.h>
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
